From e7f1d02ac5f4ad9f8a8455bb8595ab7d4fcacba9 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Fri, 2 Aug 2024 18:22:27 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E6=B3=A8=E9=87=8A=E8=BF=9D?=
 =?UTF-8?q?=E7=AB=A0=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectFront/quality/inspectionLedger.vue | 43 +++++++++++++++++++
 .../safeSame/inspectionLedger.vue             | 21 ++++++---
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/views/projectFront/quality/inspectionLedger.vue b/src/views/projectFront/quality/inspectionLedger.vue
index b1140c93..47427795 100644
--- a/src/views/projectFront/quality/inspectionLedger.vue
+++ b/src/views/projectFront/quality/inspectionLedger.vue
@@ -1846,6 +1846,10 @@
                       }}</span
                       ><span class="value">{{ item.createUserName }}</span>
                     </p>
+                    <!-- <p class="grid-content" v-if="item.type == 1">
+                      <span class="label">违章人员：</span
+                      ><span class="value">{{ item.createUserName }}</span>
+                    </p> -->
                     <p class="grid-content" v-if="item.type == 1">
                       <span class="label">整改状态：</span
                       ><span class="value">{{
@@ -1938,6 +1942,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.violationId"
+                          filterable
+                          size="mini"
+                          placeholder="请选择"
+                        >
+                          <el-option
+                            v-for="item in violationList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                          >
+                          </el-option>
+                        </el-select>
+                      </span>
+                    </div>
+                  </el-col>
+                </el-row> -->
                 <el-row :gutter="20">
                   <el-col :span="24">
                     <div class="grid-content">
@@ -2102,7 +2138,14 @@ export default {
         fileUrl: "",
         additionalRemarks: "",
         qualityId: "",
+        violationId: "",
       }, //未整改回复
+      violationList: [
+        {
+          value: "选项1",
+          label: "黄金糕",
+        },
+      ],
       dialogDetil: false,
       detailData: {},
       fileListRectification: [],
diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue
index 38af0d4c..3309fdbf 100644
--- a/src/views/projectFront/safeSame/inspectionLedger.vue
+++ b/src/views/projectFront/safeSame/inspectionLedger.vue
@@ -2001,10 +2001,10 @@
                       }}</span
                       ><span class="value">{{ item.createUserName }}</span>
                     </p>
-                    <p class="grid-content" v-if="item.type == 1">
-                      <span class="label">违章人员</span
+                    <!-- <p class="grid-content" v-if="item.type == 1">
+                      <span class="label">违章人员：</span
                       ><span class="value">{{ item.createUserName }}</span>
-                    </p>
+                    </p> -->
                     <p class="grid-content" v-if="item.type == 1">
                       <span class="label">整改状态：</span
                       ><span class="value">{{
@@ -2109,7 +2109,7 @@
                     </div>
                   </el-col>
                 </el-row>
-                <el-row :gutter="20" v-if="detailData.status == 2">
+                <!-- <el-row :gutter="20" v-if="detailData.status == 2">
                   <el-col :span="24">
                     <div class="grid-content">
                       <span
@@ -2140,7 +2140,7 @@
                       </span>
                     </div>
                   </el-col>
-                </el-row>
+                </el-row> -->
                 <el-row :gutter="20">
                   <el-col :span="24">
                     <div class="grid-content">
@@ -2507,6 +2507,17 @@ export default {
   },
   mounted() {},
   methods: {
+    //获取人员列表
+    getViolationList() {
+      let data = {
+        projectSn: this.projectSn,
+      };
+      getSubdivisionProjectApi(data).then((res) => {
+        if (res.code == 200) {
+          this.violationList = res.result;
+        }
+      });
+    },
     backQuestion(obj) {
       console.log("删除", obj);
       this.$confirm(