From 38348b249c453425c61ab73a3949113421fc5cf1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 19 九月 2023 11:51:16 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index d1ad8dc..be84eac 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -443,7 +443,7 @@
/**
* @description Excel 鐢熸垚
*/
- exportExcel = (data, ErrCode, message) => {
+ exportExcel = (data, ErrCode, msg) => {
const { btn } = this.props
let imgCol = false
@@ -527,7 +527,7 @@
this.table2excel(column, table)
- this.execSuccess({ErrCode: ErrCode || 'S', message: message || '瀵煎嚭鎴愬姛锛�'})
+ this.execSuccess({ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'})
} else {
let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
let cols = []
@@ -664,7 +664,7 @@
XLSX.writeFile(wb, `${btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`)
- this.execSuccess({ErrCode: ErrCode || 'S', message: message || '瀵煎嚭鎴愬姛锛�'})
+ this.execSuccess({ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'})
}
} catch (e) {
this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'})
--
Gitblit v1.8.0