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/SparePartReceiveDeatilList.vue | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/views/spare/modules/sparePartReceive/SparePartReceiveDeatilList.vue b/src/views/spare/modules/sparePartReceive/SparePartReceiveDeatilList.vue
index f57304a..b8a48a0 100644
--- a/src/views/spare/modules/sparePartReceive/SparePartReceiveDeatilList.vue
+++ b/src/views/spare/modules/sparePartReceive/SparePartReceiveDeatilList.vue
@@ -15,7 +15,7 @@
size='middle'
bordered
rowKey='id'
- :scroll='{x:true}'
+ :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -149,55 +149,53 @@
title: '澶囦欢缂栫爜',
align: 'center',
dataIndex: 'spareNum',
- width: 150
},
{
title: '澶囦欢鍚嶇О',
align: 'center',
dataIndex: 'spareName',
- width: 150
+
},
{
title: '瑙勬牸',
align: 'center',
dataIndex: 'specification',
- width: 130
+
},
{
title: '鍨嬪彿',
align: 'center',
dataIndex: 'model',
- width: 150
+
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitIdName',
- width: 100
+
},
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
- width: 100
+
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitIdName',
- width: 100
+
},
{
title: '杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity',
- width: 100
- },
+
+ }, */
{
title: '棰嗙敤鏁伴噺',
align: 'center',
dataIndex: 'receiveMainQuantity',
- width: 100
}
],
url: {
@@ -217,11 +215,11 @@
}
},
methods: {
-/* clearList() {
+ clearList() {
this.dataSource = []
this.selectedRowKeys = []
this.ipagination.current = 1
- },*/
+ },
loadData(arg) {
if (!this.url.list) {
--
Gitblit v1.9.3