From 7cb2e161f7c50a4ef3f953d4595fda1e58e5c1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8?= <frankyang0820@outlook.com>
Date: Mon, 15 Jun 2026 18:33:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/capital/rechange/options.ts         |  2 +-
 .../withdraw/components/WithdrawDialog.vue    | 25 +++++++++++--------
 src/views/capital/withdraw/options.ts         |  2 +-
 src/views/capital/withdrawCheck/index.vue     | 13 ++--------
 src/views/capital/withdrawCheck/options.ts    |  6 +++++
 src/views/order/withdraw/options.ts           |  4 +++
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/views/capital/rechange/options.ts b/src/views/capital/rechange/options.ts
index f71cf97..ee6da03 100644
--- a/src/views/capital/rechange/options.ts
+++ b/src/views/capital/rechange/options.ts
@@ -6,6 +6,6 @@ export const rechangeTableColumns = [
         label: '支持货币',
         align: 'center' as const
     },
-    { prop: 'channel_fee', label: '渠道费用', align: 'center' as const , isNumber: true },
+    { prop: 'channel_fee', label: '渠道费用', align: 'center' as const  },
     { label: '操作', slotName: 'action', align: 'center' as const, width: 120 },
 ]
diff --git a/src/views/capital/withdraw/components/WithdrawDialog.vue b/src/views/capital/withdraw/components/WithdrawDialog.vue
index d51c51c..2dd483a 100644
--- a/src/views/capital/withdraw/components/WithdrawDialog.vue
+++ b/src/views/capital/withdraw/components/WithdrawDialog.vue
@@ -104,7 +104,7 @@
         </el-form-item>
 
         <!-- 银行信息（BANK 渠道） -->
-        <template v-if="isBankChannel && !isAgent">
+        <template v-if="isBankChannel">
           <el-form-item :label="t('withdraw.dialog.beneficiaryName')" prop="beneficiary_name">
             <el-input v-model="formData.beneficiary_name"
               :placeholder="t('withdraw.dialog.beneficiaryNamePlaceholder')" />
@@ -128,7 +128,7 @@
       <div class="dialog-footer">
         <el-button @click="handleBack">{{ t('common.cancel') }}</el-button>
         <el-button type="primary" :loading="submitLoading" @click="handleSubmit">{{ t('withdraw.dialog.confirmWithdraw')
-          }}</el-button>
+        }}</el-button>
       </div>
     </div>
   </Dialog>
