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/EquipmentMaintenancePlanList.vue | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/views/eam/EquipmentMaintenancePlanList.vue b/src/views/eam/EquipmentMaintenancePlanList.vue
index edbe67b..1e32c5e 100644
--- a/src/views/eam/EquipmentMaintenancePlanList.vue
+++ b/src/views/eam/EquipmentMaintenancePlanList.vue
@@ -102,7 +102,7 @@
<a-tabs defaultActiveKey="1">
<a-tab-pane tab="淇濆吇璁″垝鏄庣粏" key="1" >
- <EquipmentMaintenancePlanDetailList :mainId="equipmentMaintenancePlanDetailMainId" />
+ <EquipmentMaintenancePlanDetailList :mainId="equipmentMaintenancePlanDetailMainId" :mainStatus="mainStatus" />
</a-tab-pane>
</a-tabs>
@@ -164,9 +164,6 @@
title:'鍒涘缓鏃堕棿',
align:"center",
dataIndex: 'createTime',
- customRender:function (text) {
- return !text?"":(text.length>10?text.substr(0,10):text)
- },
width:200,
},
{
@@ -179,9 +176,6 @@
title:'淇敼鏃堕棿',
align:"center",
dataIndex: 'updateTime',
- customRender:function (text) {
- return !text?"":(text.length>10?text.substr(0,10):text)
- },
width:200,
},
{
@@ -221,6 +215,7 @@
selectedMainId:'',
superFieldList:[],
equipmentMaintenancePlanDetailMainId: '',
+ mainStatus:'',
}
},
created() {
@@ -253,6 +248,7 @@
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
this.equipmentMaintenancePlanDetailMainId = selectionRows[0]['id']
+ this.mainStatus = selectionRows[0]['status']
},
loadData(arg) {
if(!this.url.list){
--
Gitblit v1.9.3