From 3f0f0b7e222cf0c159b6f646af7084ed4c29e409 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 26 八月 2023 10:46:52 +0800 Subject: [PATCH] 2023-08-26 --- src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx index 3dfd201..c4d8307 100644 --- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx +++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx @@ -168,7 +168,7 @@ Api.genericInterface(param).then(result => { if (result.status) { - this.exportExcel(result.data) + this.exportExcel(result.data, result.ErrCode, result.message) } else { this.execError(result) } @@ -182,7 +182,7 @@ Api.genericInterface(param).then(result => { if (result.status) { - this.exportExcel(result.data) + this.exportExcel(result.data, result.ErrCode, result.message) } else { this.execError(result) } @@ -235,7 +235,7 @@ Api.genericInterface(param).then(result => { if (result.status) { - this.exportExcel(result.data) + this.exportExcel(result.data, result.ErrCode, result.message) } else { this.execError(result) } @@ -296,7 +296,7 @@ Api.genericInterface(res).then(result => { if (result.status) { - this.exportExcel(result.data) + this.exportExcel(result.data, result.ErrCode, result.message) } else { this.execError(result) } @@ -390,7 +390,7 @@ this.getExcelOutDoubleData(viewParam, pageIndex, pageSize, data) } else { data = data.concat(result.data) - this.exportExcel(data) + this.exportExcel(data, result.ErrCode, result.message) } } else { this.execError(result) @@ -475,7 +475,7 @@ this.getExcelOutData(viewParam, pageIndex, pageSize, data) } else { data = data.concat(result.data) - this.exportExcel(data) + this.exportExcel(data, result.ErrCode, result.message) } } else { this.execError(result) @@ -489,7 +489,7 @@ /** * @description Excel 鐢熸垚 */ - exportExcel = (data) => { + exportExcel = (data, ErrCode, message) => { const { btn } = this.props let imgCol = false @@ -573,7 +573,7 @@ this.table2excel(column, table) - this.execSuccess({ErrCode: 'S', message: '瀵煎嚭鎴愬姛锛�'}) + this.execSuccess({ErrCode: ErrCode || 'S', message: message || '瀵煎嚭鎴愬姛锛�'}) } else { let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' let cols = [] @@ -710,7 +710,7 @@ XLSX.writeFile(wb, `${btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`) - this.execSuccess({ErrCode: 'S', message: '瀵煎嚭鎴愬姛锛�'}) + this.execSuccess({ErrCode: ErrCode || 'S', message: message || '瀵煎嚭鎴愬姛锛�'}) } } catch (e) { this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'}) @@ -892,18 +892,18 @@ * 4銆佹ā鎬佹鎵ц鎴愬姛鍚庢槸鍚﹀叧闂� * 5銆侀�氱煡涓诲垪琛ㄥ埛鏂� */ - execSuccess = (res = {}) => { + execSuccess = (res) => { const { btn } = this.props - if (res.ErrCode === 'S' || !res.ErrCode) { // 鎵ц鎴愬姛 + if (res.ErrCode === 'S') { // 鎵ц鎴愬姛 notification.success({ top: 92, - message: res.message || '鎵ц鎴愬姛锛�', + message: res.message, duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2 }) } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛 Modal.success({ - title: res.message || '鎵ц鎴愬姛锛�' + title: res.message }) } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず -- Gitblit v1.8.0