From a80f77974b2e463db42b839c57ff09370a98649b Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 17 九月 2025 15:21:20 +0800
Subject: [PATCH] feat: 财务管理
---
src/views/ServiceChargeManage/constants/columns.ts | 5 +
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 2
src/constants/task.ts | 6 +
.eslintrc-auto-import.json | 2
src/services/api/typings.d.ts | 38 +++++++--
src/views/FinanceManage/components/DistributionDetailView.vue | 41 ++++++++-
/dev/null | 42 ----------
src/views/FinanceManage/constants/columns.ts | 16 ++--
src/views/EmploymentManage/components/CheckManageDialog.vue | 2
src/views/FinanceManage/components/UsageDetailView.vue | 34 +++++++-
src/views/FinanceManage/FinanceManage.vue | 4
auto-imports.d.ts | 6 +
src/constants/apiEnum.ts | 12 +++
13 files changed, 136 insertions(+), 74 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 5ad042c..76c9c1f 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -135,6 +135,8 @@
"OssUserSign": true,
"PropType": true,
"Ref": true,
+ "SettlementReceiveStatus": true,
+ "SettlementReceiveStatusText": true,
"Slot": true,
"Slots": true,
"SubModuleKey": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 0c564e8..44f22bb 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -133,6 +133,8 @@
const OssRich: typeof import('./src/constants/oss')['OssRich']
const OssUser: typeof import('./src/constants/oss')['OssUser']
const OssUserSign: typeof import('./src/constants/oss')['OssUserSign']
+ const SettlementReceiveStatus: typeof import('./src/constants/apiEnum')['SettlementReceiveStatus']
+ const SettlementReceiveStatusText: typeof import('./src/constants/task')['SettlementReceiveStatusText']
const SubModuleKey: typeof import('./src/constants/module')['SubModuleKey']
const SubModuleTitle: typeof import('./src/constants/module')['SubModuleTitle']
const SubModuleType: typeof import('./src/constants/module')['SubModuleType']
@@ -252,7 +254,7 @@
export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
import('vue')
// @ts-ignore
- export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum'
+ export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic'
@@ -407,6 +409,8 @@
readonly OssRich: UnwrapRef<typeof import('./src/constants/oss')['OssRich']>
readonly OssUser: UnwrapRef<typeof import('./src/constants/oss')['OssUser']>
readonly OssUserSign: UnwrapRef<typeof import('./src/constants/oss')['OssUserSign']>
+ readonly SettlementReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['SettlementReceiveStatus']>
+ readonly SettlementReceiveStatusText: UnwrapRef<typeof import('./src/constants/task')['SettlementReceiveStatusText']>
readonly SubModuleKey: UnwrapRef<typeof import('./src/constants/module')['SubModuleKey']>
readonly SubModuleTitle: UnwrapRef<typeof import('./src/constants/module')['SubModuleTitle']>
readonly SubModuleType: UnwrapRef<typeof import('./src/constants/module')['SubModuleType']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 0688d08..df166c7 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -417,6 +417,10 @@
InProcess = 20,
/**宸茬粨绠� */
Completed = 30,
+ /**閮ㄥ垎缁撶畻 */
+ Part = 40,
+ /**缁撶畻澶辫触 */
+ Fail = 50,
}
/** 浠诲姟瀹夋帓鐘舵�� */
@@ -566,3 +570,11 @@
/**宸插畬鎴� */
Completed = 20,
}
+
+/** 缁撶畻鍒拌处鐘舵�� */
+export enum SettlementReceiveStatus {
+ /**宸插埌璐� */
+ Completed = 10,
+ /**宸查��娆� */
+ Refunded = 20,
+}
diff --git a/src/constants/task.ts b/src/constants/task.ts
index 53fad8d..460cd3f 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -132,11 +132,17 @@
[EnumTaskSettlementOrderStatus.Wait]: '寰呬笂浼�',
[EnumTaskSettlementOrderStatus.Completed]: '宸蹭笂浼�',
};
+export const SettlementReceiveStatusText = {
+ [SettlementReceiveStatus.Completed]: '宸插埌璐�',
+ [SettlementReceiveStatus.Refunded]: '宸查��娆�',
+};
export const EnumTaskSettlementStatusText = {
[EnumTaskSettlementStatus.Wait]: '寰呯粨绠�',
[EnumTaskSettlementStatus.InProcess]: '缁撶畻涓�',
[EnumTaskSettlementStatus.Completed]: '宸茬粨绠�',
+ [EnumTaskSettlementStatus.Part]: '閮ㄥ垎缁撶畻',
+ [EnumTaskSettlementStatus.Fail]: '缁撶畻澶辫触',
};
export const EnumPersonalFreeTimeText = {
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 8950cd5..bde91c4 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -900,6 +900,10 @@
InProcess = 20,
/**宸茬粨绠� */
Completed = 30,
+ /**閮ㄥ垎缁撶畻 */
+ Part = 40,
+ /**缁撶畻澶辫触 */
+ Fail = 50,
}
enum EnumTaskStatus {
@@ -3286,6 +3290,7 @@
enterpriseSignContractTime?: string;
/** 鐢靛瓙鍚堝悓 */
contractUrl?: string;
+ createdTime?: string;
}
type GetEnterpriseLoginInfoQuery = Record<string, any>;
@@ -4147,6 +4152,13 @@
balance?: number;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
+ /** 缁撶畻鍗曞悕绉� */
+ settlementOrderName?: string;
+ settlementStatus?: EnumTaskSettlementStatus;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
/** 浠樻浜鸿处鎴� */
payerAccount?: string;
/** 浠樻浜哄悕绉� */
@@ -4470,7 +4482,6 @@
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
- settlementStatus?: EnumTaskSettlementStatus;
/** 鎵�灞為摱琛� */
bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
@@ -4481,6 +4492,8 @@
settlementAmount?: number;
/** 瀹炲彂閲戦 */
actualSettlementAmount?: number;
+ settlementReceiveStatus?: SettlementReceiveStatus;
+ settlementStatus?: EnumTaskSettlementStatus;
/** 缁撶畻鏃堕棿 */
settlementTime?: string;
}
@@ -5111,18 +5124,18 @@
name?: string;
/** 韬唤璇佸彿 */
identity?: string;
- /** 缁撶畻閲戦 */
- settlementAmount?: number;
- /** 瀹炲彂閲戦 */
- actualSettlementAmount?: number;
- /** 鏀舵璐︽埛 */
- receiveAccount?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
/** 鎵�灞為摱琛� */
bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
bankBranch?: string;
- /** 浠诲姟鍚嶇О */
- taskName?: string;
+ /** 鏀舵璐︽埛 */
+ receiveAccount?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
}
interface InviteElectronSignCommand {
@@ -5819,6 +5832,13 @@
hireStatus?: EnumTaskUserHireStatus;
}
+ enum SettlementReceiveStatus {
+ /**宸插埌璐� */
+ Completed = 10,
+ /**宸查��娆� */
+ Refunded = 20,
+ }
+
interface SetUserInfoRolesCommand {
/** 鐢ㄦ埛Id */
userInfoId?: string;
diff --git a/src/views/EmploymentManage/components/CheckManageDialog.vue b/src/views/EmploymentManage/components/CheckManageDialog.vue
index 6c82f86..f745f31 100644
--- a/src/views/EmploymentManage/components/CheckManageDialog.vue
+++ b/src/views/EmploymentManage/components/CheckManageDialog.vue
@@ -167,7 +167,7 @@
type: 'url',
//@ts-ignore
formatter: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) =>
- (row.files ?? []).map((x) => setOSSLink(x)),
+ row.files?.length > 0 && (row.files ?? []).map((x) => setOSSLink(x)),
showDownloadBtn: false,
},
},
diff --git a/src/views/FinanceManage/FinanceManage.vue b/src/views/FinanceManage/FinanceManage.vue
index 9d5dfeb..4396f5b 100644
--- a/src/views/FinanceManage/FinanceManage.vue
+++ b/src/views/FinanceManage/FinanceManage.vue
@@ -4,9 +4,9 @@
<ProTabPane lazy label="鍙戞斁鏄庣粏" :name="FinanceTabType.DistributionDetail">
<DistributionDetailView />
</ProTabPane>
- <ProTabPane lazy label="鐢ㄩ噺鏄庣粏" :name="FinanceTabType.UsageDetail">
+ <!-- <ProTabPane lazy label="鐢ㄩ噺鏄庣粏" :name="FinanceTabType.UsageDetail">
<UsageDetailView />
- </ProTabPane>
+ </ProTabPane> -->
</ProTabs>
</AppContainer>
</template>
diff --git a/src/views/FinanceManage/components/DistributionDetailView.vue b/src/views/FinanceManage/components/DistributionDetailView.vue
index 8bd249b..be7aa59 100644
--- a/src/views/FinanceManage/components/DistributionDetailView.vue
+++ b/src/views/FinanceManage/components/DistributionDetailView.vue
@@ -4,7 +4,7 @@
<ProTableV2
v-bind="proTableProps"
:columns="DistributionDetailColumns"
- :operationBtns="operationBtns"
+ :showOperationColumn="false"
>
</ProTableV2>
</AppContainer>
@@ -20,8 +20,8 @@
defineOperationBtns,
} from '@bole-core/components';
import { DistributionDetailColumns } from '../constants';
-import * as taskServices from '@/services/api/task';
-import { usePersonalUserTransactions } from '../hooks/financeHooks';
+import * as userServices from '@/services/api/user';
+import { EnumTaskSettlementStatusText } from '@/constants';
defineOptions({
name: 'DistributionDetailView',
@@ -35,9 +35,38 @@
const state = reactive({ ...BaseState });
-const { getList, proTableProps } = usePersonalUserTransactions({
- type: EnumUserWalletTransactionType.Withdraw,
-});
+const {
+ getDataSource: getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+} = useTable(
+ async ({ pageIndex, pageSize }, extraParamState) => {
+ try {
+ let params: API.GetPersonalUserTransactionsQuery = {
+ pageModel: {
+ rows: pageSize,
+ page: pageIndex,
+ orderInput: extraParamState.orderInput,
+ },
+ type: EnumUserWalletTransactionType.Income,
+ };
+ let res = await userServices.getPersonalUserTransactions(params);
+ return res;
+ } catch (error) {}
+ },
+ {
+ defaultExtraParams: {
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ },
+ columnsRenderProps: {
+ amount: { type: 'money' },
+ settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
+ settlementTime: { type: 'date' },
+ },
+ }
+);
onMounted(async () => {
await getList();
diff --git a/src/views/FinanceManage/components/UsageDetailView.vue b/src/views/FinanceManage/components/UsageDetailView.vue
index 60fab0f..f48a6e0 100644
--- a/src/views/FinanceManage/components/UsageDetailView.vue
+++ b/src/views/FinanceManage/components/UsageDetailView.vue
@@ -10,8 +10,7 @@
<script setup lang="ts">
import { ProTableV2, LoadingLayout, AppContainer, useTable } from '@bole-core/components';
import { UsageDetailColumns } from '../constants';
-import * as taskServices from '@/services/api/task';
-import { usePersonalUserTransactions } from '../hooks/financeHooks';
+import * as userServices from '@/services/api/user';
defineOptions({
name: 'UsageDetailView',
@@ -22,9 +21,34 @@
};
const state = reactive({ ...BaseState });
-const { getList, proTableProps } = usePersonalUserTransactions({
- type: EnumUserWalletTransactionType.Income,
-});
+const {
+ getDataSource: getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+} = useTable(
+ async ({ pageIndex, pageSize }, extraParamState) => {
+ try {
+ let params: API.GetPersonalUserTransactionsQuery = {
+ pageModel: {
+ rows: pageSize,
+ page: pageIndex,
+ orderInput: extraParamState.orderInput,
+ },
+ type: EnumUserWalletTransactionType.Income,
+ };
+ let res = await userServices.getPersonalUserTransactions(params);
+ return res;
+ } catch (error) {}
+ },
+ {
+ defaultExtraParams: {
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ },
+ columnsRenderProps: {},
+ }
+);
onMounted(async () => {
await getList();
diff --git a/src/views/FinanceManage/constants/columns.ts b/src/views/FinanceManage/constants/columns.ts
index c7dccc9..7ed0674 100644
--- a/src/views/FinanceManage/constants/columns.ts
+++ b/src/views/FinanceManage/constants/columns.ts
@@ -3,42 +3,42 @@
export const DistributionDetailColumns = defineColumns([
{
id: '1',
- enCode: 'name',
+ enCode: 'enterpriseName',
name: '鎵�灞炲鎴�',
},
{
id: '2',
- enCode: 'name',
+ enCode: 'taskName',
name: '鎵�灞炰换鍔�',
},
{
id: '3',
- enCode: 'name',
+ enCode: 'settlementOrderName',
name: '缁撶畻鍗曞悕绉�',
},
{
id: '4',
- enCode: 'name',
+ enCode: 'payerName',
name: '濮撳悕',
},
{
id: '5',
- enCode: 'name',
+ enCode: 'payerContactPhoneNumber',
name: '鎵嬫満鍙�',
},
{
id: '6',
- enCode: 'name',
+ enCode: 'amount',
name: '缁撶畻閲戦',
},
{
id: '7',
- enCode: 'signNum',
+ enCode: 'settlementStatus',
name: '缁撶畻鐘舵��',
},
{
id: '8',
- enCode: 'name',
+ enCode: 'settlementTime',
name: '缁撶畻鏃ユ湡',
},
]);
diff --git a/src/views/FinanceManage/hooks/financeHooks.ts b/src/views/FinanceManage/hooks/financeHooks.ts
deleted file mode 100644
index 312329e..0000000
--- a/src/views/FinanceManage/hooks/financeHooks.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { useQuery, useQueryClient } from '@tanstack/vue-query';
-import * as userServices from '@/services/api/user';
-import { useTable } from '@bole-core/components';
-
-type UsePersonalUserTransactionsOptions = {
- type?: EnumUserWalletTransactionType;
-};
-
-export function usePersonalUserTransactions(options: UsePersonalUserTransactionsOptions = {}) {
- const { type } = options;
-
- const {
- getDataSource: getList,
- proTableProps,
- paginationState,
- extraParamState,
- reset,
- } = useTable(
- async ({ pageIndex, pageSize }, extraParamState) => {
- try {
- let params: API.GetPersonalUserTransactionsQuery = {
- pageModel: {
- rows: pageSize,
- page: pageIndex,
- orderInput: extraParamState.orderInput,
- },
- type: type,
- };
- let res = await userServices.getPersonalUserTransactions(params);
- return res;
- } catch (error) {}
- },
- {
- defaultExtraParams: {
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
- },
- columnsRenderProps: {},
- }
- );
-
- return { getList, proTableProps, extraParamState };
-}
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 80760a2..fd799fc 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -134,6 +134,7 @@
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import { Message } from '@bole-core/core';
+import { SettlementReceiveStatusText } from '@/constants';
import {
downloadFile,
downloadFileByUrl,
@@ -274,6 +275,7 @@
settlementTime: { type: 'date' },
settlementAmount: { type: 'money' },
actualSettlementAmount: { type: 'money' },
+ settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
},
}
);
diff --git a/src/views/ServiceChargeManage/constants/columns.ts b/src/views/ServiceChargeManage/constants/columns.ts
index 7e45263..0c3f24a 100644
--- a/src/views/ServiceChargeManage/constants/columns.ts
+++ b/src/views/ServiceChargeManage/constants/columns.ts
@@ -106,6 +106,11 @@
},
{
id: '9',
+ enCode: 'settlementReceiveStatus',
+ name: '鍒拌处鐘舵��',
+ },
+ {
+ id: '10',
enCode: 'settlementTime',
name: '缁撶畻鏃堕棿',
},
--
Gitblit v1.9.1