From efcb82acbac87cd3b8fc09df690c22391178b8ab Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 15:50:48 +0800
Subject: [PATCH] feat: 支付宝充值

---
 src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue |   44 +++++++++++-----------
 src/views/ServiceChargeManage/ServiceChargeManage.vue                       |   27 -------------
 2 files changed, 22 insertions(+), 49 deletions(-)

diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index 6888c19..a4c6d13 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -90,7 +90,6 @@
     <UploadStatementDialog v-bind="dialogProps" />
     <SettleDetailDialog v-bind="dialogSettleProps" />
     <RechargeEnterpriseWalletDialog v-bind="dialogRechargeProps" />
-    <AlipayWalletRecharge v-bind="dialogAlipayWalletProps" />
   </LoadingLayout>
 </template>
 
@@ -119,12 +118,10 @@
 } from '@/constants';
 import { downloadFileByUrl, setOssFileName } from '@/utils';
 import * as taskServices from '@/services/api/task';
-import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
 import { ModelValueType } from 'element-plus';
 import UploadStatementDialog from './components/UploadStatementDialog.vue';
 import SettleDetailDialog from './components/SettleDetailDialog.vue';
 import RechargeEnterpriseWalletDialog from './components/RechargeEnterpriseWalletDialog.vue';
-import AlipayWalletRecharge from './components/AlipayWalletRecharge.vue';
 import { Message } from '@bole-core/core';
 
 defineOptions({
@@ -337,35 +334,11 @@
   handleAdd: handleRechargeAdd,
   editForm: rechargeEditForm,
 } = useFormDialog({
-  onConfirm: rechargeEnterpriseWallet,
   defaultFormParams: {
     amount: null as number,
     remark: '',
   },
 });
-
-const { dialogProps: dialogAlipayWalletProps, handleAdd: handleAlipayWalletAdd } = useFormDialog({
-  onConfirm: rechargeEnterpriseWallet,
-  defaultFormParams: {
-    alipayUrl: '',
-  },
-});
-
-async function rechargeEnterpriseWallet() {
-  try {
-    let params: API.RechargeEnterpriseWalletCommand = {
-      access: EnumEnterpriseWalletAccess.Alipay,
-      amount: rechargeEditForm.amount,
-      remark: rechargeEditForm.remark,
-    };
-    let res = await enterpriseWalletServices.rechargeEnterpriseWallet(params);
-    if (res) {
-      handleAlipayWalletAdd({
-        alipayUrl: res.payUrl,
-      });
-    }
-  } catch (error) {}
-}
 
 function openSettleDialog(row: API.GetSettlementTasksQueryResultItem) {
   handleSettleEdit({
diff --git a/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue b/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue
index cbb1cd7..cc37bb6 100644
--- a/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue
+++ b/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue
@@ -31,7 +31,7 @@
       </span>
     </template>
   </ProDialog>
-  <!-- <AlipayWalletRecharge v-bind="dialogAlipayWalletProps" /> -->
+  <AlipayWalletRecharge v-bind="dialogAlipayWalletProps" />
 </template>
 
 <script setup lang="ts">
@@ -68,28 +68,27 @@
 
 const dialogForm = ref<FormInstance>();
 
-// const { dialogProps: dialogAlipayWalletProps, handleAdd: handleAlipayWalletAdd } = useFormDialog({
-//   onConfirm: rechargeEnterpriseWallet,
-//   defaultFormParams: {
-//     alipayUrl: '',
-//   },
-// });
+const { dialogProps: dialogAlipayWalletProps, handleAdd: handleAlipayWalletAdd } = useFormDialog({
+  defaultFormParams: {
+    alipayUrl: '',
+  },
+});
 
-// async function rechargeEnterpriseWallet() {
-//   try {
-//     let params: API.RechargeEnterpriseWalletCommand = {
-//       access: EnumEnterpriseWalletAccess.Alipay,
-//       amount: form.value.amount,
-//       remark: form.value.remark,
-//     };
-//     let res = await enterpriseWalletServices.rechargeEnterpriseWallet(params);
-//     if (res) {
-//       handleAlipayWalletAdd({
-//         alipayUrl: res.payUrl,
-//       });
-//     }
-//   } catch (error) {}
-// }
+async function rechargeEnterpriseWallet() {
+  try {
+    let params: API.RechargeEnterpriseWalletCommand = {
+      access: EnumEnterpriseWalletAccess.Alipay,
+      amount: form.value.amount,
+      remark: form.value.remark,
+    };
+    let res = await enterpriseWalletServices.rechargeEnterpriseWallet(params);
+    if (res) {
+      handleAlipayWalletAdd({
+        alipayUrl: res.payUrl,
+      });
+    }
+  } catch (error) {}
+}
 
 function onDialogClose() {
   if (!dialogForm.value) return;
@@ -100,6 +99,7 @@
   if (!dialogForm.value) return;
   dialogForm.value.validate((valid) => {
     if (valid) {
+      rechargeEnterpriseWallet();
       emit('onConfirm');
     } else {
       return;

--
Gitblit v1.9.1