@@ -261,7 +261,7 @@ const totalWalletBalance = computed(() => {
     parseFloat(walletInfo.value.commission_point_diff || '0') +
     parseFloat(walletInfo.value.service || '0') +
     parseFloat(walletInfo.value.risk || '0') +
-    parseFloat(Math.min(0, +walletInfo.value.closing_profit)+'')
+    parseFloat(Math.min(0, +walletInfo.value.closing_profit) + '')
 
   if (roleId >= 5) {
     // roleId >= 5 时，总余额包含可用余额
@@ -659,16 +659,21 @@ const handleSubmit = async () => {
       await withdraw(params)
     } else {
       // 代理取款 - 所有未展示字段默认传 --
-      
+
       if (isBankChannel.value) {
         params.withdraw_address = '--'
+        params.beneficiary_name = formData.value.beneficiary_name
+        params.beneficiary_enname = formData.value.beneficiary_enname
+        params.beneficiary_bank_name = formData.value.beneficiary_bank_name
+        params.beneficiary_bank_account = formData.value.beneficiary_bank_account
+      } else {
+        params.beneficiary_name = '--'
+        params.beneficiary_enname = '--'
+        params.beneficiary_bank_name = '--'
+        params.beneficiary_bank_account = '--'
+        params.swift_bic_code = '--'
+        params.beneficiary_bank_address = '--'
       }
-      params.beneficiary_name = '--'
-      params.beneficiary_enname = '--'
-      params.beneficiary_bank_name = '--'
-      params.beneficiary_bank_account = '--'
-      params.swift_bic_code = '--'
-      params.beneficiary_bank_address = '--'
       await agentWithdraw(params)
     }
 
diff --git a/src/views/capital/withdraw/options.ts b/src/views/capital/withdraw/options.ts
index 476a1ba..0e89bdd 100644
--- a/src/views/capital/withdraw/options.ts
+++ b/src/views/capital/withdraw/options.ts
@@ -5,7 +5,7 @@ export const tableColumns = [
   // 渠道名称
   { label: '渠道名称', prop: 'name' },
   // 渠道费用
-  { label: '渠道费用', prop: 'channel_fee', isNumber: true },
+  { label: '渠道费用', prop: 'channel_fee' },
   {
     label: '出金货币',
     prop: 'symbol',
diff --git a/src/views/capital/withdrawCheck/index.vue b/src/views/capital/withdrawCheck/index.vue
index 0d2a5ea..5826a90 100644
--- a/src/views/capital/withdrawCheck/index.vue
+++ b/src/views/capital/withdrawCheck/index.vue
@@ -176,21 +176,12 @@ searchForm.value.timeRange = getDefaultTimeRange()
 
 // 转换接口数据为表格数据
 const transformTableData = (data: TableRow[]): TransformedTableRow[] => {
-    return data.map(item => ({
-        id: item.id,
-        trade_id: item.trade_id,
+    return data.map(item => ({ 
         user_name: item.user?.username || '-',
         withdraw_currency_symbol: item.withdraw_currency?.symbol || '-',
-        withdraw_amount: item.withdraw_amount,
         real_currency_symbol: item.real_currency?.symbol || '-',
-        real_amount: item.real_amount,
-        rate: item.rate,
         channel_name: item.channel?.name || '-',
-        withdraw_service_fee: item.withdraw_service_fee,
-        withdraw_head_fee: item.withdraw_head_fee,
-        withdraw_fee_handle: item.withdraw_fee_handle,
-        withdraw_point_diff: item.withdraw_point_diff,
-        withdraw_risk_fee: item.withdraw_risk_fee,
+        ...item,
         withdraw_address: item.withdraw_address,
         created_at: item.created_at
     }))
diff --git a/src/views/capital/withdrawCheck/options.ts b/src/views/capital/withdrawCheck/options.ts
index 2f16562..0d919a9 100644
--- a/src/views/capital/withdrawCheck/options.ts
+++ b/src/views/capital/withdrawCheck/options.ts
@@ -47,6 +47,12 @@ export const withdrawCheckTableColumns = [
     { prop: 'withdraw_point_diff', label: '点差', align: 'center' as const, width: 100, isNumber: true },
     { prop: 'withdraw_risk_fee', label: '风控费', align: 'center' as const, isNumber: true , width: 180},
     { prop: 'withdraw_address', label: '提现地址', align: 'center' as const, width: 180},
+    { prop: 'beneficiary_bank_account', label: '银行账号', align: 'center' as const, width: 180},
+    { prop: 'beneficiary_bank_name', label: '银行名称', align: 'center' as const, width: 180},
+    { prop: 'beneficiary_enname', label: '收款人英文名字', align: 'center' as const, width: 180},
+    { prop: 'fee', label: '通道费', align: 'center' as const, width: 180},
+    { prop: 'beneficiary_name', label: '收款人姓名', align: 'center' as const, width: 180},
     { prop: 'created_at', label: '申请时间', align: 'center' as const, width: 180},
     { label: '操作', align: 'center' as const, width: 140, fixed: 'right' as const, slotName: 'action' },
 ]
+ 
\ No newline at end of file
diff --git a/src/views/order/withdraw/options.ts b/src/views/order/withdraw/options.ts
index 0f69ce8..95d4baf 100644
--- a/src/views/order/withdraw/options.ts
+++ b/src/views/order/withdraw/options.ts
@@ -31,6 +31,10 @@ export const search = [
 export const tableColumns = [
     { prop: 'trade_id', label: '订单号', align: 'center' as const, width: 200 },
     { prop: 'user_name', label: '账户持有人', width: 160, align: 'center' as const },
+    { prop: 'beneficiary_bank_account', label: '银行账号', align: 'center' as const, width: 180},
+    { prop: 'beneficiary_bank_name', label: '银行名称', align: 'center' as const, width: 180},
+    { prop: 'beneficiary_enname', label: '收款人英文名字', align: 'center' as const, width: 180},
+    { prop: 'beneficiary_name', label: '收款人姓名', align: 'center' as const, width: 180},
     { prop: 'withdraw_currency_symbol', label: '取款币种', align: 'center' as const, width: 100 },
     { prop: 'withdraw_amount', label: '取款金额', align: 'center' as const, width: 120, isNumber: true },
     { prop: 'real_currency_symbol', label: '到账币种', align: 'center' as const, width: 100 },