Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/basicData/jobTransferManagement.vue

@@ -262,19 +262,19 @@ export default {
           },
           {
             label: '姓名',
-            prop: 'userId',
+            prop: 'userName',
             span: 8,
             search: true,
             width: 200,
-            type: 'select',
-            dicUrl: '/blade-system/user/page?size=999999&current=1',
-            filterable: true,
-            searchLabelWidth: 50,
-            props: {
-              label: 'realName',
-              value: 'id',
-              res: 'data.records',
-            },
+            // type: 'select',
+            // dicUrl: '/blade-system/user/page?size=999999&current=1',
+            // filterable: true,
+            // searchLabelWidth: 50,
+            // props: {
+            //   label: 'realName',
+            //   value: 'id',
+            //   res: 'data.records',
+            // },
             rules: [
               {
                 required: true,