diff --git a/src/views/processManagement/bathRefine/accumulateClass.vue b/src/views/processManagement/bathRefine/accumulateClass.vue index 4c2da09..346b34e 100644 --- a/src/views/processManagement/bathRefine/accumulateClass.vue +++ b/src/views/processManagement/bathRefine/accumulateClass.vue @@ -24,6 +24,9 @@ 批量重置 + @@ -39,7 +42,7 @@ :showDialog="showDialog" @closeDialog="closeDialog" :moldAddMore="moldAddMore" - :maintain-data="maintainData" + :maintainData="maintainData" :title="title" > @@ -145,20 +148,32 @@ export default { value: 'id', }, }, + { label: '作业槽', - prop: 'batchNo', + prop: 'batchNoName', search: false, sortable: true, overHidden: true, headerAlign: 'center', align: 'center', width: 120, - dicUrl: `/blade-desk/BA/WorkTank/listForSelect?workstationId={{wcId}}`, - props: { - label: 'name', - value: 'id', - }, + editDisplay: false, + addDisplay: false, + }, + { + label: '作业槽', + prop: 'batchNo', + type: 'select', + filterable: true, + clearable: true, + search: false, + sortable: true, + overHidden: true, + headerAlign: 'center', + align: 'center', + searchLabelWidth: 80, + hide: true, rules: [ { required: true, @@ -166,6 +181,14 @@ export default { trigger: 'blur', }, ], + dicUrl: `/blade-desk/BA/WorkTank/listForSelect?workstationId={{wcId}}`, + props: { + label: 'name', + value: 'id', + }, + change: value => { + this.form.batchNoName = value.item.name; + }, }, { label: '设备名称', @@ -178,26 +201,7 @@ export default { width: 120, editDisplay: false, }, - { - label: '设备名称', - prop: 'device', - 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`, - props: { - label: 'deviceName', - value: 'id', - res: 'data.records', - }, - change: val => { - this.equipmentChange(val.item, 'equipmentId'); - }, - }, + { label: '规则类型', prop: 'ruleType', @@ -382,6 +386,7 @@ export default { }, ], }, + title: '新增', }; }, mounted() {}, @@ -405,6 +410,14 @@ export default { this.tableData = []; this.showDialog = true; this.moldAddMore = true; + this.title = '新增'; + }, + // 编辑 + editRow(row) { + this.title = '修改'; + this.maintainData = [row]; + this.showDialog = true; + this.moldAddMore = false; }, // 批量维护 handleMaintain() { diff --git a/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue b/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue index 2148629..a7f0038 100644 --- a/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue +++ b/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue @@ -50,7 +50,7 @@