From 3457909638c660c0cfcb521b6104ab64c679b914 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 19 九月 2023 16:23:16 +0800
Subject: [PATCH] 修改页面左右展示比例

---
 src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index 1fefdfb..e5a0ffc 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -17,18 +17,21 @@
                 @click="handleSW"
                 :disabled=SWbuttonDistable
                 type="primary"
+                v-has="'dailyInspectionOrder:SW'"
               >寮�宸�</a-button>
               <a-button
                 :style="{marginRight: '8px'}"
                 @click="handleReport"
                 :disabled="buttonDistable"
                 type="primary"
+                v-has="'dailyInspectionOrder:report'"
               >鎶ュ伐</a-button>
               <a-button
                 :style="{marginRight: '8px'}"
                 @click="handleReset"
                 :disabled="revocationDistable"
                 type="primary"
+                v-has="'dailyInspectionOrder:reset'"
               >鎾ら攢</a-button>
             </a-row>
           </div>
@@ -149,11 +152,14 @@
                       <a-select
                         v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '2'"
                         :value="text"
-                        :options="record.inspectionCycles"
                         @change="(e) => handleChange(e, record.key, col, index)"
                         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>
                       <a-input-number
                         :value="text"
                         v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
@@ -262,11 +268,13 @@
           @click="handleTS"
           :disabled="buttonDistable"
           type="primary"
+          v-has="'dailyInspectionOrder:TS'"
         >鏆傚瓨</a-button>
         <a-button
           @click="handleOk"
           :disabled="buttonDistable"
           type="primary"
+          v-has="'dailyInspectionOrder:save'"
         >淇濆瓨</a-button>
       </a-row>
     </div>
@@ -393,14 +401,12 @@
           dataIndex: 'abnormalDesc',
           scopedSlots: { customRender: 'abnormalDesc' },
         },
-        {
-          title: '寮傚父鎷嶇収',
-          align: 'center',
-          dataIndex: 'abnormalPhoto',
-          scopedSlots: { customRender: 'abnormalPhoto' },
-          // dataIndex: 'action',
-          // scopedSlots: { customRender: 'action' },
-        },
+        // {
+        //   title: '寮傚父鎷嶇収',
+        //   align: 'center',
+        //   dataIndex: 'abnormalPhoto',
+        //   scopedSlots: { customRender: 'abnormalPhoto' },
+        // },
         {
           title: '*寮傚父澶勭疆',
           align: 'center',
@@ -676,7 +682,15 @@
               target['judgmentResult'] = "";
             }
           } else {
-
+            target[column.dataIndex] = value;
+            if (value == "1") {
+              target['judgmentResult'] = "pass";
+            } else {
+              target['judgmentResult'] = "fail";
+            }
+            if (value == null || value == "") {
+              target['judgmentResult'] = "";
+            }
           }
         }
         if (column.dataIndex == 'abnormalDesc') {

--
Gitblit v1.9.3