From f26c6c94a7ac57e3c26c5c8bebcd667af72971dd Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 30 Nov 2024 15:31:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=89=E5=85=A8=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E9=A1=B9bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/eight_assignments/confined_space/gas/name.vue |  4 +++-
 pages/eight_assignments/security_measures.vue       | 12 +++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pages/eight_assignments/confined_space/gas/name.vue b/pages/eight_assignments/confined_space/gas/name.vue
index 0a4df94..844d0fe 100644
--- a/pages/eight_assignments/confined_space/gas/name.vue
+++ b/pages/eight_assignments/confined_space/gas/name.vue
@@ -28,7 +28,7 @@
         </u-form-item>
       </u-form>
       <view class="mt-10">
-        <u-button type="primary" text="气体分析" @click="$u.debounce(fnSubmit, 1000,true)"/>
+        <u-button v-if="isView !== '1'" type="primary" text="气体分析" @click="$u.debounce(fnSubmit, 1000,true)"/>
       </view>
     </view>
   </view>
@@ -56,11 +56,13 @@ export default {
         GAS_STANDARD4: '',
       },
       rules: {},
+      isView: ''
     }
   },
   onLoad(query) {
     this.EW_RU_TASK_ID = query.taskId
     this.EW_RU_JOB_ID = query.EW_RU_JOB_ID
+    if (query.isView === '1') this.isView = '1'
   },
   onShow() {
     this.fnGetData()
diff --git a/pages/eight_assignments/security_measures.vue b/pages/eight_assignments/security_measures.vue
index 8328349..2b3d962 100644
--- a/pages/eight_assignments/security_measures.vue
+++ b/pages/eight_assignments/security_measures.vue
@@ -71,8 +71,18 @@ export default {
     },
     async fnSubmit() {
       for (let i = 0; i < this.items.length; i++) {
+        let isYes = false;
+        for (let j = 0; j < this.items[i].options.length; j++) {
+          if (
+              this.items[i].options[j].MARKERS &&
+              this.items[i].options[j].MARKERS === "1" &&
+              this.items[i].options[j].VALUE_INFO === "1"
+          ) {
+            isYes = true;
+          }
+        }
         for (let j = 0; j < this.items[i].inputBoxes.length; j++) {
-          if (!this.items[i].inputBoxes[j].MARKERS) {
+          if (isYes && !this.items[i].inputBoxes[j].MARKERS) {
             uni.$u.toast(`第${i + 1}行第${j + 1}项未填写`)
             return
           }