From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 1e1288b..7931f0e 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -596,18 +596,18 @@
clearField = () => {
const { verify } = this.state
- const _this = this
+ const that = this
confirm({
content: `纭畾娓呯┖Excel鍒楀悧锛焋,
onOk() {
- _this.setState({
+ that.setState({
verify: {
...verify,
columns: []
}
}, () => {
- _this.resetUniqueColumns()
+ that.resetUniqueColumns()
})
},
onCancel() {}
@@ -617,8 +617,8 @@
columnChange = (values, callback) => {
let verify = JSON.parse(JSON.stringify(this.state.verify))
- let fields = verify.columns.map(item => item.Column)
- if (fields.includes(values.Column)) {
+ let fields = verify.columns.map(item => item.Column.toLowerCase())
+ if (fields.includes(values.Column.toLowerCase())) {
notification.warning({
top: 92,
message: values.Column + '瀛楁宸插瓨鍦紒',
@@ -1038,7 +1038,12 @@
</Form.Item>
</Col> : null}
{window.GLOB.process && card.intertype === 'system' ? <Col span={8}>
- <Form.Item label="宸ヤ綔娴�">
+ <Form.Item label={
+ <Tooltip placement="bottomLeft" title="瀵煎叆Excel宸ヤ綔娴佷粎鏀寔鍙戣捣娴佺▼銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 宸ヤ綔娴�
+ </Tooltip>
+ }>
<Radio.Group value={verify.workFlow} onChange={(e) => {this.onOptionChange(e.target.value, 'workFlow')}}>
<Radio value="true">寮�鍚�</Radio>
<Radio value="false">涓嶅紑鍚�</Radio>
--
Gitblit v1.8.0