From 2a7d7f61ce1c77645c035a8266442f6012a0e6bf Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Fri, 23 Aug 2024 17:34:33 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E6=8F=90=E4=BA=A4=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E8=B4=A8=E9=87=8F=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/recordsModule/inspectionRecord.vue    | 14 ++++++++++----
 .../safeSame/recordsModule/inspectionRecord.vue   | 15 +++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
index 7ba3ef09..3f3d609c 100644
--- a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
+++ b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
@@ -776,7 +776,7 @@
                     </p>
                     <p class="grid-content" v-if="item.type == 1 && item.violatorId">
                       <span class="label">违章人员：</span
-                      ><span class="value">{{ personList.find(ele => ele.id == item.violatorId).workerName }}</span>
+                      ><span class="value">{{ personList.filter(ele =>  item.violatorId.includes(ele.id)).map(ele => ele.workerName).join('、') }}</span>
                     </p>
                     <p class="grid-content" v-if="item.status == 1">
                       <span class="label">驳回说明：</span
@@ -875,6 +875,8 @@
                       >
                         <el-select
                           v-model="replyData.violatorId"
+                          multiple
+                          collapse-tags
                           filterable
                           size="mini"
                           placeholder="请选择"
@@ -1307,10 +1309,14 @@ loadPersonList(sn) {
         this.$message.error("请选择违章人员");
         return;
       }
-      this.replyData.qualityId = valId
-      this.replyData.createUser = this.userIdInfo
+      const result = {
+        ...this.replyData,
+        violatorId: this.replyData.violatorId.join(","),
+        qualityId: valId,
+        createUser: this.userIdInfo,
+      }
       console.log('整改提交的表单数据：：：', this.replyData);
-      addQualityRectifyRecordApi(this.replyData).then(res => {
+      addQualityRectifyRecordApi(result).then(res => {
         if (res.code == 200) {
           this.$message.success('提交成功')
           this.dialogDetil = false
diff --git a/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue b/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue
index 1e6b4efa..84bf30c8 100644
--- a/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue
+++ b/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue
@@ -776,7 +776,7 @@
                     </p>
                      <p class="grid-content" v-if="item.type == 1 && item.violatorId">
                       <span class="label">违章人员：</span
-                      ><span class="value">{{ personList.find(ele => ele.id == item.violatorId).workerName }}</span>
+                      ><span class="value">{{ personList.filter(ele =>  item.violatorId.includes(ele.id)).map(ele => ele.workerName).join('、') }}</span>
                     </p>
                     <p class="grid-content" v-if="item.status == 1">
                       <span class="label">驳回说明：</span
@@ -875,6 +875,8 @@
                       >
                         <el-select
                           v-model="replyData.violatorId"
+                          multiple
+                          collapse-tags
                           filterable
                           size="mini"
                           placeholder="请选择"
@@ -1307,11 +1309,16 @@ if (this.replyData.violatorId == "" && type == 1 && statusType == 2) {
         this.$message.error("请选择违章人员");
         return;
       }
-      this.replyData.qualityId = valId
-      this.replyData.createUser = this.userIdInfo
+      const result = {
+        ...this.replyData,
+        violatorId: this.replyData.violatorId.join(","),
+        qualityId: valId,
+        createUser: this.userIdInfo,
+      }
+
       console.log('整改提交的表单数据：：：', this.replyData);
 
-      addSafeQualityRectifyRecordApi(this.replyData).then(res => {
+      addSafeQualityRectifyRecordApi(result).then(res => {
         if (res.code == 200) {
           this.$message.success('提交成功')
           this.dialogDetil = false