From 1b9fd7b9fd872a3f08c7f43bd6e5654225b585c2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 09:46:56 +0800
Subject: [PATCH] 2024-02-23
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 18 +++++++++---------
src/views/systemfunc/index.jsx | 2 ++
src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx | 2 +-
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 2 +-
4 files changed, 13 insertions(+), 11 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)
})
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 5c664eb..a8733e8 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -888,7 +888,7 @@
</Col> : null}
<Col span={8}>
<Form.Item label={
- <Tooltip placement="topRight" title="鑷畾涔夐獙璇丒xcel鏍煎紡锛屽彲鐢ㄥ弬鏁颁负 XLSX銆乨ata銆乧olumns銆乧allback銆�">
+ <Tooltip placement="topRight" title="鑷畾涔夐獙璇丒xcel鏍煎紡锛屽彲鐢ㄥ弬鏁颁负 XLSX銆亀orkbook銆乥tn銆乧allback銆�">
<QuestionCircleOutlined className="mk-form-tip" />
瀵煎叆鏍煎紡
</Tooltip>
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx
index 3460133..1e04573 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx
@@ -219,7 +219,7 @@
</Col> : null}
{btnType !== 'print' ? <Col span={8}>
<Form.Item label={
- <Tooltip placement="topRight" title="鑷畾涔夌敓鎴怑xcel锛屽彲鐢ㄥ弬鏁颁负 XLSX銆乨ata銆乧olumns銆乧allback銆�">
+ <Tooltip placement="topRight" title="鑷畾涔夌敓鎴怑xcel锛屽彲鐢ㄥ弬鏁颁负 XLSX銆乨ata銆乧olumns銆乻earches銆乧allback銆�">
<QuestionCircleOutlined className="mk-form-tip" />
瀵煎嚭鏍煎紡
</Tooltip>
diff --git a/src/views/systemfunc/index.jsx b/src/views/systemfunc/index.jsx
index 63bee5f..9c33163 100644
--- a/src/views/systemfunc/index.jsx
+++ b/src/views/systemfunc/index.jsx
@@ -11,6 +11,7 @@
// import './index.scss'
const Tabview = asyncComponent(() => import('@/components/tabview'))
+const ImgScale = asyncComponent(() => import('@/components/imgScale'))
class MkHS extends Component {
UNSAFE_componentWillMount() {
@@ -63,6 +64,7 @@
<Tabview key="tabview"/>
<Header key="header"/>
</ConfigProvider>
+ <ImgScale />
</div>
)
}
--
Gitblit v1.8.0