From 3c7c37d7f2e182dd5a3c58930b1c6b887f969676 Mon Sep 17 00:00:00 2001
From: zhangqihang <zhangqihang>
Date: Wed, 28 Feb 2024 09:02:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/hidden_view/index.vue          | 35 +++++++++++++++++++
 .../hidden_danger_government/ledger/index.vue |  1 +
 .../rectification/rectification.vue           |  4 +--
 .../hidden_list.vue                           |  3 +-
 .../hazard_management/index.vue               |  1 +
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/components/hidden_view/index.vue b/src/components/hidden_view/index.vue
index 3dfbab5..924e048 100644
--- a/src/components/hidden_view/index.vue
+++ b/src/components/hidden_view/index.vue
@@ -252,6 +252,39 @@
         </el-descriptions>
       </template>
     </template>
+    <template v-if="(data.info.SOURCE === '4' || data.info.SOURCE === '5') && data.info.FINAL_CHECK">
+      <el-divider content-position="left">安全环保验收信息</el-divider>
+        <el-descriptions :column="1" border class="mt-10">
+          <el-descriptions-item label="验收描述">
+            {{ data.info.FINAL_CHECKDESCR }}
+          </el-descriptions-item>
+          <el-descriptions-item label="是否合格">
+            <span v-if="data.info.FINAL_CHECK === '1'"> 是 </span>
+            <span v-else-if="data.info.FINAL_CHECK === '0'"> 否 </span>
+          </el-descriptions-item>
+          <el-descriptions-item label="验收部门">
+            {{ data.info.FINAL_CHECKOR_NDEPTNAME }}
+          </el-descriptions-item>
+          <el-descriptions-item label="验收人">
+            {{ data.info.FINAL_CHECKOR_NAME }}
+          </el-descriptions-item>
+          <el-descriptions-item label="验收时间">
+            {{ data.info.FINAL_CHECKTIME }}
+          </el-descriptions-item>
+          <el-descriptions-item label="验收图片">
+            <img
+              v-for="item1 in data.yImgs"
+              :key="item1.IMGFILES_ID"
+              v-viewer
+              :src="VITE_FILE_URL + item1.FILEPATH"
+              alt=""
+              width="100"
+              height="100"
+              class="ml-10"
+            />
+          </el-descriptions-item>
+        </el-descriptions>
+    </template>
   </div>
 </template>
 
@@ -288,6 +321,7 @@ const data = reactive({
   rImgs: [],
   sImgs: [],
   pImgs: [],
+  yImgs: [],
   checkList: [],
   videoDialog: {
     src: "",
@@ -315,6 +349,7 @@ const fnGetData = async () => {
   data.rImgs = resData.rImgs;
   data.sImgs = resData.sImgs;
   data.pImgs = resData.pImgs;
+  data.yImgs = resData.yImgs;
   emits("throw-data", data.info);
 };
 watchEffect(() => {
diff --git a/src/views/hidden_danger_government/ledger/index.vue b/src/views/hidden_danger_government/ledger/index.vue
index e723ee4..07be874 100644
--- a/src/views/hidden_danger_government/ledger/index.vue
+++ b/src/views/hidden_danger_government/ledger/index.vue
@@ -205,6 +205,7 @@ const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
       HIDDENLEVEL: "hiddenLevel0001",
       DISPOSESTATE: "-1",
       IS_SELF: "0",
+      STATE: 100,
     },
     defaultSearchForm: { STATE },
   });
diff --git a/src/views/hidden_danger_government/rectification/rectification.vue b/src/views/hidden_danger_government/rectification/rectification.vue
index 5557ca1..c7f16c7 100644
--- a/src/views/hidden_danger_government/rectification/rectification.vue
+++ b/src/views/hidden_danger_government/rectification/rectification.vue
@@ -429,8 +429,8 @@ const fnGetData = async () => {
   data.form.DEPARTMENT_NAME = resData.deppd.NAME;
   data.form.USER_NAME = resData.userpd.USERNAME;
   await fnInspectDepartmentChange(data.defaultDepartmentId, 0);
-  data.form.acceptanceList[0].DEPARTMENT_ID = data.defaultDepartmentId;
-  data.form.acceptanceList[0].USER_ID = data.defaultUserId;
+  // data.form.acceptanceList[0].DEPARTMENT_ID = data.defaultDepartmentId;
+  // data.form.acceptanceList[0].USER_ID = data.defaultUserId;
 };
 fnGetData();
 const fnAddInspectedList = () => {
diff --git a/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue b/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
index 10f8ff2..1ee775b 100644
--- a/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
+++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
@@ -87,9 +87,10 @@ const stateList = [
   { ID: "101", NAME: "待指派整改人" },
   { ID: "1", NAME: "待整改" },
   { ID: "2", NAME: "待验收" },
+  { ID: "3", NAME: "隐患待验收" },
   { ID: "10", NAME: "验收打回" },
   { ID: "4", NAME: "已验收" },
-  { ID: "-2", NAME: "已指派确认人" },
+  { ID: "-2", NAME: "已指派整改人" },
   { ID: "8", NAME: "特殊处置通过" },
   { ID: "16", NAME: "确认打回" },
 ];
diff --git a/src/views/safety_environmental_management/hazard_management/index.vue b/src/views/safety_environmental_management/hazard_management/index.vue
index 9ad646d..b2add98 100644
--- a/src/views/safety_environmental_management/hazard_management/index.vue
+++ b/src/views/safety_environmental_management/hazard_management/index.vue
@@ -161,6 +161,7 @@ const hiddenStatusList = [
   { ID: "-2", NAME: "待确认" },
   { ID: "1", NAME: "未整改" },
   { ID: "2", NAME: "已整改" },
+  { ID: "3", NAME: "隐患待验收" },
   { ID: "4", NAME: "已验收" },
   { ID: "10", NAME: "验收打回" },
   { ID: "7", NAME: "待处理的特殊隐患" },