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/riskPrevention/RiskPreventionForm.vue |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/eam/modules/riskPrevention/RiskPreventionForm.vue b/src/views/eam/modules/riskPrevention/RiskPreventionForm.vue
index 6fd0ce5..b880007 100644
--- a/src/views/eam/modules/riskPrevention/RiskPreventionForm.vue
+++ b/src/views/eam/modules/riskPrevention/RiskPreventionForm.vue
@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="鍗遍櫓婧愮紪鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
-              <a-input v-model="model.num" placeholder="璇疯緭鍏ュ嵄闄╂簮缂栫爜"  ></a-input>
+              <a-input v-model="model.num" placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚"  disabled ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -77,7 +77,8 @@
       url: {
         add: '/eam/riskPrevention/add',
         edit: '/eam/riskPrevention/edit',
-        queryById: '/eam/riskPrevention/queryById'
+        queryById: '/eam/riskPrevention/queryById',
+        getNum: '/eam/sysIdentity/getNumNew',
       }
     }
   },
@@ -97,6 +98,15 @@
     edit(record) {
       this.model = Object.assign({}, record)
       this.visible = true
+      if (!record.id) {
+        this.$nextTick(() => {
+          getAction(this.url.getNum, { type: 'RiskPrevention', length: '4' }).then((res) => {
+            if (res.success) {
+              this.form.setFieldsValue({ num: res.message });
+            }
+          })
+        });
+      }
     },
     submitForm() {
       const that = this

--
Gitblit v1.9.3