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/jeecg/JVxeTable/components/JVxeSubPopover.vue | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/components/jeecg/JVxeTable/components/JVxeSubPopover.vue b/src/components/jeecg/JVxeTable/components/JVxeSubPopover.vue
index 610de07..4e65df3 100644
--- a/src/components/jeecg/JVxeTable/components/JVxeSubPopover.vue
+++ b/src/components/jeecg/JVxeTable/components/JVxeSubPopover.vue
@@ -71,6 +71,12 @@
let className = target.className || ''
className = typeof className === 'string' ? className : className.toString()
+ // 鑾峰彇 td 鐖剁骇
+ let td = getParentNodeByTagName(target, 'td');
+ // 鐐瑰嚮鐨勬槸鎷栨嫿鎺掑簭鍒楋紝涓嶅仛澶勭悊
+ if (td && td.querySelector('.j-vxe-ds-icons')) {
+ return
+ }
// 鐐瑰嚮鐨勬槸expand锛屼笉鍋氬鐞�
if (className.includes('vxe-table--expand-btn')) {
return
--
Gitblit v1.9.3