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/equipmentTransferIn/EquipmentTransferInDetail.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue b/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue
index 8c64516..6c9de01 100644
--- a/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue
+++ b/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue
@@ -19,7 +19,7 @@
size='middle'
bordered
rowKey='id'
- :scroll='{x:true}'
+ :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -67,6 +67,7 @@
// disableMixinCreated: true,
// originTargetKeys: [],
// 琛ㄥご
+ disableMixinCreated: true,
columns: [
{
title: '#',
@@ -79,7 +80,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
@@ -132,10 +133,11 @@
title: '璋冨叆绠＄悊浜�',
align: 'center',
dataIndex: 'inManagerName'
- }, {
+ },
+ {
title: '璋冨叆璐ｄ换鐝粍',
align: 'center',
- dataIndex: 'responsibilityTeamId'
+ dataIndex: 'responsibilityTeamName'
},
{
--
Gitblit v1.9.3