作业槽查询逻辑调整

src/views/processManagement/bathRefine/accumulateClass.vue

@@ -48,7 +48,7 @@
 <script>
 import addAccumulateClass from './components/addAccumulateClassDialog.vue';
 import maintainDialog from './components/maintainDialog.vue';
-import { getList, add, remove, update,batchReset  } from '@/api/processManagement/planClass.js';
+import { getList, add, remove, update, batchReset } from '@/api/processManagement/planClass.js';
 
 export default {
   components: {
@@ -130,6 +130,7 @@ export default {
             headerAlign: 'center',
             align: 'left',
             searchLabelWidth: 80,
+            cascader: ['batchNo'],
             width: 120,
             rules: [
               {
@@ -175,26 +176,26 @@ export default {
             headerAlign: 'center',
             align: 'left',
             width: 120,
-            editDisplay:false,
+            editDisplay: false,
           },
-           {
+          {
             label: '设备名称',
             prop: 'device',
-            hide:true,
+            hide: true,
             search: false,
             sortable: true,
             overHidden: true,
             headerAlign: 'center',
             align: 'left',
             width: 120,
-             dicUrl: `/blade-desk/equipment/page?used=1&workstationId={{wcId}}&size=99999`,
+            dicUrl: `/blade-desk/equipment/page?used=1&workstationId={{wcId}}&size=99999`,
             props: {
               label: 'deviceName',
               value: 'id',
               res: 'data.records',
             },
-            change:  (val) =>{
+            change: val => {
-              this.equipmentChange(val.item,'equipmentId')
+              this.equipmentChange(val.item, 'equipmentId');
             },
           },
           {
@@ -271,17 +272,12 @@ export default {
             headerAlign: 'center',
             align: 'left',
             width: 120,
-            type: 'select',
+            type: 'select', //accumulateClass_status
-            dicData: [
+            dicUrl: '/blade-system/dict/dictionary?code=accumulateClass_status',
-              {
+            props: {
-                label: '进行中',
+              label: 'dictValue',
-                value: 1,
+              value: 'dictKey',
-              },
+            },
-              {
-                label: '已完成',
-                value: 2,
-              },
-            ],
           },
           {
             label: '添加量',
@@ -377,28 +373,22 @@ export default {
             headerAlign: 'center',
             align: 'left',
             width: 120,
-            type: 'select',
+            type: 'select', //periodOfValidity
-            dicData: [
+            dicUrl: '/blade-system/dict/dictionary?code=periodOfValidity',
-              {
+            props: {
-                label: '长期',
+              label: 'dictValue',
-                value: 1,
+              value: 'dictKey',
-              },
+            },
-              {
-                label: '一次性',
-                value: 2,
-              },
-            ],
           },
-          
         ],
       },
     };
   },
   mounted() {},
   methods: {
-    equipmentChange(val,type){
+    equipmentChange(val, type) {
-      if(val&&type=='equipmentId'){
+      if (val && type == 'equipmentId') {
-        this.form.deviceName = val.deviceName
+        this.form.deviceName = val.deviceName;
       }
     },
     // 关闭弹窗
@@ -423,14 +413,14 @@ export default {
         return;
       }
       // batchReset
-       this.$confirm('确定将选择数据批量重置?', {
+      this.$confirm('确定将选择数据批量重置?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          let ids=this.selectionList.map(item=>item.id)
+          let ids = this.selectionList.map(item => item.id);
-          return batchReset({ids:ids.join(',')});
+          return batchReset({ ids: ids.join(',') });
         })
         .then(() => {
           this.onLoad(this.page);
@@ -444,7 +434,6 @@ export default {
       // // this.showMaintain = true;
       // this.showDialog = true;
       // this.moldAddMore = false;
-      
     },
     handleDelete() {
       if (this.selectionList.length == 0) {

src/views/processManagement/bathRefine/components/periodicalBatch.vue

@@ -120,6 +120,7 @@ export default {
             searchLabelWidth: 80,
             dicUrl: '/blade-desk/bsWorkCenter/getList',
             type:'select',
+            cascader: ['batchNo'],
             props: {
                 label: 'wcName',
                 value: 'id',