From b331f884097a2dc5086c8cf043c8c8f52e7640fe Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:34:39 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue b/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue
index cbb1cd7..278fb14 100644
--- a/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue
+++ b/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue
@@ -8,6 +8,14 @@
:width="700"
>
<ProForm :model="form" ref="dialogForm" label-width="120px">
+ <ProFormItemV2 label="閽卞寘閫氶亾:" prop="access" :check-rules="[{ message: '璇烽�夋嫨閽卞寘閫氶亾' }]">
+ <ProFormSelect
+ v-model="form.access"
+ :valueEnum="EnumEnterpriseWalletAccessText"
+ placeholder="璇烽�夋嫨閽卞寘閫氶亾"
+ >
+ </ProFormSelect>
+ </ProFormItemV2>
<ProFormItemV2
label="鍏呭�奸噾棰濓細"
prop="amount"
@@ -31,7 +39,7 @@
</span>
</template>
</ProDialog>
- <!-- <AlipayWalletRecharge v-bind="dialogAlipayWalletProps" /> -->
+ <AlipayWalletRecharge v-bind="dialogAlipayWalletProps" />
</template>
<script setup lang="ts">
@@ -43,9 +51,11 @@
ProFormItemV2,
ProFormTextArea,
useFormDialog,
+ ProFormSelect,
} from '@bole-core/components';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
import AlipayWalletRecharge from './AlipayWalletRecharge.vue';
+import { EnumEnterpriseWalletAccessText } from '@/constants';
defineOptions({
name: 'RechargeEnterpriseWalletDialog',
@@ -55,6 +65,7 @@
title?: string;
amount: number;
remark: string;
+ access: EnumEnterpriseWalletAccess;
};
const visible = defineModel({ type: Boolean });
@@ -68,28 +79,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: form.value.access,
+ 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 +110,7 @@
if (!dialogForm.value) return;
dialogForm.value.validate((valid) => {
if (valid) {
+ rechargeEnterpriseWallet();
emit('onConfirm');
} else {
return;
--
Gitblit v1.9.1