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/dailyMaintenanceOrder/MaintenanceOrderModal.vue |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
index 59a3e8a..968d2a2 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
@@ -112,7 +112,7 @@
               <a-input
                 allow-clear
                 :disabled="true"
-                :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+                :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
                 v-decorator="['equipmentId', validatorRules.equipmentId ]"
               />
             </a-form-item>
@@ -449,12 +449,12 @@
         //   align: 'center',
         //   dataIndex: 'maintenanceTool'
         // },
-        {
-          title: '绀烘剰鍥�',
-          align: 'center',
-          dataIndex: 'photo',
-          scopedSlots: { customRender: 'photo' }
-        },
+        // {
+        //   title: '绀烘剰鍥�',
+        //   align: 'center',
+        //   dataIndex: 'photo',
+        //   scopedSlots: { customRender: 'photo' }
+        // },
         // {
         //   title: '缁翠繚涓撲笟',
         //   align: 'center',
@@ -488,7 +488,7 @@
         },
         useId: {
           rules: [
-            { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+            { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
           ]
         },
         maintenanceCycleId: {
@@ -637,7 +637,7 @@
     onSearchMaintenanceStandard() {
       let data = this.form.getFieldsValue(['useId']);
       if (data.useId == null || data.useId == "") {
-        this.$message.warning("璇峰厛閫夋嫨瀵硅薄閮ㄩ棬!");
+        this.$message.warning("璇峰厛閫夋嫨浣跨敤閮ㄩ棬!");
         return
       }
       this.$refs.DailyMaintenanceStandardList.list(data.useId);

--
Gitblit v1.9.3