From ddd818f74d59c1fdeeed29714d660d7e49200c04 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 06 三月 2025 15:54:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
index 10c1d18..32f21c1 100644
--- a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
+++ b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
@@ -18,7 +18,8 @@
             >
               <a-input
                 v-model='model.num'
-                placeholder='璇疯緭鍏ヨ鍒掑崟缂栧彿'
+                placeholder='鑷姩鐢熸垚'
+                :disabled="true"
               ></a-input>
             </a-form-model-item>
           </a-col>
@@ -247,10 +248,10 @@
       addDefaultRowNum: 0,
       model: {},
       validatorRules: {
-        num: [
-          { required: true, message: '璇疯緭鍏ヨ鍒掔紪鍙�!' },
-          { validator: (rule, value, callback) => validateDuplicateValue('mom_eam_project_maintenance_order', 'num', value, this.model.id, callback) }
-        ],
+        // num: [
+        //   { required: true, message: '璇疯緭鍏ヨ鍒掔紪鍙�!' },
+        //   { validator: (rule, value, callback) => validateDuplicateValue('mom_eam_project_maintenance_order', 'num', value, this.model.id, callback) }
+        // ],
         remark: [
           { required: false, message: '璇疯緭鍏ュ娉�!' }
         ]
@@ -313,15 +314,6 @@
             width: '140px',
             align: "center",
             fixed: 'left'
-          },
-          {
-            title: '璧勪骇缂栫爜',
-            key: 'assetNumber',
-            type: JVXETypes.normal,
-            width: '140px',
-            align: "center",
-            fixed: 'left',
-            defaultValue: ''
           },
           {
             title: '澶栧鍗曚綅',
@@ -684,6 +676,7 @@
     /** 璋冪敤瀹宔dit()鏂规硶涔嬪悗浼氳嚜鍔ㄨ皟鐢ㄦ鏂规硶 */
     editAfter() {
       this.$nextTick(() => {
+        this.model.file = this.model.annex;
       })
       // 鍔犺浇瀛愯〃鏁版嵁
       if (this.model.id) {

--
Gitblit v1.9.3