From b9eb4d112d8e5f252c4d3d7e067290569b749cfb Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 05 九月 2025 14:39:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/views/EnterpriseManage/EnterpriseManageList.vue | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue
index 4bbf424..365b471 100644
--- a/src/views/EnterpriseManage/EnterpriseManageList.vue
+++ b/src/views/EnterpriseManage/EnterpriseManageList.vue
@@ -58,6 +58,7 @@
import ConfigureDialog from './components/ConfigureDialog.vue';
import { Message } from '@bole-core/core';
import * as enterpriseServices from '@/services/api/enterprise';
+import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
defineOptions({
name: 'EnterpriseManageList',
@@ -140,15 +141,11 @@
);
async function getEnterpriseElectronSignSetting(id: string) {
- try {
- return await enterpriseServices.getEnterpriseElectronSignSetting({ id: id });
- } catch (error) {}
+ return await enterpriseServices.getEnterpriseElectronSignSetting({ id: id });
}
async function getEnterpriseSmsSetting(id: string) {
- try {
- return await enterpriseServices.getEnterpriseSmsSetting({ id: id });
- } catch (error) {}
+ return await enterpriseServices.getEnterpriseSmsSetting({ id: id });
}
const EnumElectronSignAccessList = computed(() =>
@@ -158,33 +155,43 @@
);
async function openDialog(row?: API.GetEnterprisesQueryResultItem) {
- if (row) {
- let electronSignSetting = await getEnterpriseElectronSignSetting(row.id);
- let smsSetting = await getEnterpriseSmsSetting(row.id);
- handleEdit({
- id: row.id,
- enterpriseConfigureType: EnterpriseConfigureType.Electronic,
- electronSignAccesses: EnumElectronSignAccessList.value.map((value) =>
- electronSignSetting.electronSignAccesses.includes(value) ? value : null
- ),
- smsAccess: smsSetting.smsAccess,
- smsCost: smsSetting.smsCost,
- });
- } else {
- handleAdd({
- enterpriseConfigureType: EnterpriseConfigureType.Electronic,
- });
- }
+ try {
+ if (row) {
+ let electronSignSetting = await getEnterpriseElectronSignSetting(row.id);
+ let smsSetting = await getEnterpriseSmsSetting(row.id);
+ // let alipayWallet = await enterpriseWalletServices.getEnterpriseWallet({
+ // enterpriseId: row.id,
+ // access: EnumEnterpriseWalletAccess.Alipay,
+ // });
+ handleEdit({
+ id: row.id,
+ enterpriseConfigureType: EnterpriseConfigureType.AliPay,
+ electronSignAccesses: EnumElectronSignAccessList.value.map((value) =>
+ electronSignSetting.electronSignAccesses.includes(value) ? value : null
+ ),
+ smsAccess: smsSetting.smsAccess,
+ smsCost: smsSetting.smsCost,
+ alipayAccount: '',
+ alipayMerchantId: '',
+ });
+ } else {
+ handleAdd({
+ enterpriseConfigureType: EnterpriseConfigureType.AliPay,
+ });
+ }
+ } catch (error) {}
}
const { dialogProps, handleAdd, handleEdit, editForm, dialogState } = useFormDialog({
onConfirm: handleAddOrEdit,
defaultFormParams: {
id: '',
- enterpriseConfigureType: EnterpriseConfigureType.Electronic,
+ enterpriseConfigureType: EnterpriseConfigureType.AliPay,
electronSignAccesses: [] as EnumElectronSignAccess[],
smsAccess: '' as any as EnumSmsAccess,
smsCost: 0,
+ alipayAccount: '',
+ alipayMerchantId: '',
},
});
--
Gitblit v1.9.1