From 8a4d90d80c6ae8472bf11a1c1f148ca49c90f0a7 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 29 五月 2025 15:42:59 +0800
Subject: [PATCH] 1、设备TEEP、设备开动率以及班次利用率页面时间选择器新增用户选择时对时间范围的限制功能并测试大数据导出功能 2、生产设备自主维护点检表设备编号的输入方式由手动输入调整为弹窗选择输入 3、生产设备自主维护点检表页面调整周保执行记录渲染逻辑(日期对应到周)

---
 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