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/spare/modules/sparePartReceive/SparePartReceiveForm.vue |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
index f64c147..2b00a89 100644
--- a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
+++ b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
@@ -6,7 +6,7 @@
         <a-row>
           <a-col :span='12'>
             <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="true"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col  :span='12'>
@@ -345,6 +345,7 @@
         edit: '/spare/sparePartReceive/edit',
         getSysDeparts: "/eam/equipment/getSysDeparts",
         loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+        getNum: '/eam/sysIdentity/getNumNew',
         sparesReceiveDetail: {
           list: '/spare/sparePartReceive/querySparePartReceiveDeatilByMainId'
         }
@@ -457,6 +458,12 @@
       if (this.model.id) {
         let params = { id: this.model.id }
         this.requestSubTableData(this.url.sparesReceiveDetail.list, params, this.sparesReceiveDetailTable)
+      }else{
+        getAction(this.url.getNum, { type: 'SparePartReceive', length: '4' }).then((res) => {
+        if (res.success) {
+          this.model.num = res.message
+        }
+      })
       }
     },
     //鏍¢獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟

--
Gitblit v1.9.3