From 51b9e548b0e533e8a415ce141808f2bb747b381e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 18 三月 2024 16:08:49 +0800
Subject: [PATCH] 1、mdc菜单下除特殊要求外，页面表格最少条数由10条调整为30条，每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础管理和数据报表模块增加打印按钮，实现打印表格数据功能 3、设备管理、数据报表模块增加按照设备级别和设备类型查询表格数据 4、设备车间管理页面增加车间编码字段 5、修改组件名称以试图解决刷新后进入请求json页面问题
---
src/components/jeecg/JVxeTable/components/JVxeToolbar.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue b/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue
index 8d53634..578c981 100644
--- a/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue
+++ b/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue
@@ -10,6 +10,7 @@
<a-popconfirm
v-if="showRemove"
:title="`纭畾瑕佸垹闄よ繖 ${selectedRowIds.length} 椤瑰悧?`"
+ :disabled="disabled"
@confirm="trigger('remove')"
>
<a-button icon="minus" :disabled="disabled">鍒犻櫎</a-button>
@@ -54,7 +55,8 @@
},
btns() {
- let arr = this.toolbarConfig.btn || ['add', 'remove', 'clearSelection']
+ let {btn, btns} = this.toolbarConfig
+ let arr = btn || btns || ['add', 'remove', 'clearSelection']
let exclude = [...this.excludeCode]
// TODO 闇�瑕佸皢remove鏇挎崲batch_delete
// 绯荤粺榛樿鐨勬壒閲忓垹闄ょ紪鐮侀厤缃负 batch_delete 姝ゅ闇�瑕佽浆鍖栦竴涓�
--
Gitblit v1.9.3