From 2bd0fe61e011c9a29a22af6de4b9cd4095da8b74 Mon Sep 17 00:00:00 2001
From: Rain <904416525@qq.com>
Date: Sat, 10 Aug 2024 19:08:17 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E5=AE=89=E5=85=A8/=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=20=E6=96=B0=E5=A2=9E=E8=BF=9D=E7=AB=A0=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recordsModule/inspectionRecord.vue        | 55 ++++++++++++++++++-
 .../recordsModule/inspectionRecord.vue        | 55 ++++++++++++++++++-
 2 files changed, 106 insertions(+), 4 deletions(-)

diff --git a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
index f74806b7..7ba3ef09 100644
--- a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
+++ b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
@@ -774,6 +774,10 @@
                         item.status == 2 ? '合格' : '不合格'
                       }}</span>
                     </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>
+                    </p>
                     <p class="grid-content" v-if="item.status == 1">
                       <span class="label">驳回说明：</span
                       ><span class="value">{{ item.additionalRemarks }}</span>
@@ -855,6 +859,38 @@
                     </div>
                   </el-col>
                 </el-row>
+                <el-row :gutter="20" v-if="detailData.status == 2">
+                  <el-col :span="24">
+                    <div class="grid-content">
+                      <span
+                        class="label"
+                        style="line-height: 30px; width: 90px"
+                      >
+                        <span style="color: red">*&nbsp;</span>违章人员：</span
+                      >
+
+                      <span
+                        class="value"
+                        style="width: calc(100% - 90px); margin-left: 0px"
+                      >
+                        <el-select
+                          v-model="replyData.violatorId"
+                          filterable
+                          size="mini"
+                          placeholder="请选择"
+                        >
+                          <el-option
+                            v-for="item in personList"
+                            :key="item.id"
+                            :label="item.workerName"
+                            :value="item.id"
+                          >
+                          </el-option>
+                        </el-select>
+                      </span>
+                    </div>
+                  </el-col>
+                </el-row>
                 <el-row :gutter="20">
                   <el-col :span="24">
                     <div class="grid-content">
@@ -984,7 +1020,7 @@ import {
   selectRectifyRecordListApi,
   addQualityRectifyRecordApi
 } from '@/assets/js/api/quality.js'
-import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage.js'
+import { getProjectChilderSystemUserListApi, getLaborManagementInfoListApi } from '@/assets/js/api/configManage.js'
 import { VueCropper } from 'vue-cropper'
 import {
   getSubdivisionProjectApi //所有分部分项工程， 以父子节点形式呈现
@@ -1004,7 +1040,9 @@ export default {
         fileUrl: '',
         additionalRemarks: '',
         qualityId: '',
+         violatorId: "",
       },//未整改回复
+      personList: [],
       dialogDetil: false,
       detailData: {},
       fileListRectification: [],
@@ -1175,6 +1213,14 @@ export default {
   },
   mounted() { },
   methods: {
+    //查询劳务和管理人员列表
+loadPersonList(sn) {
+      getLaborManagementInfoListApi({
+        projectSn: sn,
+      }).then((res) => {
+        this.personList = res.result;
+      });
+    },
     //关闭视频
     closeBtn() {
       this.isShow = false
@@ -1207,8 +1253,10 @@ export default {
         rectifyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         fileUrl: '',
         additionalRemarks: '',
+        violatorId: "",
       }
       this.fileListRectification = []
+      this.loadPersonList(item.projectSn);
     },
     //提交整改回复
     rectifAdd(valId, statusType, type) {
@@ -1255,7 +1303,10 @@ export default {
         this.$message.error('请选择整改时间')
         return;
       }
-
+ if (this.replyData.violatorId == "" && type == 1 && statusType == 2) {
+        this.$message.error("请选择违章人员");
+        return;
+      }
       this.replyData.qualityId = valId
       this.replyData.createUser = this.userIdInfo
       console.log('整改提交的表单数据：：：', this.replyData);
diff --git a/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue b/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue
index 4f98aac3..1e6b4efa 100644
--- a/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue
+++ b/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue
@@ -773,6 +773,10 @@
                       ><span class="value">{{
                         item.status == 2 ? '合格' : '不合格'
                       }}</span>
+                    </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>
                     </p>
                     <p class="grid-content" v-if="item.status == 1">
                       <span class="label">驳回说明：</span
@@ -855,6 +859,38 @@
                     </div>
                   </el-col>
                 </el-row>
+                <el-row :gutter="20" v-if="detailData.status == 2">
+                  <el-col :span="24">
+                    <div class="grid-content">
+                      <span
+                        class="label"
+                        style="line-height: 30px; width: 90px"
+                      >
+                        <span style="color: red">*&nbsp;</span>违章人员：</span
+                      >
+
+                      <span
+                        class="value"
+                        style="width: calc(100% - 90px); margin-left: 0px"
+                      >
+                        <el-select
+                          v-model="replyData.violatorId"
+                          filterable
+                          size="mini"
+                          placeholder="请选择"
+                        >
+                          <el-option
+                            v-for="item in personList"
+                            :key="item.id"
+                            :label="item.workerName"
+                            :value="item.id"
+                          >
+                          </el-option>
+                        </el-select>
+                      </span>
+                    </div>
+                  </el-col>
+                </el-row>
                 <el-row :gutter="20">
                   <el-col :span="24">
                     <div class="grid-content">
@@ -984,7 +1020,7 @@ import {
   selectSafeRectifyRecordListApi,
   addSafeQualityRectifyRecordApi
 } from '@/assets/js/api/quality.js'
-import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage.js'
+import { getProjectChilderSystemUserListApi, getLaborManagementInfoListApi } from '@/assets/js/api/configManage.js'
 import { VueCropper } from 'vue-cropper'
 import {
   getSubdivisionProjectApi //所有分部分项工程， 以父子节点形式呈现
@@ -1004,7 +1040,9 @@ export default {
         fileUrl: '',
         additionalRemarks: '',
         qualityId: '',
+         violatorId: "",
       },//未整改回复
+      personList: [],
       dialogDetil: false,
       detailData: {},
       fileListRectification: [],
@@ -1175,6 +1213,14 @@ export default {
   },
   mounted() { },
   methods: {
+     //查询劳务和管理人员列表
+loadPersonList(sn) {
+      getLaborManagementInfoListApi({
+        projectSn: sn,
+      }).then((res) => {
+        this.personList = res.result;
+      });
+    },
     //关闭视频
     closeBtn() {
       this.isShow = false
@@ -1207,8 +1253,10 @@ export default {
         rectifyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         fileUrl: '',
         additionalRemarks: '',
+        violatorId: "",
       }
       this.fileListRectification = []
+      this.loadPersonList(item.projectSn);
     },
     //提交整改回复
     rectifAdd(valId, statusType, type) {
@@ -1255,7 +1303,10 @@ export default {
         this.$message.error('请选择整改时间')
         return;
       }
-
+if (this.replyData.violatorId == "" && type == 1 && statusType == 2) {
+        this.$message.error("请选择违章人员");
+        return;
+      }
       this.replyData.qualityId = valId
       this.replyData.createUser = this.userIdInfo
       console.log('整改提交的表单数据：：：', this.replyData);