From 206fc12a937f65e4b58fbb10a5dc916cecef7625 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 15 九月 2025 17:36:26 +0800
Subject: [PATCH] fix: bug
---
src/views/EnterpriseManage/EnterpriseManageList.vue | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue
index 95f5447..1c28138 100644
--- a/src/views/EnterpriseManage/EnterpriseManageList.vue
+++ b/src/views/EnterpriseManage/EnterpriseManageList.vue
@@ -1,5 +1,5 @@
<template>
- <LoadingLayout :loading="state.loading">
+ <LoadingLayout :loading="isInitialLoading">
<AppContainer>
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
@@ -9,7 +9,6 @@
:value-enum="IsConfiguredText"
buttonStyle
showAllBtn
- @change="getList()"
/>
</QueryFilterItem>
<QueryFilterItem>
@@ -18,7 +17,6 @@
style="width: 300px"
placeholder="浼佷笟鍚嶇О/娉曚汉/鑱旂郴浜�"
@on-click-search="getList"
- @keyup.enter="getList()"
>
</SearchInput>
</QueryFilterItem>
@@ -52,6 +50,8 @@
useTable,
useFormDialog,
FieldRadio,
+ UploadUserFile,
+ useTableV2,
} from '@bole-core/components';
import { useAccess, useGlobalEventContext } from '@/hooks';
import { EnterpriseConfigureType, IsConfiguredText } from '@/constants';
@@ -59,6 +59,7 @@
import { Message } from '@bole-core/core';
import * as enterpriseServices from '@/services/api/enterprise';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
+import { convertWalletApiToFiles, convertWalletFilesToApi } from '@/utils';
defineOptions({
name: 'EnterpriseManageList',
@@ -86,18 +87,7 @@
const router = useRouter();
-const BaseState = {
- loading: true,
-};
-
-const state = reactive({ ...BaseState });
-
const { invalidateQueries } = useEnabledElectronSignSettings();
-
-onMounted(async () => {
- await getList();
- state.loading = false;
-});
const {
getDataSource: getList,
@@ -105,8 +95,9 @@
paginationState,
extraParamState,
reset,
-} = useTable(
- async ({ pageIndex, pageSize }, extraParamState) => {
+ isInitialLoading,
+} = useTableV2(
+ async ({ pageIndex, pageSize, isInitialLoading }, extraParamState) => {
try {
let params: API.GetEnterprisesQuery = {
pageModel: {
@@ -119,7 +110,7 @@
};
let res = await enterpriseServices.getEnterprises(params, {
- showLoading: !state.loading,
+ showLoading: !isInitialLoading,
});
return res;
} catch (error) {
@@ -171,10 +162,22 @@
),
smsAccess: smsSetting.smsAccess,
smsCost: smsSetting.smsCost,
- alipayAccount: alipayWallet.account,
- alipayMerchantId: alipayWallet.merchantId,
+ alipayAccount: alipayWallet.identity,
+ alipayMerchantId: alipayWallet.code,
signStatus: alipayWallet.signStatus,
expandindirectOrderStatus: alipayWallet.expandindirectOrderStatus,
+
+ name: alipayWallet.name,
+ scene: alipayWallet.scene || EnumEnterpriseWalletExpandindirectOrderScene.YONGJIN_BAOCHOU,
+ sceneDirections: alipayWallet.sceneDirections,
+ sceneFiles: convertWalletApiToFiles(
+ alipayWallet.files,
+ EnumEnterpriseWalletExpandindirectOrderFileType.Scene
+ ),
+ sceneQualificationFiles: convertWalletApiToFiles(
+ alipayWallet.files,
+ EnumEnterpriseWalletExpandindirectOrderFileType.SceneQualification
+ ),
});
} else {
handleAdd({
@@ -196,6 +199,14 @@
alipayMerchantId: '',
signStatus: '' as any as EnumEnterpriseWalletSignStatus,
expandindirectOrderStatus: '' as any as EnumEnterpriseWalletExpandindirectOrderStatus,
+
+ name: '',
+ scene: '' as any as EnumEnterpriseWalletExpandindirectOrderScene,
+ sceneDirections: '',
+ /**杞处鍦烘櫙鎴浘 */
+ sceneFiles: [] as UploadUserFile[],
+ /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */
+ sceneQualificationFiles: [] as UploadUserFile[],
},
});
@@ -211,6 +222,9 @@
if (editForm.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage) {
res = await createOrEditFlexEnterpriseMessageSetting();
}
+ if (editForm.enterpriseConfigureType === EnterpriseConfigureType.AliPay) {
+ res = await enterpriseWalletExpandindirectCreate();
+ }
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
getList(paginationState.pageIndex);
@@ -219,6 +233,30 @@
} catch (error) {}
}
+async function enterpriseWalletExpandindirectCreate() {
+ try {
+ let params: API.EnterpriseWalletExpandindirectCreateCommand = {
+ enterpriseId: editForm.id,
+ identity: editForm.alipayAccount,
+ name: editForm.name,
+ scene: editForm.scene,
+ sceneDirections: editForm.sceneDirections,
+ sitesInfo: null,
+ files: [
+ ...convertWalletFilesToApi(
+ editForm.sceneFiles,
+ EnumEnterpriseWalletExpandindirectOrderFileType.Scene
+ ),
+ ...convertWalletFilesToApi(
+ editForm.sceneQualificationFiles,
+ EnumEnterpriseWalletExpandindirectOrderFileType.SceneQualification
+ ),
+ ],
+ };
+ return await enterpriseWalletServices.enterpriseWalletExpandindirectCreate(params);
+ } catch (error) {}
+}
+
// async function createOrEditFlexEnterpriseBankSetting() {
// try {
// let params: API.CreateOrEditFlexEnterpriseBankInput = {
--
Gitblit v1.9.1