From 7e5200a09b2c6282382ec8725220f5561de139f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 18:05:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index af9100d..59c62e1 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, result.ErrCode, result.message)
+ this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
} else {
this.execError(result)
}
@@ -187,7 +187,7 @@
Api.genericInterface(param).then(result => {
if (result.status) {
- this.exportExcel(result.data, result.ErrCode, result.message)
+ this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
} else {
this.execError(result)
}
@@ -226,7 +226,7 @@
Api.genericInterface(param).then(result => {
if (result.status) {
- this.exportExcel(result.data, result.ErrCode, result.message)
+ this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
} else {
this.execError(result)
}
@@ -273,7 +273,7 @@
Api.genericInterface(res).then(result => {
if (result.status) {
- this.exportExcel(result.data, result.ErrCode, result.message)
+ this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
} else {
this.execError(result)
}
@@ -353,7 +353,7 @@
this.getExcelOutDoubleData(viewParam, pageIndex, pageSize, data)
} else {
data = data.concat(result.data)
- this.exportExcel(data, result.ErrCode, result.message)
+ this.exportExcel(data, result.ErrCode, result.message, viewParam.search)
}
} else {
this.execError(result)
@@ -429,7 +429,7 @@
this.getExcelOutData(viewParam, pageIndex, pageSize, data)
} else {
data = data.concat(result.data)
- this.exportExcel(data, result.ErrCode, result.message)
+ this.exportExcel(data, result.ErrCode, result.message, viewParam.search)
}
} else {
this.execError(result)
@@ -443,7 +443,7 @@
/**
* @description Excel 鐢熸垚
*/
- exportExcel = (data, ErrCode, msg) => {
+ exportExcel = (data, ErrCode, msg, search) => {
const { btn } = this.props
let imgCol = false
@@ -486,8 +486,8 @@
try {
if (btn.verify.excelHandle === 'true') {
// eslint-disable-next-line
- let func = new Function('XLSX', 'data', 'columns', 'callback', btn.verify.excel_func)
- func(XLSX, data, columns, (res) => {
+ let func = new Function('XLSX', 'data', 'columns', 'searches', 'callback', btn.verify.excel_func)
+ func(XLSX, data, columns, search, (res) => {
res = res || {ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'}
this.execSuccess(res)
})
--
Gitblit v1.8.0