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/JVxeTableMixin.js |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/mixins/JVxeTableMixin.js b/src/mixins/JVxeTableMixin.js
index 3d2bc31..2a01351 100644
--- a/src/mixins/JVxeTableMixin.js
+++ b/src/mixins/JVxeTableMixin.js
@@ -53,11 +53,14 @@
         console.warn('鐢变簬浣犳病鏈夊湪 data 涓畾涔� addDefaultRowNum 鎴� addDefaultRowNum 涓嶆槸鏁板瓧锛屾墍浠ラ粯璁ゆ坊鍔犱竴鏉＄┖鏁版嵁锛屽鏋滀笉鎯抽粯璁ゆ坊鍔犵┖鏁版嵁锛岃灏嗗畾涔� addDefaultRowNum 涓� 0')
       }
       //update-begin-author:taoyan date:20210315 for: 涓�瀵瑰jvex 榛樿鍑犺涓嶅ソ浣夸簡 LOWCOD-1349
-      this.eachAllTable((item) => {
-        setTimeout(()=>{
-          item.addRows()
-        }, 30)
-      })
+      if (rowNum > 0) {
+        let newRows = new Array(rowNum).fill({})
+        this.eachAllTable((item) => {
+          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({})

--
Gitblit v1.9.3