From 4d6b9f8a2d7b316633e43b489eae9ada949c07b5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 10 九月 2024 10:18:08 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx index 2a87051..6cc49b6 100644 --- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx +++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx @@ -107,9 +107,9 @@ }) } else { MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout) - if (window.GLOB.systemType === 'production') { - MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'}) - } + // if (window.GLOB.systemType === 'production') { + // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'}) + // } } } @@ -381,7 +381,6 @@ if (btn.dataM === 'true') { param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : '' } - } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟 param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize) @@ -863,7 +862,10 @@ let _setting = {} let _orderBy = orderBy || '' + if (btn.verify.dataType === 'custom') { + _setting.uuid = btn.uuid + _setting.interType = 'system' _setting.arr_field = [] btn.verify.columns.forEach(col => { @@ -941,17 +943,9 @@ primaryId = primaryId ? 'excel:' + primaryId : '' } - let param = UtilsDM.getDefaultQueryParam(_setting, search, _orderBy, pageIndex, pageSize, primaryId, BID) + let param = UtilsDM.getQueryDataParams(_setting, search, _orderBy, pageIndex, pageSize, BID, primaryId) - param.DateCount = '' - - // 鏁版嵁绠$悊鏉冮檺 - if (sessionStorage.getItem('dataM') === 'true') { - param.dataM = 'Y' - } - if (BID) { - param.BID = BID - } + delete param.DateCount return param } -- Gitblit v1.8.0