From 30205bbf3ca9bf47c7393a9f9d7c81eeba7cc70f Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Fri, 8 Nov 2024 13:59:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/feeSettlement/columns.tsx            | 10 ++++++----
 .../paymentSettlementFree/columns.tsx                  | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/finance/feeSettlement/columns.tsx b/src/views/finance/feeSettlement/columns.tsx
index 72ff7f66..6f047f81 100644
--- a/src/views/finance/feeSettlement/columns.tsx
+++ b/src/views/finance/feeSettlement/columns.tsx
@@ -407,7 +407,8 @@ export const detailForm: FormSchema[] = [
             }
             GetClientBankList(data).then((res) => {
               res.data.forEach(item => {
-                item.showName = item.bankName + ' ' + item.account
+                item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :''
+                item.showName = item.bankName + ' ' + item.bankAccountNo
               })
               resolve(res)
             })
@@ -420,7 +421,7 @@ export const detailForm: FormSchema[] = [
         onChange: (e, obj) => {
           if (obj) {
             formModel.customerBankId = obj.id
-            formModel.customerAccount = obj.account
+            formModel.customerAccount = obj.bankAccountNo
           }
           if (!obj && !e) {
             formModel.customerBankId = ''
@@ -495,8 +496,9 @@ export const detailForm: FormSchema[] = [
             }
             getBankList(data).then(res => {
               res.data.forEach(item=>{
-                item.label = item.bankName + ' ' + item.account
-                item.value = item.bankName + ' ' + item.account
+                item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :''
+                item.label = item.bankName + ' ' + item.bankAccountNo
+                item.value = item.bankName + ' ' + item.bankAccountNo
               })
               bankList.value = res.data
             })
diff --git a/src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx b/src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx
index 66ed1e5a..b34f797d 100644
--- a/src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx
+++ b/src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx
@@ -402,7 +402,8 @@ export const detailForm: FormSchema[] = [
             }
             GetClientBankList(data).then((res) => {
               res.data.forEach(item => {
-                item.showName = item.bankName + ' ' + item.account
+                item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :''
+                item.showName = item.bankName + ' ' + item.bankAccountNo
               })
               resolve(res)
             })
@@ -415,7 +416,7 @@ export const detailForm: FormSchema[] = [
         onChange: (e, obj) => {
           if (obj) {
             formModel.customerBankId = obj.id
-            formModel.customerAccount = obj.account
+            formModel.customerAccount = obj.bankAccountNo
           }
           if (!obj && !e) {
             formModel.customerBankId = ''
@@ -490,8 +491,9 @@ export const detailForm: FormSchema[] = [
             }
             getBankList(data).then(res => {
               res.data.forEach(item=>{
-                item.label = item.bankName + ' ' + item.account
-                item.value = item.bankName + ' ' + item.account
+                item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :''
+                item.label = item.bankName + ' ' + item.bankAccountNo
+                item.value = item.bankName + ' ' + item.bankAccountNo
               })
               bankList.value = res.data
             })