From 54645f374259b84d3b970c95cb39e00cd45504a7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 九月 2023 20:33:48 +0800
Subject: [PATCH] 2023-09-08
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index b6acd2e..beddccf 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -600,14 +600,23 @@
const { verify } = this.state
let columns = fromJS(verify.columns).toJS()
- let fields = columns.map(item => item.Column.toLowerCase())
+ 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 (!item.field) return
- if (fields.includes(item.field.toLowerCase())) {
- names.$up = true
- names[item.field.toLowerCase()] = item.label
+ let key = item.field.toLowerCase()
+ if (fields.includes(key)) {
+ if (_names[key] !== item.label) {
+ names.$up = true
+ names[key] = item.label
+ }
return
}
@@ -633,9 +642,12 @@
if (config.subtype === 'dualdatacard') {
config.subColumns.forEach(item => {
if (!item.field) return
- if (fields.includes(item.field.toLowerCase())) {
- names.$up = true
- names[item.field.toLowerCase()] = item.label
+ let key = item.field.toLowerCase()
+ if (fields.includes(key)) {
+ if (_names[key] !== item.label) {
+ names.$up = true
+ names[key] = item.label
+ }
return
}
--
Gitblit v1.8.0