From 91ab6b5c20b03b1673ddebeebbb6bd757f9231a9 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Thu, 26 Sep 2024 16:43:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=99=BB=E8=AE=B0=20?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=A1=AE=E8=AE=A4=20=E3=80=90=E7=BC=BA?=
 =?UTF-8?q?=E9=A1=B9=E3=80=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/files/edit/BS034.js | 27 +++++++++++++++++++--------
 src/files/edit/BS057.js |  8 +++++---
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/files/edit/BS034.js b/src/files/edit/BS034.js
index 32d046f..d2f8774 100644
--- a/src/files/edit/BS034.js
+++ b/src/files/edit/BS034.js
@@ -15,7 +15,7 @@ export default {
     }
     onBeforeSaveHandleRecordLog(params, 'BS034', '安全检查')
   },
-  onBeforeEdit: ({ isNew,stateData, setFieldEditable, setFieldValue, dispatch, ListCheckRiskArea, setFieldValueByBatch, updateSubTableData, setFieldVisible }) => {
+  onBeforeEdit: ({ isNew, stateData, setFieldEditable, setFieldValue, dispatch, ListCheckRiskArea, setFieldValueByBatch, updateSubTableData, setFieldVisible }) => {
     setFieldEditable('Nav_CheckType.NAME', false)
     setFieldEditable('CHECKOBJECT', false)
     setFieldEditable('Nav_ListCheckRiskArea', false)
@@ -162,7 +162,7 @@ export default {
   // },
 
 
-   //退回
+  //退回
   btnBack: ({ record, setState, close, loadData, getLoadParam, login, btn, dispatch }) => {
     const data = {
       content: <FormPage formCode={btn.FORM_CODE} data={{
@@ -174,9 +174,9 @@ export default {
       }} />,
     };
     return {
-    content: <EditRowShowModal data={data} login={login} title={btn.LABEL}>
-    <Button  type={btn.CSS} icon={btn.ICON}>{btn.LABEL}</Button>
-    </EditRowShowModal>
+      content: <EditRowShowModal data={data} login={login} title={btn.LABEL}>
+        <Button type={btn.CSS} icon={btn.ICON}>{btn.LABEL}</Button>
+      </EditRowShowModal>
 
     }
   },
@@ -187,7 +187,7 @@ export default {
         if (item.Nav_ListCheckDetailQuestion != null && item.Nav_ListCheckDetailQuestion.length > 0) {
           for (let j = 0; j < item.Nav_ListCheckDetailQuestion.length; j++) {
             if (item.Nav_ListCheckDetailQuestion[j].IS_DELETED != undefined && item.Nav_ListCheckDetailQuestion[j].IS_DELETED != null && !item.Nav_ListCheckDetailQuestion[j].IS_DELETED) {
-              if (item.Nav_ListCheckDetailQuestion[j].Nav_Question?.ID.indexOf("5555-555555555555") > 0) {
+              if (item.Nav_ListCheckDetailQuestion[j].Nav_Question?.ID.indexOf("5555-555555555555") > 0 || item.Nav_ListCheckDetailQuestion[j].Nav_Question?.ID.indexOf("6666-6666-66666666666") > 0) {
                 item.Nav_ListCheckDetailUser[0].ISCHECK = true
                 item.Nav_ListCheckDetailUser[0].ISSAMEMAINCHECKOK = true
                 break
@@ -281,12 +281,17 @@ export default {
             // strDEMAND += (j > 0 ? ',' : '') + listQ[j].Nav_Question.DEMAND
             if (listQ[j].SAFE_CHECK_QUESTION_ID == '55555555-5555-5555-5555-555555555555') {
               if (CHECKRESULT != 10 && CHECKRESULT != 0) {
-                message.error("无或其他只能单选!")
+                message.error("符合要求或缺项只能单选!")
+              }
+              CHECKRESULT = 10
+            } else if (listQ[j].SAFE_CHECK_QUESTION_ID == '66666666-6666-6666-6666-666666666666') {
+              if (CHECKRESULT != 15 && CHECKRESULT != 0) {
+                message.error("符合要求或缺项只能单选!")
               }
               CHECKRESULT = 10
             } else if (listQ[j].SAFE_CHECK_QUESTION_ID == '77777777-7777-7777-7777-777777777777') {
               if (CHECKRESULT != 30 && CHECKRESULT != 0) {
-                message.error("无或其他只能单选!")
+                message.error("符合要求或缺项只能单选!")
               }
               CHECKRESULT = 30
             } else {
@@ -310,6 +315,12 @@ export default {
             record.QUESTION_LEVEL = null
             stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
             stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
+          } else if (CHECKRESULT == 15) {
+            record["QUESTION_LEVEL"] = null
+            record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
+            record.QUESTION_LEVEL = null
+            stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
+            stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
           } else if (CHECKRESULT == 20) {
             // 对应行 取第一个 未删除的 检查问题  显示 问题等级
             record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = strDEMAND
diff --git a/src/files/edit/BS057.js b/src/files/edit/BS057.js
index f88f066..dfbd9c0 100644
--- a/src/files/edit/BS057.js
+++ b/src/files/edit/BS057.js
@@ -248,8 +248,10 @@ export default {
           }
         }
 
-        var CHECKRESULT = 10 // 无 10 检查问题一致 20 其他 30
-        if (listQ[0].SAFE_CHECK_QUESTION_ID != '55555555-5555-5555-5555-555555555555') {
+        var CHECKRESULT = 10 // 无 10  缺项15  检查问题一致 20 其他 30
+        if (listQ[0].SAFE_CHECK_QUESTION_ID == '66666666-6666-6666-6666-666666666666') {
+          CHECKRESULT = 15
+        } else if (listQ[0].SAFE_CHECK_QUESTION_ID != '55555555-5555-5555-5555-555555555555') {
           CHECKRESULT = 20
         }
         var strDEMAND = ''
@@ -306,7 +308,7 @@ export default {
           //保存信息
           record["CHECKRESULT"] = CHECKRESULT
 
-          if (CHECKRESULT == 10) {
+          if (CHECKRESULT == 10 || CHECKRESULT == 15) {
             record["QUESTION_LEVEL"] = null
             record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
             record.QUESTION_LEVEL = null