From da5bf570afb1d4dbc14078ef5e71cc679c003121 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 九月 2023 10:15:13 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index ebce7e5..beddccf 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -600,11 +600,25 @@
const { verify } = this.state
let columns = fromJS(verify.columns).toJS()
- let fields = columns.map(item => item.Column)
+ let _names = {}
+ let fields = columns.map(item => {
+ let key = item.Column.toLowerCase()
+ _names[key] = item.Text
+
+ return key
+ })
+ let names = {$up: false}
config.columns.forEach(item => {
- if (fields.includes(item.field) || !item.field) return
- fields.push(item.field)
+ if (!item.field) return
+ let key = item.field.toLowerCase()
+ if (fields.includes(key)) {
+ if (_names[key] !== item.label) {
+ names.$up = true
+ names[key] = item.label
+ }
+ return
+ }
let cell = {
Column: item.field,
@@ -627,8 +641,15 @@
if (config.subtype === 'dualdatacard') {
config.subColumns.forEach(item => {
- if (fields.includes(item.field) || !item.field) return
- fields.push(item.field)
+ if (!item.field) return
+ let key = item.field.toLowerCase()
+ if (fields.includes(key)) {
+ if (_names[key] !== item.label) {
+ names.$up = true
+ names[key] = item.label
+ }
+ return
+ }
let cell = {
Column: item.field,
@@ -650,9 +671,37 @@
})
}
- this.setState({
- verify: {...verify, columns: columns}
- })
+ if (names.$up) {
+ const that = this
+
+ confirm({
+ content: '閮ㄥ垎瀛楁鍚嶇О涓庢樉绀哄垪涓嶄竴鑷达紝鏄惁鏇存柊锛�',
+ onOk() {
+ columns = columns.map(item => {
+ let key = item.Column.toLowerCase()
+
+ if (names[key]) {
+ item.Text = names[key]
+ }
+
+ return item
+ })
+
+ that.setState({
+ verify: {...verify, columns: columns}
+ })
+ },
+ onCancel() {
+ that.setState({
+ verify: {...verify, columns: columns}
+ })
+ }
+ })
+ } else {
+ this.setState({
+ verify: {...verify, columns: columns}
+ })
+ }
}
clearField = () => {
--
Gitblit v1.8.0