From 592d8716abc17ab019d3d7cda743b39728709d44 Mon Sep 17 00:00:00 2001
From: zhangyanli <zhangyanli@zcloudchina.com>
Date: Sun, 4 Feb 2024 08:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory_troubleshooting/index.vue             |  2 +-
 .../{standard_inspect.vue => inspect_custom.vue}    | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename src/views/hazard_investigation/inventory_troubleshooting/{standard_inspect.vue => inspect_custom.vue} (97%)

diff --git a/src/views/hazard_investigation/inventory_troubleshooting/index.vue b/src/views/hazard_investigation/inventory_troubleshooting/index.vue
index 91e8fc8..626956f 100644
--- a/src/views/hazard_investigation/inventory_troubleshooting/index.vue
+++ b/src/views/hazard_investigation/inventory_troubleshooting/index.vue
@@ -190,7 +190,7 @@ const fnInspect = (ID, LIST_TYPE) => {
     path:
       LIST_TYPE === "1"
         ? "/hazard_investigation/inventory_troubleshooting/inspect"
-        : "/hazard_investigation/inventory_troubleshooting/standard_inspect",
+        : "/hazard_investigation/inventory_troubleshooting/inspect_custom",
     query: { ID },
   });
 };
diff --git a/src/views/hazard_investigation/inventory_troubleshooting/standard_inspect.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
similarity index 97%
rename from src/views/hazard_investigation/inventory_troubleshooting/standard_inspect.vue
rename to src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
index d116bcf..f4d0a67 100644
--- a/src/views/hazard_investigation/inventory_troubleshooting/standard_inspect.vue
+++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue
@@ -41,14 +41,7 @@
       <el-table-column prop="CHECK_ITEM_NAME" label="检查项目" />
       <el-table-column prop="CHECK_CONTENT" label="检查内容" />
       <el-table-column prop="CHECK_STANDARD" label="检查标准" />
-      <el-table-column prop="CHECK_QUALIFIED" label="检查合格项" />
-      <el-table-column prop="CHECK_UNQUALIFIED" label="检查不合格项" />
-      <el-table-column label="操作类型">
-        <template v-slot="{ row }">
-          <span v-if="row.OPERATION_TYPE === 1">选择</span>
-          <span v-if="row.OPERATION_TYPE === 2">填写</span>
-        </template>
-      </el-table-column>
+      <el-table-column prop="CHECK_RESULT" label="检查结果" />
       <el-table-column label="操作" width="280">
         <template v-slot="{ row, $index }">
           <el-radio-group
@@ -384,6 +377,7 @@ const fnDisabledDate = (time) => {
   else return false;
 };
 const fnQualified = async (index, row) => {
+  row.CHECK_RESULT = row.CHECK_QUALIFIED;
   if (row.HASHIDDEN > 0) return;
   data.qualifiedDialog.visible = true;
   await nextTick();
@@ -497,6 +491,7 @@ const fnSubmit = debounce(
       item.CUSTOM_ITEM_ID = inspectionList.value[i].CUSTOM_ITEM_ID;
       item.ISNORMAL = inspectionList.value[i].ISNORMAL;
       item.RECORDITEM_ID = inspectionList.value[i].RECORDITEM_ID;
+      item.CHECK_RESULT = inspectionList.value[i].CHECK_RESULT;
       items.push(item);
       if (inspectionList.value[i].ISNORMAL === 1)
         ids.push(inspectionList.value[i].HIDDEN_ID);
@@ -505,7 +500,7 @@ const fnSubmit = debounce(
     if (inspectedList.length > 0) inspectedList.splice(0, 1);
     const params = {
       ID,
-      LIST_NAME: info.value.NAME,
+      CUSTOM_NAME: info.value.NAME,
       CHECK_TIME: data.form.CHECK_TIME,
       DESCR: data.form.DESCR,
       ITEMS: JSON.stringify(items),