From be028017a461af4c9745c69c4df084d4c3e6b296 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 18:08:49 +0800
Subject: [PATCH] fix: bug
---
src/views/EnterpriseManage/EnterpriseManageList.vue | 211 +++++++++++++---------------------------------------
1 files changed, 52 insertions(+), 159 deletions(-)
diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue
index 0e4796d..12a573b 100644
--- a/src/views/EnterpriseManage/EnterpriseManageList.vue
+++ b/src/views/EnterpriseManage/EnterpriseManageList.vue
@@ -1,24 +1,22 @@
<template>
- <LoadingLayout :loading="state.loading">
+ <LoadingLayout :loading="isInitialLoading">
<AppContainer>
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
<QueryFilterItem tip-content="閰嶇疆鐘舵��">
<FieldRadio
- v-model="extraParamState.flexEnterpriseSettingStatus"
- :value-enum="FlexEnterpriseSettingStatusText"
+ v-model="extraParamState.isConfigured"
+ :value-enum="IsConfiguredText"
buttonStyle
showAllBtn
- @change="getList()"
/>
</QueryFilterItem>
<QueryFilterItem>
<SearchInput
- v-model="extraParamState.searchWord"
- style="width: 200px"
+ v-model="extraParamState.keywords"
+ style="width: 300px"
placeholder="浼佷笟鍚嶇О/娉曚汉/鑱旂郴浜�"
@on-click-search="getList"
- @keyup.enter="getList()"
>
</SearchInput>
</QueryFilterItem>
@@ -37,6 +35,7 @@
</ProTableV2>
</AppContainer>
<ConfigureDialog v-bind="dialogProps" />
+ <WechatWalletOpen v-bind="dialogWechatProps"></WechatWalletOpen>
</LoadingLayout>
</template>
@@ -49,26 +48,16 @@
LoadingLayout,
AppContainer,
QueryFilterItem,
- useTable,
useFormDialog,
FieldRadio,
+ useTableV2,
} from '@bole-core/components';
import { useAccess, useGlobalEventContext } from '@/hooks';
-import {
- SearchType,
- FlexEnterpriseSettingStatusText,
- FlexEnterpriseSettingStatus,
- FlexEnterpriseCertificationStatusText,
- EnterpriseConfigureType,
- MessageChannelEnum,
- VerifyStatus,
- SignChannelEnum,
- ChargeTypeEnum,
- FlexEnterpriseStatus,
-} from '@/constants';
+import { EnterpriseConfigureType, IsConfiguredText } from '@/constants';
import ConfigureDialog from './components/ConfigureDialog.vue';
-import { OrderInputType, Message } from '@bole-core/core';
-import { useQueryClient } from '@tanstack/vue-query';
+import { Message } from '@bole-core/core';
+import * as enterpriseServices from '@/services/api/enterprise';
+import WechatWalletOpen from './components/WechatWalletOpen.vue';
defineOptions({
name: 'EnterpriseManageList',
@@ -78,7 +67,6 @@
editBtn: { emits: { onClick: (role) => addOrEditEnterprise(role) } },
detailBtn: { emits: { onClick: (role) => handleDetail(role) } },
configBtn: { emits: { onClick: (role) => openDialog(role) } },
- freezeBtn: { emits: { onClick: (role) => handleSetStatus(role) } },
};
const { checkSubModuleItemShow, column, operationBtns } = useAccess({
@@ -97,40 +85,28 @@
const router = useRouter();
-const BaseState = {
- loading: true,
-};
-const queryClient = useQueryClient();
-const typeList = ref([]);
-
-const state = reactive({ ...BaseState });
-
-onMounted(async () => {
- await getList();
- state.loading = false;
-});
-
const {
getDataSource: getList,
proTableProps,
paginationState,
extraParamState,
reset,
-} = useTable(
- async ({ pageIndex, pageSize }, extraParamState) => {
+ isInitialLoading,
+} = useTableV2(
+ async ({ pageIndex, pageSize, isInitialLoading }, extraParamState) => {
try {
- let params: API.GetFlexEnterpriseInput = {
+ let params: API.GetEnterprisesQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- flexEnterpriseSettingStatus: extraParamState.flexEnterpriseSettingStatus,
- searchWord: extraParamState.searchWord,
+ isConfigured: extraParamState.isConfigured,
+ keywords: extraParamState.keywords,
};
- let res = await flexEnterpriseServices.getFlexEnterpriseList(params, {
- showLoading: !state.loading,
+ let res = await enterpriseServices.getEnterprises(params, {
+ showLoading: !isInitialLoading,
});
return res;
} catch (error) {
@@ -139,143 +115,60 @@
},
{
defaultExtraParams: {
- searchWord: '',
- orderInput: [{ property: 'id', order: OrderInputType.Desc }],
- flexEnterpriseSettingStatus: '' as any as FlexEnterpriseSettingStatus,
+ keywords: '',
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ isConfigured: '' as any as boolean,
},
- queryKey: ['flexEnterpriseServices/getFlexEnterpriseList'],
+ queryKey: ['enterpriseServices/getEnterprises'],
columnsRenderProps: {
- settingStatus: { type: 'enum', valueEnum: FlexEnterpriseSettingStatusText },
- certificationStatus: { type: 'enum', valueEnum: FlexEnterpriseCertificationStatusText },
+ isReal: { type: 'enum', valueEnum: IsRealText },
+ isConfigured: { type: 'enum', valueEnum: IsConfiguredText },
},
}
);
-function openDialog(row?: API.FlexEnterpriseDto) {
- if (row) {
- handleEdit({
- id: row.id,
- enterpriseConfigureType: EnterpriseConfigureType.Bank,
- flexEnterpirseId: row.id,
- openBank: row.flexEnterpriseBankDto?.openBank,
- openBranchBank: row.flexEnterpriseBankDto?.openBranchBank,
- bankAccount: row.flexEnterpriseBankDto?.bankAccount,
- verifyStatus: row.flexEnterpriseBankDto?.verifyStatus,
- signChannel: row.enterpriseSignSettingDto?.signChannel,
- chargeType: row.enterpriseSignSettingDto?.chargeType,
- realVerifyCost: row.enterpriseSignSettingDto?.realVerifyCost ?? 0,
- signCost: row.enterpriseSignSettingDto?.signCost ?? 0,
- mergeSignCost: row.enterpriseSignSettingDto?.mergeSignCost ?? 0,
- messageCost: row.flexEnterpriseMessageSettingDto?.messageCost ?? 0,
- messageChannel: row.flexEnterpriseMessageSettingDto?.messageChannel,
- });
- } else {
- handleAdd({
- enterpriseConfigureType: EnterpriseConfigureType.Bank,
- });
- }
+function openDialog(row?: API.GetEnterprisesQueryResultItem) {
+ handleEdit({
+ id: row.id,
+ enterpriseConfigureType: EnterpriseConfigureType.Bank,
+ });
}
-const { dialogProps, handleAdd, handleEdit, editForm, dialogState } = useFormDialog({
+const { dialogProps, handleEdit, dialogState, editForm } = useFormDialog({
onConfirm: handleAddOrEdit,
defaultFormParams: {
id: '',
- flexEnterpirseId: '',
- enterpriseConfigureType: '' as any as EnterpriseConfigureType,
- openBank: '',
- openBranchBank: '',
- bankAccount: '',
- verifyStatus: '' as any as VerifyStatus,
- signChannel: '' as any as SignChannelEnum,
- chargeType: '' as any as ChargeTypeEnum,
- realVerifyCost: 0,
- signCost: 0,
- mergeSignCost: 0,
- messageCost: 0,
- messageChannel: '' as any as MessageChannelEnum,
+ enterpriseConfigureType: EnterpriseConfigureType.Bank,
},
});
-async function handleAddOrEdit(type: EnterpriseConfigureType) {
+const { dialogProps: dialogWechatProps, handleAdd } = useFormDialog({
+ defaultFormParams: {
+ url: '',
+ },
+});
+
+async function handleAddOrEdit(data?: any) {
try {
- let res;
- if (type === EnterpriseConfigureType.Bank) {
- res = await createOrEditFlexEnterpriseBankSetting();
+ if (editForm.enterpriseConfigureType === EnterpriseConfigureType.Wechat) {
+ handleAdd({
+ url: data?.sign_url,
+ });
}
- if (type === EnterpriseConfigureType.Electronic) {
- res = await createOrEditFlexEnterpriseSignSetting();
- }
- if (type === EnterpriseConfigureType.ShortMessage) {
- res = await createOrEditFlexEnterpriseMessageSetting();
- }
- if (res) {
- Message.successMessage('鎿嶄綔鎴愬姛');
- getList(paginationState.pageIndex);
- dialogState.dialogVisible = false;
- }
+ Message.successMessage(
+ editForm.enterpriseConfigureType === EnterpriseConfigureType.Wechat
+ ? '鎻愪氦鎴愬姛锛岃瓒呯骇绠＄悊鍛樻壂鐮佽繘琛岀绾︽搷浣�'
+ : '鎿嶄綔鎴愬姛'
+ );
+ getList(paginationState.pageIndex);
+ dialogState.dialogVisible = false;
} catch (error) {}
}
-async function createOrEditFlexEnterpriseBankSetting() {
- try {
- let params: API.CreateOrEditFlexEnterpriseBankInput = {
- id: editForm.id,
- openBank: editForm.openBank,
- openBranchBank: editForm.openBranchBank,
- bankAccount: editForm.bankAccount,
- verifyStatus: editForm.verifyStatus,
- flexEnterpirseId: editForm.flexEnterpirseId,
- };
- return await flexEnterpriseServices.createOrEditFlexEnterpriseBankSetting(params);
- } catch (error) {}
-}
-async function createOrEditFlexEnterpriseSignSetting() {
- try {
- let params: API.CreateOrEditFlexEnterpriseSignSettingInput = {
- id: editForm.id,
- flexEnterpirseId: editForm.flexEnterpirseId,
- signChannel: editForm.signChannel,
- chargeType: editForm.chargeType,
- realVerifyCost: editForm.realVerifyCost,
- signCost: editForm.signCost,
- mergeSignCost: editForm.mergeSignCost,
- };
- return await flexEnterpriseServices.createOrEditFlexEnterpriseSignSetting(params);
- } catch (error) {}
-}
-async function createOrEditFlexEnterpriseMessageSetting() {
- try {
- let params: API.CreateOrEditFlexEnterpriseMessageSettingInput = {
- id: editForm.id,
- flexEnterpirseId: editForm.flexEnterpirseId,
- messageChannel: editForm.messageChannel,
- messageCost: editForm.messageCost,
- };
- return await flexEnterpriseServices.createOrEditFlexEnterpriseMessageSetting(params);
- } catch (error) {}
-}
-
-async function handleSetStatus(row: API.FlexEnterpriseDto) {
- try {
- let params: API.SetFlexEnterpriseStatusInput = {
- id: row.id,
- status:
- row.status === FlexEnterpriseStatus.Frozen
- ? FlexEnterpriseStatus.Normal
- : FlexEnterpriseStatus.Frozen,
- };
- let res = await flexEnterpriseServices.setFlexEnterpriseStatus(params);
- if (res) {
- Message.successMessage('鎿嶄綔鎴愬姛');
- getList(paginationState.pageIndex);
- }
- } catch (error) {}
-}
-
-function addOrEditEnterprise(row?: API.FlexEnterpriseDto) {
+function addOrEditEnterprise(row?: API.GetEnterprisesQueryResultItem) {
router.push({ name: 'AddOrEditEnterprise', params: { id: row?.id ?? '' } });
}
-function handleDetail(row: API.FlexEnterpriseDto) {
+function handleDetail(row: API.GetEnterprisesQueryResultItem) {
router.push({ name: 'EnterpriseDetail', params: { id: row?.id ?? '' } });
}
</script>
--
Gitblit v1.9.1