From 1224395c58d3f351b7170c0294d582fa7a13a60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Thu, 7 Nov 2024 13:43:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D-=E8=B4=A6?=
 =?UTF-8?q?=E5=8A=A1=E8=B4=A6=E6=9C=9F=E4=BF=A1=E6=81=AF-=E4=BA=BA?=
 =?UTF-8?q?=E6=B0=91=E5=B8=81=E3=80=81=E7=BE=8E=E9=87=91=E3=80=81swiftCode?=
 =?UTF-8?q?=20=E4=BB=A5=E5=8F=8A=20=E5=8E=9F=E6=95=B0=E6=8D=AE=E4=B8=BAnul?=
 =?UTF-8?q?l=E5=89=8D=E7=AB=AF=E8=BF=9B=E8=A1=8C=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/baseinfo/infoclient/EditColumns.tsx |  8 ++++++--
 src/views/baseinfo/infoclient/columns.tsx     | 14 +++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/baseinfo/infoclient/EditColumns.tsx b/src/views/baseinfo/infoclient/EditColumns.tsx
index faab3086..dc1ab920 100644
--- a/src/views/baseinfo/infoclient/EditColumns.tsx
+++ b/src/views/baseinfo/infoclient/EditColumns.tsx
@@ -75,7 +75,9 @@ if (res14.succeeded) {
 
     if (e.accountName && e.id) {
       rmbAccountData.push({
-        label: `${e.bankName}-${e.accountName}-${e.bankAccountNo}`,
+        label: `${e.bankName ? e.bankName : ''}${e.accountName ? `-${e.accountName}` : ''}${
+          e.bankAccountNo ? `-${e.bankAccountNo}` : ''
+        }`,
         value: e.id,
         ...e,
       })
@@ -93,7 +95,9 @@ if (res15.succeeded) {
   res15.data.forEach((e) => {
     if (e.accountName && e.id) {
       usdAccountData.push({
-        label: `${e.bankName}-${e.accountName}-${e.bankAccountNo}`,
+        label: `${e.bankName ? e.bankName : ''}${e.accountName ? `-${e.accountName}` : ''}${
+          e.bankAccountNo ? `-${e.bankAccountNo}` : ''
+        }${e.swiftCode ? `-${e.swiftCode}` : ''}`,
         value: e.id,
         ...e,
       })
diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index 3e564952..94c67df8 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -78,7 +78,9 @@ if (res14.succeeded) {
 
     if (e.accountName && e.id) {
       rmbAccountData.push({
-        label: `${e.bankName}-${e.accountName}-${e.bankAccountNo}`,
+        label: `${e.bankName ? e.bankName : ''}${e.accountName ? `-${e.accountName}` : ''}${
+          e.bankAccountNo ? `-${e.bankAccountNo}` : ''
+        }`,
         value: e.id,
         ...e,
       })
@@ -96,7 +98,9 @@ if (res15.succeeded) {
   res15.data.forEach((e) => {
     if (e.accountName && e.id) {
       usdAccountData.push({
-        label: `${e.bankName}-${e.accountName}-${e.bankAccountNo}-${e.swiftCode}`,
+        label: `${e.bankName ? e.bankName : ''}${e.accountName ? `-${e.accountName}` : ''}${
+          e.bankAccountNo ? `-${e.bankAccountNo}` : ''
+        }${e.swiftCode ? `-${e.swiftCode}` : ''}`,
         value: e.id,
         ...e,
       })
@@ -1406,7 +1410,7 @@ export const formSchema2: FormSchema[] = [
   },
   {
     label: '进账美金SwiftCode',
-    field: 'usdSwiftCode',
+    field: 'swiftCode',
     component: 'Input',
     show: false,
   },
@@ -1430,13 +1434,13 @@ export const formSchema2: FormSchema[] = [
             formModel.usdAccountId = obj.value
             formModel.usdBankName = obj.bankName
             formModel.usdBankAccountNo = obj.bankAccountNo
-            formModel.usdSwiftCode = obj.swiftCode
+            formModel.swiftCode = obj.swiftCode
           }
           if (!e && !obj) {
             formModel.usdAccountId = ''
             formModel.usdBankName = ''
             formModel.usdBankAccountNo = ''
-            formModel.usdSwiftCode = ''
+            formModel.swiftCode = ''
           }
         },
       }