From f7c8dd71ce56b2888f56392daf544e55c2c5f1d3 Mon Sep 17 00:00:00 2001
From: lq <workerqi@163.com>
Date: Tue, 2 Sep 2025 10:18:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8C=89=E9=92=AE=E5=B8=83=E5=B1=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/components/ExcelUpload.vue           |  2 +-
 .../store/components/ExcelUpload.vue           |  2 +-
 .../views/finance/withdrawal/config/table.ts   | 18 +++++++++++++++---
 .../src/views/finance/withdrawal/index.vue     |  7 ++++++-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/business/warehouse-drug-management/admin/components/ExcelUpload.vue b/apps/web-antd/src/views/business/warehouse-drug-management/admin/components/ExcelUpload.vue
index 07677719..1f3aaeef 100644
--- a/apps/web-antd/src/views/business/warehouse-drug-management/admin/components/ExcelUpload.vue
+++ b/apps/web-antd/src/views/business/warehouse-drug-management/admin/components/ExcelUpload.vue
@@ -30,7 +30,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.close();
   },
   onConfirm: async () => {
-    modalApi.setState({ loading: true, confirmLoading: true });
+    // modalApi.setState({ loading: true, confirmLoading: true });
     gridApi.value?.reload();
     modalApi.close();
   },
diff --git a/apps/web-antd/src/views/business/warehouse-drug-management/store/components/ExcelUpload.vue b/apps/web-antd/src/views/business/warehouse-drug-management/store/components/ExcelUpload.vue
index 7c9fc111..bd303c27 100644
--- a/apps/web-antd/src/views/business/warehouse-drug-management/store/components/ExcelUpload.vue
+++ b/apps/web-antd/src/views/business/warehouse-drug-management/store/components/ExcelUpload.vue
@@ -30,7 +30,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.close();
   },
   onConfirm: async () => {
-    modalApi.setState({ loading: true, confirmLoading: true });
+    // modalApi.setState({ loading: true, confirmLoading: true });
     gridApi.value?.reload();
     modalApi.close();
   },
diff --git a/apps/web-antd/src/views/finance/withdrawal/config/table.ts b/apps/web-antd/src/views/finance/withdrawal/config/table.ts
index 2d4fd06d..094db2b9 100644
--- a/apps/web-antd/src/views/finance/withdrawal/config/table.ts
+++ b/apps/web-antd/src/views/finance/withdrawal/config/table.ts
@@ -36,9 +36,21 @@ export const gridOptions: VxeGridProps<RowType> = {
     { field: 'charge_cash', title: '手续费' },
     { field: 'apply_time', title: '申请时间' },
     { field: 'check_id', title: '审核人', slots: { default: 'check_id' } },
-    { field: 'check_status', title: '审核状态', slots: { default: 'check_status'} },
-    { field: 'check_result', title: '审核结果', slots: { default: 'check_result'} },
-    { field: 'dakuan_status', title: '打款状态' },
+    {
+      field: 'check_status',
+      title: '审核状态',
+      slots: { default: 'check_status' },
+    },
+    {
+      field: 'check_result',
+      title: '审核结果',
+      slots: { default: 'check_result' },
+    },
+    {
+      field: 'dakuan_status',
+      title: '打款状态',
+      slots: { default: 'dakuan_status' },
+    },
     { field: 'dakuan_time', title: '打款时间' },
     { field: 'created_at', title: '注册时间' },
     { type: 'html', title: '操作', slots: { default: 'action' } },
diff --git a/apps/web-antd/src/views/finance/withdrawal/index.vue b/apps/web-antd/src/views/finance/withdrawal/index.vue
index 3eccab1d..3939ddf9 100644
--- a/apps/web-antd/src/views/finance/withdrawal/index.vue
+++ b/apps/web-antd/src/views/finance/withdrawal/index.vue
@@ -63,8 +63,13 @@ const chartTabs = [
               {{ row.check_result }}
             </Tag>
           </template>
+          <template #dakuan_status="{ row }">
+            <span v-if="row.dakuan_status === -1">打款失败</span>
+            <span v-else-if="row.dakuan_status === 0">处理中</span>
+            <span v-else-if="row.dakuan_status === 1">打款成功</span>
+          </template>
           <template #check_id="{ row }">
-            <span>{{ row.check_admin?.username || '暂无' }}</span>
+            <span>{{ row.check_admin?.username || row.check_admin?.nick_name || '暂无' }}</span>
           </template>
           <template #action="{ row }">
             <TableAction