From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点,若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱

---
 src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue b/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue
index 8e5255d..398b08d 100644
--- a/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue
+++ b/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue
@@ -19,6 +19,7 @@
               <a-input
                 v-model="model.num"
                 placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚"
+                disabled
               ></a-input>
             </a-form-model-item>
           </a-col>
@@ -207,7 +208,7 @@
             defaultValue: ''
           },
           {
-            title: '璁惧缂栫爜',
+            title: '缁熶竴缂栫爜',
             key: 'equipmentNum',
             type: JVXETypes.normal,
             width: '150px',
@@ -414,17 +415,9 @@
     })
   },
   created() {
-    this.initNum()
   },
   methods: {
 
-    initNum() {
-      getAction(this.url.getNum, { type: 'EquipmentUnseal', length: '4' }).then((res) => {
-        if (res.success) {
-          this.model.num = res.message
-        }
-      })
-    },
     //閫夋嫨璁惧
     selectEquipmentList() {
       let ids = []
@@ -488,6 +481,12 @@
       if (this.model.id) {
         let params = { equipmentChangeId: this.model.id }
         this.requestSubTableData(this.url.equipmentUnsealDetail.list, params, this.equipmentUnsealDetailTable)
+      }else{
+        getAction(this.url.getNum, { type: 'EquipmentUnseal', length: '4' }).then((res) => {
+        if (res.success) {
+          this.model.num = res.message
+        }
+      })
       }
     },
     //鏍¢獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟

--
Gitblit v1.9.3