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/mixins/JVxeTableModelMixin.js | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/mixins/JVxeTableModelMixin.js b/src/mixins/JVxeTableModelMixin.js index 606eaa5..f23847d 100644 --- a/src/mixins/JVxeTableModelMixin.js +++ b/src/mixins/JVxeTableModelMixin.js @@ -52,13 +52,16 @@ rowNum = 1 console.warn('鐢变簬浣犳病鏈夊湪 data 涓畾涔� addDefaultRowNum 鎴� addDefaultRowNum 涓嶆槸鏁板瓧锛屾墍浠ラ粯璁ゆ坊鍔犱竴鏉$┖鏁版嵁锛屽鏋滀笉鎯抽粯璁ゆ坊鍔犵┖鏁版嵁锛岃灏嗗畾涔� addDefaultRowNum 涓� 0') } - this.eachAllTable((item) => { - //update-begin-author:taoyan date:20210315 for: 涓�瀵瑰jvex 榛樿鍑犺涓嶅ソ浣夸簡 LOWCOD-1349 - setTimeout(()=>{ - item.addRows() - }, 30) - //update-end-author:taoyan date:20210315 for: 涓�瀵瑰jvex 榛樿鍑犺涓嶅ソ浣夸簡 LOWCOD-1349 - }) + if (rowNum > 0) { + let newRows = new Array(rowNum).fill({}) + this.eachAllTable((item) => { + //update-begin-author:taoyan date:20210315 for: 涓�瀵瑰jvex 榛樿鍑犺涓嶅ソ浣夸簡 LOWCOD-1349 + setTimeout(()=>{ + item.addRows(newRows) + }, 30) + //update-end-author:taoyan date:20210315 for: 涓�瀵瑰jvex 榛樿鍑犺涓嶅ソ浣夸簡 LOWCOD-1349 + }) + } if (typeof this.addAfter === 'function') this.addAfter(this.model) this.edit(this.model) }, -- Gitblit v1.9.3