From 445cfc2c5cee3d8fc0f8f1ffae5b66d9c761e681 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 19:15:39 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
index ac7eaa1..c5a0bbc 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
@@ -378,11 +378,11 @@
           },
           width: 50,
         },
-        {
-          title: '閮ㄤ綅',
-          align: 'center',
-          dataIndex: 'location'
-        },
+        // {
+        //   title: '閮ㄤ綅',
+        //   align: 'center',
+        //   dataIndex: 'location'
+        // },
         {
           title: '鐐规椤圭洰',
           align: 'center',
@@ -408,12 +408,12 @@
         //   align: 'center',
         //   dataIndex: 'inspectionTool'
         // },
-        {
-          title: '绀烘剰鍥�',
-          align: "center",
-          dataIndex: 'photo',
-          scopedSlots: { customRender: 'photo' },
-        },
+        // {
+        //   title: '绀烘剰鍥�',
+        //   align: "center",
+        //   dataIndex: 'photo',
+        //   scopedSlots: { customRender: 'photo' },
+        // },
       ],
       title: "鎿嶄綔",
       visible: false,
@@ -436,7 +436,7 @@
       validatorRules: {
         num: {
           rules: [
-            { required: true, message: '璇疯緭鍏ヨ澶囩紪鐮�!' },
+            { required: true, message: '璇疯緭鍏ョ粺涓�缂栫爜!' },
           ]
         },
         equipmentId: {

--
Gitblit v1.9.3