From 80e0c5eb7648e77cae844e4628b433704e0fb865 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 22 二月 2023 00:21:07 +0800 Subject: [PATCH] 2023-02-22 --- src/menu/datasource/verifycard/index.jsx | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx index 3df5979..dcb2c3d 100644 --- a/src/menu/datasource/verifycard/index.jsx +++ b/src/menu/datasource/verifycard/index.jsx @@ -555,6 +555,25 @@ const { config, mainSearch } = this.props const { activeKey, setting, columns, subColumns, scripts } = this.state + if (config.subtype === 'dualdatacard') { + let arr = columns.map(col => col.field.toLowerCase()) + let _arr = [] + subColumns.forEach(col => { + if (arr.includes(col.field.toLowerCase())) { + _arr.push(col.field) + } + }) + + if (_arr.length > 0) { + notification.warning({ + top: 92, + message: '瀛愯〃涓瓧娈�' + _arr.join('銆�') + '涓庝富琛ㄥ瓧娈甸噸澶嶏紒', + duration: 5 + }) + return Promise.reject() + } + } + return new Promise((resolve, reject) => { if (activeKey === 'setting') { this.settingForm.handleConfirm().then(res => { -- Gitblit v1.8.0