From 8e58b9a54b7b1065154a07a0ec0bf9b5b2fe083a Mon Sep 17 00:00:00 2001
From: 17630416519 <qazwsx123>
Date: Wed, 7 Jan 2026 13:23:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:andon=E6=8A=A5=E8=AD=A6=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AndonAlarmTypeDict/index.vue              | 52 ++++++++++++++++---
 .../humanComputerInteraction/index.vue        |  6 ++-
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/src/views/andonManagement/AndonAlarmTypeDict/index.vue b/src/views/andonManagement/AndonAlarmTypeDict/index.vue
index 8f196aa..7ff9a97 100644
--- a/src/views/andonManagement/AndonAlarmTypeDict/index.vue
+++ b/src/views/andonManagement/AndonAlarmTypeDict/index.vue
@@ -264,9 +264,10 @@ export default {
     },
     // 联系人选择变化处理
     handleReceiverChange(val, index) {
-      const selectedOption = this.alarmContactOptions.find(option => option.value === val);
+      // 获取选中的值和对应的标签
+      const selectedOptions = this.alarmContactOptions.filter(option => val.includes(option.value));
       this.form[`receiver${index}`] = val;
-      this.form[`receiver${index}Name`] = selectedOption ? selectedOption.label : undefined;
+      this.form[`receiver${index}Name`] = selectedOptions.map(option => option.label).join(',');
     },
     // 重置查询操作
     resetQuery() {
@@ -332,6 +333,20 @@ export default {
           this.form = {
             ...data,
           };
+          
+          // 如果后端返回的是逗号分隔的字符串，需要转换为数组
+          if (data.receiver1) {
+            this.form.receiver1 = data.receiver1.split(',');
+          }
+          if (data.receiver2) {
+            this.form.receiver2 = data.receiver2.split(',');
+          }
+          if (data.receiver3) {
+            this.form.receiver3 = data.receiver3.split(',');
+          }
+          if (data.receiver4) {
+            this.form.receiver4 = data.receiver4.split(',');
+          }
         }
       });
     },
@@ -340,14 +355,35 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           console.log(JSON.stringify(this.form));
-          let data={
+          let data = {
             ...this.form,
-            receiver1:this.form.receiver1.join(','),
-            receiver2:this.form.receiver2.join(',') ,
-            receiver3:this.form.receiver3.join(',') ,
-            receiver4:this.form.receiver4.join(',') ,
-
+            receiver1: Array.isArray(this.form.receiver1) ? this.form.receiver1.join(',') : this.form.receiver1,
+            receiver2: Array.isArray(this.form.receiver2) ? this.form.receiver2.join(',') : this.form.receiver2,
+            receiver3: Array.isArray(this.form.receiver3) ? this.form.receiver3.join(',') : this.form.receiver3,
+            receiver4: Array.isArray(this.form.receiver4) ? this.form.receiver4.join(',') : this.form.receiver4,
+            // 添加名称字段
+            receiver1Name: Array.isArray(this.form.receiver1) ? 
+              this.form.receiver1.map(id => {
+                const option = this.alarmContactOptions.find(opt => opt.value == id);
+                return option ? option.label : '';
+              }).join(',') : this.form.receiver1Name,
+            receiver2Name: Array.isArray(this.form.receiver2) ? 
+              this.form.receiver2.map(id => {
+                const option = this.alarmContactOptions.find(opt => opt.value == id);
+                return option ? option.label : '';
+              }).join(',') : this.form.receiver2Name,
+            receiver3Name: Array.isArray(this.form.receiver3) ? 
+              this.form.receiver3.map(id => {
+                const option = this.alarmContactOptions.find(opt => opt.value == id);
+                return option ? option.label : '';
+              }).join(',') : this.form.receiver3Name,
+            receiver4Name: Array.isArray(this.form.receiver4) ? 
+              this.form.receiver4.map(id => {
+                const option = this.alarmContactOptions.find(opt => opt.value == id);
+                return option ? option.label : '';
+              }).join(',') : this.form.receiver4Name,
           }
+          
           if (this.form.id != undefined && this.opertype === 2) {
             updateAndonAlarmTypeDict(data)
               .then((res) => {
diff --git a/src/views/andonManagement/humanComputerInteraction/index.vue b/src/views/andonManagement/humanComputerInteraction/index.vue
index d2180a9..5390e6c 100644
--- a/src/views/andonManagement/humanComputerInteraction/index.vue
+++ b/src/views/andonManagement/humanComputerInteraction/index.vue
@@ -481,6 +481,7 @@ export default {
                                 this.open = false;
                                 this.reset(); // 清空表单数据
                                 this.getLeftList();
+                                this.processingData = []
                             })
                             .catch((err) => {
 
@@ -533,7 +534,8 @@ export default {
                             message: '响应成功!'
                         });
                         this.form.status = '已响应'
-                        this.getLeftList();
+                        this.processingData = res.data.result
+                        // this.getLeftList();
                     }
                 })
 
@@ -583,7 +585,7 @@ export default {
                             message: '处理完毕!'
                         });
                         this.form.status = '已处理'
-                        this.getLeftList();
+                        this.processingData = res.data.result
                     }
                 })