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/components/JVxeCells/JVxePopupCell.vue |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/components/JVxeCells/JVxePopupCell.vue b/src/components/JVxeCells/JVxePopupCell.vue
index 885933d..52c6be8 100644
--- a/src/components/JVxeCells/JVxePopupCell.vue
+++ b/src/components/JVxeCells/JVxePopupCell.vue
@@ -51,6 +51,10 @@
     enhanced: {
       aopEvents: {
         editActived(event) {
+          // 銆恑ssues/3854銆戦檮琛ㄦ帶浠剁被鍨嬩负popup蹇呭~鏃舵湭閫夋嫨鍊兼彁浜よ〃鍗曚細鎶ラ敊
+          if (event.$event && event.$event.type === 'valid-error') {
+            return;
+          }
           dispatchEvent.call(this, event, 'ant-input')
         },
       },

--
Gitblit v1.9.3