From 2eedd429348dfc23b386f81f1fbdebc3574d2f1e Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Mon, 26 Jan 2026 14:26:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E7=B1=BB=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E9=A1=B9=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bathRefine/accumulateClass.vue            | 67 ++++---------------
 .../components/addAccumulateClassDialog.vue   | 11 ++-
 2 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/src/views/processManagement/bathRefine/accumulateClass.vue b/src/views/processManagement/bathRefine/accumulateClass.vue
index 168a0b7..017473e 100644
--- a/src/views/processManagement/bathRefine/accumulateClass.vue
+++ b/src/views/processManagement/bathRefine/accumulateClass.vue
@@ -70,37 +70,7 @@ export default {
         currentPage: 1,
         total: 0,
       },
-      batchNo: [
-        { label: '作业槽一', value: '1' },
-        { label: '作业槽二', value: '2' },
-        { label: '作业槽三', value: '3' },
-      ],
-      ruleTypeData: [
-        {
-          label: '电量差类',
-          value: 1,
-        },
-        {
-          label: '累计电量类',
-          value: 2,
-        },
-        {
-          label: '累计生产日期',
-          value: 3,
-        },
-        {
-          label: '主盐添加量类',
-          value: 4,
-        },
-        {
-          label: '累计生产面积',
-          value: 5,
-        },
-        {
-          label: '累计主盐添加量',
-          value: 6,
-        },
-      ],
+
       showDialog: false,
       tableData: [],
       option: {
@@ -196,6 +166,16 @@ export default {
               },
             ],
           },
+          {
+            label: '设备名称',
+            prop: 'deviceName',
+            search: false,
+            sortable: true,
+            overHidden: true,
+            headerAlign: 'center',
+            align: 'left',
+            width: 120,
+          },
           {
             label: '规则类型',
             prop: 'ruleType',
@@ -260,7 +240,7 @@ export default {
               },
             ],
           },
-          // 
+          //
           {
             label: '状态',
             prop: 'accumulatedStatus',
@@ -281,7 +261,6 @@ export default {
                 value: 2,
               },
             ],
-            
           },
           {
             label: '添加量',
@@ -388,28 +367,8 @@ export default {
                 value: 2,
               },
             ],
-            
           },
-          // {
-          //   label: '维护人',
-          //   prop: 'craftName',
-          //   search: false,
-          //   sortable: true,
-          //   headerAlign: 'center',
-          //   align: 'center',
-          //   display: false,
-          //   width: 120,
-          // },
-          // {
-          //   label: '维护时间',
-          //   prop: 'craftName',
-          //   search: false,
-          //   sortable: true,
-          //   headerAlign: 'center',
-          //   align: 'center',
-          //   display: false,
-          //   width: 120,
-          // },
+          
         ],
       },
     };
diff --git a/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue b/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
index 6983759..fb779d7 100644
--- a/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
+++ b/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
@@ -67,11 +67,11 @@
           </template>
           <template #default="scope">
             <el-form-item :prop="`tableData[${scope.$index}].device`" :rules="formRules.device">
-              <el-select v-model="scope.row.device" clearable filterable>
+              <el-select v-model="scope.row.device" clearable filterable @change="changeDevice(scope.$index)">
                 <el-option
                   v-for="item in scope.row.deviceOptions"
                   :key="item.id"
-                  :label="item.name"
+                  :label="`${item.deviceName}/${item.deviceCode}`"
                   :value="item.id"
                 ></el-option>
               </el-select>
@@ -310,6 +310,7 @@ export default {
     // 切换作业中心
     changeWorkCenter(index) {
       this.form.batchNo = '';
+      this.form.tableData[index].device = ''
       console.log(this.form.tableData[index]);
       this.getTankList(this.form.tableData[index].wcId, index);
       this.getEquipmentList(this.form.tableData[index].wcId, index)
@@ -321,9 +322,13 @@ export default {
     },
     getEquipmentList(val, index) {
       getEquipmentList({ workstationId: val ? val : '' }).then(res => {
-        this.form.tableData[index].deviceOptions = res.data.data;
+        this.form.tableData[index].deviceOptions = res.data.data.records;
       });
     },
+    changeDevice(index){
+      let select = this.form.tableData[index].deviceOptions.filter(row => row.id==this.form.tableData[index].device)
+      this.form.tableData[index].deviceName = select[0].deviceName
+    },
     getWorkCenterList() {
       getWorkCenterList().then(res => {
         this.wcData = res.data.data || [];