From 0645febfb2cf3e79549f73a1be4e1d252c4f6949 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 3 Jan 2025 14:13:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=99=BB=E8=AE=B0=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BA=E5=AE=9A=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/files/edit/BS034.js |  5 ++++-
 src/files/edit/BS057.js | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/files/edit/BS034.js b/src/files/edit/BS034.js
index d2f8774..f5b172a 100644
--- a/src/files/edit/BS034.js
+++ b/src/files/edit/BS034.js
@@ -183,11 +183,14 @@ export default {
   checkList: ({ row, pageCode, record, colInfo, resetFields, saveHeadRecord, stateData, saveRowRecord, getSelectedRecords, setState }) => {
     // var ListSafeCheckDetail = stateData.Nav_ListSafeCheckDetail
     if (stateData.Nav_ListSafeCheckDetail != undefined && stateData.Nav_ListSafeCheckDetail != null && stateData.Nav_ListSafeCheckDetail.length > 0) {
+      var QuestionID = ''
       stateData.Nav_ListSafeCheckDetail.forEach((item, i) => {
         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 || item.Nav_ListCheckDetailQuestion[j].Nav_Question?.ID.indexOf("6666-6666-66666666666") > 0) {
+              QuestionID = item.Nav_ListCheckDetailQuestion[j].Nav_Question?.ID
+              // if (item.Nav_ListCheckDetailQuestion[j].Nav_Question?.ID.indexOf("5555-555555555555") > 0 || item.Nav_ListCheckDetailQuestion[j].Nav_Question?.ID.indexOf("6666-6666-66666666666") > 0) {
+              if (QuestionID.indexOf("5555-555555555555") > 0 || QuestionID.indexOf("666-666666666666") > 0 || QuestionID.indexOf("888-888888888888") > 0 || QuestionID.indexOf("999-999999999999") > 0) {
                 item.Nav_ListCheckDetailUser[0].ISCHECK = true
                 item.Nav_ListCheckDetailUser[0].ISSAMEMAINCHECKOK = true
                 break
diff --git a/src/files/edit/BS057.js b/src/files/edit/BS057.js
index dfbd9c0..39bf757 100644
--- a/src/files/edit/BS057.js
+++ b/src/files/edit/BS057.js
@@ -241,9 +241,9 @@ export default {
         }
       } else {
         if (listQ != null && listQ.length > 1) {
-          var listQCheck = listQ.filter(e => e.SAFE_CHECK_QUESTION_ID == '55555555-5555-5555-5555-555555555555')
+          var listQCheck = listQ.filter(e => e.SAFE_CHECK_QUESTION_ID == '55555555-5555-5555-5555-555555555555' || e.SAFE_CHECK_QUESTION_ID == '66666666-6666-6666-6666-666666666666' || e.SAFE_CHECK_QUESTION_ID == '88888888-8888-8888-8888-888888888888')
           if (listQCheck != null && listQCheck.length > 0) {
-            message.error("无与检查问题不能同时选择!")
+            message.error("符合要求/不存在/不涉及与检查问题等不能同时选择!")
             return
           }
         }
@@ -251,6 +251,10 @@ export default {
         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 == '88888888-8888-8888-8888-888888888888') {
+          CHECKRESULT = 16
+        } else if (listQ[0].SAFE_CHECK_QUESTION_ID == '99999999-9999-9999-9999-999999999999') {
+          CHECKRESULT = 17
         } else if (listQ[0].SAFE_CHECK_QUESTION_ID != '55555555-5555-5555-5555-555555555555') {
           CHECKRESULT = 20
         }
@@ -308,7 +312,7 @@ export default {
           //保存信息
           record["CHECKRESULT"] = CHECKRESULT
 
-          if (CHECKRESULT == 10 || CHECKRESULT == 15) {
+          if (CHECKRESULT == 10 || CHECKRESULT == 15 || CHECKRESULT == 16 || CHECKRESULT == 17) {
             record["QUESTION_LEVEL"] = null
             record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
             record.QUESTION_LEVEL = null