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

src/views/exemption/components/addDialog.vue

@@ -54,6 +54,36 @@ export default {
         labelWidth: 100,
         column: [
                  {
+            label: '工艺员',
+            prop: 'proMan',
+            search: true,
+            sortable: true,
+            filter: true,
+            span:24,
+            headerAlign: 'center',
+            align: 'center',
+            type: 'select',
+            dicUrl: '/blade-system/user/page?size=999999&current=1',
+            filterable: true,
+            searchLabelWidth: 50,
+            props: {
+              label: 'realName',
+              value: 'id',
+              res: 'data.records',
+            },
+            // formatter: (row, value, label, column) => {
+            //   return row.proManName || value || '-';
+            // },
+            rules: [
+              {
+                required: true,
+                message: '请选择工艺员',
+                trigger: 'change',
+              },
+            ],
+          },
+         
+           {
             label: '提出人',
             prop: 'reportUserId',
             search: false,
@@ -183,6 +213,7 @@ export default {
     uploadDelete(file, column) {
       console.log('uploadDelete', file, column);
       this.attachLink = '';
+      return true;
     },
     uploadExceed(limit, files, fileList, column) {
       this.$message.error('最多只能上传一个文件');