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/processParametersTemplate/ProcessParametersTemplateModel.vue |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/eam/modules/processParametersTemplate/ProcessParametersTemplateModel.vue b/src/views/eam/modules/processParametersTemplate/ProcessParametersTemplateModel.vue
index 4013593..a8d2c74 100644
--- a/src/views/eam/modules/processParametersTemplate/ProcessParametersTemplateModel.vue
+++ b/src/views/eam/modules/processParametersTemplate/ProcessParametersTemplateModel.vue
@@ -22,8 +22,8 @@
             >
               <a-input
                 allowClear
-                :disabled="codeDisable"
-                :placeholder="disableSubmit?'':'璇疯緭鍏ュ伐鑹哄弬鏁版ā鏉跨紪鐮�'"
+                :disabled="true"
+                :placeholder="disableSubmit?'':'灏嗙敱绯荤粺鑷姩鐢熸垚'"
                 v-decorator="[ 'num', validatorRules.num]"
               />
             </a-form-item>
@@ -211,6 +211,7 @@
         add: "/eam/processParametersTemplate/add",
         edit: "/eam/processParametersTemplate/edit",
         loadTree: "/eam/processParameters/loadTree",
+        getNum: '/eam/sysIdentity/getNumNew',
       },
       treeData: [],
       TemplateDetailDataSource: [],
@@ -268,6 +269,13 @@
         this.codeDisable = true;
       } else {
         this.codeDisable = false;
+        this.$nextTick(() => {
+          getAction(this.url.getNum, { type: 'ProcessParametersTemplate', length: '4' }).then((res) => {
+            if (res.success) {
+              this.form.setFieldsValue({ num: res.message });
+            }
+          })
+        });
       }
     },
 

--
Gitblit v1.9.3