Merge branch 'zth' into dev

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,
       })

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 = ''
           }
         },
       }