From 52b10180d77f2962e519300469811a911afa3cf2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 11 一月 2024 17:42:58 +0800
Subject: [PATCH] 保养拆分  页面问题修改

---
 src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index db7ef0f..ede2781 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -19,6 +19,14 @@
                 type="primary"
                 v-has="'dailyInspectionOrder:SW'"
               >寮�宸�</a-button>
+
+              <a-button
+                :style="{marginRight: '8px'}"
+                @click="handleNormalReport"
+                :disabled="buttonDistable"
+                type="primary"
+                v-has="'dailyInspectionOrder:normalReport'"
+              >缁撴灉鍏ㄩ儴姝e父</a-button>
               <a-button
                 :style="{marginRight: '8px'}"
                 @click="handleReport"
@@ -26,13 +34,6 @@
                 type="primary"
                 v-has="'dailyInspectionOrder:report'"
               >鎶ュ伐</a-button>
-              <a-button
-                :style="{marginRight: '8px'}"
-                @click="handleNormalReport"
-                :disabled="buttonDistable"
-                type="primary"
-                v-has="'dailyInspectionOrder:normalReport'"
-              >缁撴灉姝e父骞舵姤宸�</a-button>
               <a-button
                 :style="{marginRight: '8px'}"
                 @click="handleReset"
@@ -156,6 +157,16 @@
                         alt=""
                         style="max-width:80px;font-size: 12px;font-style: italic;"
                       />
+                      <!-- <j-dict-select-tag
+                        v-if="col.dataIndex == 'inspectionProjectResult' "
+                        allow-clear
+                        @input="handleChange()"
+                        :disabled="record.disabled"
+                        :placeholder="'璇烽�夋嫨鐐规缁撴灉'"
+                        :triggerChange="true"
+                        style="width: 100%"
+                        dictCode="inspection_project_result"
+                      /> -->
                       <a-select
                         v-if="col.dataIndex == 'inspectionProjectResult' "
                         :value="text"
@@ -163,7 +174,6 @@
                         style="width: 100%"
                         :disabled="record.disabled"
                       >
-                        <!-- :options="record.inspectionCycles" -->
                         <a-select-option value="1">姝e父</a-select-option>
                         <a-select-option value="2">寮傚父</a-select-option>
                         <a-select-option value="3">鏁呴殰鍋滄満</a-select-option>
@@ -507,7 +517,7 @@
       this.loadData1(1)
     },
     loadData() {
-      this.loadData1(1)
+      // this.loadData1(1)
     },
     getBackground() {
       return "background-color:rgba(127, 127, 127,0.08)";
@@ -630,8 +640,20 @@
       })
     },
 
-    //鎶ュ伐
+    //鎵�鏈夌粨鏋滄甯�
     handleNormalReport() {
+      const that = this;
+      for (let i = 0; i < that.dataSource.length; i++) {
+        let o = this.dataSource[i]
+        o.inspectionProjectResult = "1"
+        o.abnormalDesc = ""
+        o.treatmentMeasure = null
+      }
+    },
+
+
+    //鎶ュ伐
+    handleNormalReport1() {
       const that = this;
       that.confirmLoading = true;
       let formData = Object.assign(this.model);
@@ -757,11 +779,11 @@
           //   }
           // } else {
           target[column.dataIndex] = value;
-          // if (value == "1") {
-          //   target['judgmentResult'] = "pass";
-          // } else {
-          //   target['judgmentResult'] = "fail";
-          // }
+          if (value == 1) {
+            target['abnormalDesc'] = null;
+          }
+          target['treatmentMeasure'] = null;
+
           // if (value == null || value == "") {
           //   target['judgmentResult'] = "";
           // }

--
Gitblit v1.9.3