From 0e21549d748d7e9df2c8b335f33740792f02cd4f Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 26 十二月 2025 15:20:54 +0800
Subject: [PATCH] feat: 订单
---
src/services/api/standardOrder.ts | 33 +++
src/views/StandardOrderManage/OrderManage.vue | 60 -----
src/constants/standardOrder.ts | 5
.eslintrc-auto-import.json | 3
src/services/api/typings.d.ts | 275 ++++++++++++++++++++++++--
src/views/FinanceManage/OrderSettlementManage.vue | 46 ----
src/hooks/standardOrder.ts | 71 +++++++
src/hooks/index.ts | 1
src/services/api/taskUser.ts | 51 +++++
src/services/api/index.ts | 4
src/views/StandardOrderManage/OrderManageDetail.vue | 2
auto-imports.d.ts | 9
src/constants/apiEnum.ts | 28 ++
13 files changed, 451 insertions(+), 137 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 68b177d..3102a68 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -76,8 +76,10 @@
"EnumGetCheckReceiveTaskCheckInUsersQueryStatus": true,
"EnumGetCheckReceiveTasksQueryResultItemCheckStatus": true,
"EnumGetEnterpriseEmployeesQuerySignContractStatus": true,
+ "EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus": true,
"EnumGetStandardOrdersQueryScene": true,
"EnumGetStandardOrdersQuerySceneText": true,
+ "EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus": true,
"EnumInsuranceSupplierAccess": true,
"EnumInsuranceSupplierAccessText": true,
"EnumLogLevel": true,
@@ -338,6 +340,7 @@
"useGetDictionaryCategorySelect": true,
"useGetEnterprises": true,
"useGetShowAdvertisements": true,
+ "useGetStandardOrders": true,
"useGlobalEventContext": true,
"useGlobalEventProvide": true,
"useGroupColumns": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 5e72a5f..ea619c8 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -80,8 +80,10 @@
const EnumGetCheckReceiveTaskCheckInUsersQueryStatus: typeof import('./src/constants/apiEnum')['EnumGetCheckReceiveTaskCheckInUsersQueryStatus']
const EnumGetCheckReceiveTasksQueryResultItemCheckStatus: typeof import('./src/constants/apiEnum')['EnumGetCheckReceiveTasksQueryResultItemCheckStatus']
const EnumGetEnterpriseEmployeesQuerySignContractStatus: typeof import('./src/constants/apiEnum')['EnumGetEnterpriseEmployeesQuerySignContractStatus']
+ const EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus: typeof import('./src/constants/apiEnum')['EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus']
const EnumGetStandardOrdersQueryScene: typeof import('./src/constants/apiEnum')['EnumGetStandardOrdersQueryScene']
const EnumGetStandardOrdersQuerySceneText: typeof import('./src/constants/standardOrder')['EnumGetStandardOrdersQuerySceneText']
+ const EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus: typeof import('./src/constants/apiEnum')['EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus']
const EnumInsuranceSupplierAccess: typeof import('./src/constants/apiEnum')['EnumInsuranceSupplierAccess']
const EnumInsuranceSupplierAccessText: typeof import('./src/constants/enterprise')['EnumInsuranceSupplierAccessText']
const EnumLogLevel: typeof import('./src/constants/apiEnum')['EnumLogLevel']
@@ -244,6 +246,7 @@
const VerifyStatusColor: typeof import('./src/constants/enterprise')['VerifyStatusColor']
const VerifyStatusText: typeof import('./src/constants/enterprise')['VerifyStatusText']
const WelfareCodeEnum: typeof import('./src/constants/dic')['WelfareCodeEnum']
+ const a: typeof import('./src/hooks/standardOrder')['a']
const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
const computed: typeof import('vue')['computed']
const copyTextToClipboard: typeof import('./src/hooks/useCopyToClipboard')['copyTextToClipboard']
@@ -323,6 +326,7 @@
const useGetDictionaryCategorySelect: typeof import('./src/hooks/dic')['useGetDictionaryCategorySelect']
const useGetEnterprises: typeof import('./src/hooks/enterprise')['useGetEnterprises']
const useGetShowAdvertisements: typeof import('./src/hooks/advertisement')['useGetShowAdvertisements']
+ const useGetStandardOrders: typeof import('./src/hooks/standardOrder')['useGetStandardOrders']
const useGlobalEventContext: typeof import('./src/hooks/useEvent')['useGlobalEventContext']
const useGlobalEventProvide: typeof import('./src/hooks/useEvent')['useGlobalEventProvide']
const useGroupColumns: typeof import('./src/hooks/useAccess')['useGroupColumns']
@@ -362,7 +366,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 { EnumAdvertisementPage, EnumAdvertisementStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCooperationServiceFeeCollectType, EnumEnterpriseCooperationSignStatus, EnumEnterpriseCooperationStatus, EnumEnterpriseCooperationWalletTransactionStatus, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseEmployeeSource, EnumEnterpriseRealMethod, EnumEnterpriseType, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetArrangeTaskUsersQueryApplyStatus, EnumGetCheckReceiveTaskCheckInUsersQueryStatus, EnumGetCheckReceiveTasksQueryResultItemCheckStatus, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumGetStandardOrdersQueryScene, EnumInsuranceSupplierAccess, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumReadScene, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumStandardOrderAppointmentStatus, EnumStandardOrderPayStatus, EnumStandardOrderRefundStatus, EnumStandardOrderSettlementStatus, EnumStandardServiceRecommendStatus, EnumStandardServiceReleaseStatus, EnumTaskApplyStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserApplyStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, EnumWxmpSubscribMessageTemplate, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetSettlementTasksQuerySupplierPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumAdvertisementPage, EnumAdvertisementStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCooperationServiceFeeCollectType, EnumEnterpriseCooperationSignStatus, EnumEnterpriseCooperationStatus, EnumEnterpriseCooperationWalletTransactionStatus, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseEmployeeSource, EnumEnterpriseRealMethod, EnumEnterpriseType, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetArrangeTaskUsersQueryApplyStatus, EnumGetCheckReceiveTaskCheckInUsersQueryStatus, EnumGetCheckReceiveTasksQueryResultItemCheckStatus, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumGetStandardOrdersQueryScene, EnumInsuranceSupplierAccess, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumReadScene, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumStandardOrderAppointmentStatus, EnumStandardOrderPayStatus, EnumStandardOrderRefundStatus, EnumStandardOrderSettlementStatus, EnumStandardServiceRecommendStatus, EnumStandardServiceReleaseStatus, EnumTaskApplyStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserApplyStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, EnumWxmpSubscribMessageTemplate, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetSettlementTasksQuerySupplierPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
+ export type { EnumAdvertisementPage, EnumAdvertisementStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCooperationServiceFeeCollectType, EnumEnterpriseCooperationSignStatus, EnumEnterpriseCooperationStatus, EnumEnterpriseCooperationWalletTransactionStatus, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseEmployeeSource, EnumEnterpriseRealMethod, EnumEnterpriseType, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetArrangeTaskUsersQueryApplyStatus, EnumGetCheckReceiveTaskCheckInUsersQueryStatus, EnumGetCheckReceiveTasksQueryResultItemCheckStatus, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus, EnumGetStandardOrdersQueryScene, EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus, EnumInsuranceSupplierAccess, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumReadScene, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumStandardOrderAppointmentStatus, EnumStandardOrderPayStatus, EnumStandardOrderRefundStatus, EnumStandardOrderSettlementStatus, EnumStandardServiceRecommendStatus, EnumStandardServiceReleaseStatus, EnumTaskApplyStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserApplyStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, EnumWxmpSubscribMessageTemplate, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetSettlementTasksQuerySupplierPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumAdvertisementPage, EnumAdvertisementStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCooperationServiceFeeCollectType, EnumEnterpriseCooperationSignStatus, EnumEnterpriseCooperationStatus, EnumEnterpriseCooperationWalletTransactionStatus, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseEmployeeSource, EnumEnterpriseRealMethod, EnumEnterpriseType, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetArrangeTaskUsersQueryApplyStatus, EnumGetCheckReceiveTaskCheckInUsersQueryStatus, EnumGetCheckReceiveTasksQueryResultItemCheckStatus, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus, EnumGetStandardOrdersQueryScene, EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus, EnumInsuranceSupplierAccess, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumReadScene, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumStandardOrderAppointmentStatus, EnumStandardOrderPayStatus, EnumStandardOrderRefundStatus, EnumStandardOrderSettlementStatus, EnumStandardServiceRecommendStatus, EnumStandardServiceReleaseStatus, EnumTaskApplyStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserApplyStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, EnumWxmpSubscribMessageTemplate, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetSettlementTasksQuerySupplierPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -479,8 +483,10 @@
readonly EnumGetCheckReceiveTaskCheckInUsersQueryStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetCheckReceiveTaskCheckInUsersQueryStatus']>
readonly EnumGetCheckReceiveTasksQueryResultItemCheckStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetCheckReceiveTasksQueryResultItemCheckStatus']>
readonly EnumGetEnterpriseEmployeesQuerySignContractStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetEnterpriseEmployeesQuerySignContractStatus']>
+ readonly EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus']>
readonly EnumGetStandardOrdersQueryScene: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetStandardOrdersQueryScene']>
readonly EnumGetStandardOrdersQuerySceneText: UnwrapRef<typeof import('./src/constants/standardOrder')['EnumGetStandardOrdersQuerySceneText']>
+ readonly EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus']>
readonly EnumInsuranceSupplierAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumInsuranceSupplierAccess']>
readonly EnumInsuranceSupplierAccessText: UnwrapRef<typeof import('./src/constants/enterprise')['EnumInsuranceSupplierAccessText']>
readonly EnumLogLevel: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumLogLevel']>
@@ -719,6 +725,7 @@
readonly useGetDictionaryCategorySelect: UnwrapRef<typeof import('./src/hooks/dic')['useGetDictionaryCategorySelect']>
readonly useGetEnterprises: UnwrapRef<typeof import('./src/hooks/enterprise')['useGetEnterprises']>
readonly useGetShowAdvertisements: UnwrapRef<typeof import('./src/hooks/advertisement')['useGetShowAdvertisements']>
+ readonly useGetStandardOrders: UnwrapRef<typeof import('./src/hooks/standardOrder')['useGetStandardOrders']>
readonly useGlobalEventContext: UnwrapRef<typeof import('./src/hooks/useEvent')['useGlobalEventContext']>
readonly useGlobalEventProvide: UnwrapRef<typeof import('./src/hooks/useEvent')['useGlobalEventProvide']>
readonly useGroupColumns: UnwrapRef<typeof import('./src/hooks/useAccess')['useGroupColumns']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index c97d63f..d81c52a 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -303,14 +303,30 @@
Pass = 30,
}
+/** 鏌ヨ鏍囧噯璁㈠崟鍒嗛〉鍒楄〃-鐢叉柟璁㈠崟鐘舵�� */
+export enum EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus {
+ /**寰呮敮浠� */
+ Wait = 10,
+ /**宸叉敮浠� */
+ Pay = 20,
+ /**宸插畬鎴� */
+ Completed = 30,
+}
+
/** 鏌ヨ鏍囧噯璁㈠崟鍒嗛〉鍒楄〃-闄愬埗鍦烘櫙 */
export enum EnumGetStandardOrdersQueryScene {
- /**棰勭害璁㈠崟 */
- Appointment = 10,
- /**鏀粯璁㈠崟 */
- Pay = 20,
- /**缁撶畻璁㈠崟 */
- Settlement = 30,
+ /**鐢叉柟浼佷笟璁㈠崟绠＄悊 */
+ PartAEnterpriseOrder = 10,
+ /**浜鸿祫浼佷笟璁㈠崟绠＄悊 */
+ SupplierEnterpriseOrder = 100,
+}
+
+/** 鏌ヨ鏍囧噯璁㈠崟鍒嗛〉鍒楄〃-鐢叉柟璁㈠崟鐘舵�� */
+export enum EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus {
+ /**寰呮敹娆� */
+ Wait = 10,
+ /**宸插畬鎴� */
+ Completed = 30,
}
/** 鎶曚繚渚涘簲鍟嗚处鍙� */
diff --git a/src/constants/standardOrder.ts b/src/constants/standardOrder.ts
index 80fdb9b..19e8801 100644
--- a/src/constants/standardOrder.ts
+++ b/src/constants/standardOrder.ts
@@ -22,7 +22,6 @@
};
export const EnumGetStandardOrdersQuerySceneText = {
- [EnumGetStandardOrdersQueryScene.Appointment]: '棰勭害璁㈠崟',
- [EnumGetStandardOrdersQueryScene.Pay]: '鏀粯璁㈠崟',
- [EnumGetStandardOrdersQueryScene.Settlement]: '缁撶畻璁㈠崟',
+ [EnumGetStandardOrdersQueryScene.PartAEnterpriseOrder]: '鐢叉柟浼佷笟璁㈠崟绠＄悊',
+ [EnumGetStandardOrdersQueryScene.SupplierEnterpriseOrder]: '浜鸿祫浼佷笟璁㈠崟绠＄悊',
};
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index 33068a6..6e3d168 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -13,3 +13,4 @@
export * from './identify';
export * from './advertisement';
export * from './enterprise';
+export * from './standardOrder';
diff --git a/src/hooks/standardOrder.ts b/src/hooks/standardOrder.ts
new file mode 100644
index 0000000..28cde86
--- /dev/null
+++ b/src/hooks/standardOrder.ts
@@ -0,0 +1,71 @@
+import { format } from '@/utils';
+import { useTable } from '@bole-core/components';
+import { ModelValueType } from 'element-plus';
+import * as standardOrderServices from '@/services/api/standardOrder';
+import {
+ EnumStandardOrderAppointmentStatusText,
+ EnumStandardOrderPayStatusText,
+ EnumStandardOrderSettlementStatusText,
+} from '@/constants';
+
+export function useGetStandardOrders() {
+ const {
+ getDataSource: getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+ } = useTable(
+ async ({ pageIndex, pageSize }, extraParamState) => {
+ try {
+ let params: API.GetStandardOrdersQuery = {
+ pageModel: {
+ rows: pageSize,
+ page: pageIndex,
+ orderInput: extraParamState.orderInput,
+ },
+ keywords: extraParamState.keywords,
+ appointmentStatus: extraParamState.appointmentStatus,
+ payStatus: extraParamState.payStatus,
+ settlementStatus: extraParamState.settlementStatus,
+ createdTimeBegin: format(extraParamState.createdTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ createdTimeEnd: format(extraParamState.createdTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ payTimeBegin: format(extraParamState.payTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ payTimeEnd: format(extraParamState.payTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ };
+ let res = await standardOrderServices.getStandardOrders(params);
+ return res;
+ } catch (error) {}
+ },
+ {
+ defaultExtraParams: {
+ keywords: '',
+ appointmentStatus: '' as any as EnumStandardOrderAppointmentStatus,
+ payStatus: '' as any as EnumStandardOrderPayStatus,
+ settlementStatus: '' as any as EnumStandardOrderSettlementStatus,
+ createdTime: [] as unknown as ModelValueType,
+ payTime: [] as unknown as ModelValueType,
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ },
+ columnsRenderProps: {
+ createdTime: { type: 'date' },
+ payCompletedTime: { type: 'date' },
+ payAmount: { type: 'money' },
+ receiveAmount: { type: 'money' },
+ serviceFee: { type: 'money' },
+ settlementAmount: { type: 'money' },
+ appointmentStatus: { type: 'enum', valueEnum: EnumStandardOrderAppointmentStatusText },
+ payStatus: { type: 'enum', valueEnum: EnumStandardOrderPayStatusText },
+ settlementStatus: { type: 'enum', valueEnum: EnumStandardOrderSettlementStatusText },
+ },
+ }
+ );
+
+ return {
+ getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+ };
+}
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 74abc28..10b88c6 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -14,11 +14,11 @@
import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
import * as taskCheckReceive from './taskCheckReceive';
+import * as taskUser from './taskUser';
import * as standardOrder from './standardOrder';
import * as standardService from './standardService';
import * as userResume from './userResume';
import * as auth from './auth';
-import * as taskUser from './taskUser';
import * as enterpriseInsuranceProduct from './enterpriseInsuranceProduct';
import * as eventUtils from './eventUtils';
import * as enterpriseCooperationWallet from './enterpriseCooperationWallet';
@@ -45,11 +45,11 @@
logRecords,
dictionary,
taskCheckReceive,
+ taskUser,
standardOrder,
standardService,
userResume,
auth,
- taskUser,
enterpriseInsuranceProduct,
eventUtils,
enterpriseCooperationWallet,
diff --git a/src/services/api/standardOrder.ts b/src/services/api/standardOrder.ts
index e71a5e6..22de738 100644
--- a/src/services/api/standardOrder.ts
+++ b/src/services/api/standardOrder.ts
@@ -98,6 +98,24 @@
});
}
+/** 鏌ヨ鏍囧噯璁㈠崟璇︽儏 GET /api/flexjob/standardOrder/getSureStandardOrder */
+export async function getSureStandardOrder(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetSureStandardOrderParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetSureStandardOrderQueryResult>(
+ '/api/flexjob/standardOrder/getSureStandardOrder',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏍囧噯璁㈠崟鏀粯 POST /api/flexjob/standardOrder/payStandardOrder */
export async function payStandardOrder(
body: API.PayStandardOrderCommand,
@@ -113,6 +131,21 @@
});
}
+/** 缁撶畻鏍囧噯璁㈠崟 PUT /api/flexjob/standardOrder/settlementStandardOrder */
+export async function settlementStandardOrder(
+ body: API.SettlementStandardOrderCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/flexjob/standardOrder/settlementStandardOrder', {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鏍囧噯璁㈠崟鏈嶅姟纭 POST /api/flexjob/standardOrder/sureStandardOrder */
export async function sureStandardOrder(
body: API.SureStandardOrderCommand,
diff --git a/src/services/api/taskUser.ts b/src/services/api/taskUser.ts
index a66d30a..e7816d9 100644
--- a/src/services/api/taskUser.ts
+++ b/src/services/api/taskUser.ts
@@ -41,6 +41,42 @@
});
}
+/** 鏌ヨ浠诲姟瀹夋帓鐏靛伐璇︽儏 GET /api/flexjob/taskUser/getArrangeTaskEnterpriseEmployee */
+export async function getArrangeTaskEnterpriseEmployee(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetArrangeTaskEnterpriseEmployeeParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetArrangeTaskEnterpriseEmployeeQueryResult>(
+ '/api/flexjob/taskUser/getArrangeTaskEnterpriseEmployee',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ浠诲姟瀹夋帓鐏靛伐鍒楄〃 POST /api/flexjob/taskUser/getArrangeTaskEnterpriseEmployees */
+export async function getArrangeTaskEnterpriseEmployees(
+ body: API.GetArrangeTaskEnterpriseEmployeesQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetArrangeTaskEnterpriseEmployeesQueryResult>(
+ '/api/flexjob/taskUser/getArrangeTaskEnterpriseEmployees',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** B绔煡璇汉鍛樺畨鎺掑垎椤靛垪琛ㄤ俊鎭� POST /api/flexjob/taskUser/getArrangeTaskUsers */
export async function getArrangeTaskUsers(
body: API.GetArrangeTaskUsersQuery,
@@ -104,6 +140,21 @@
});
}
+/** 鏌ヨ寰呭畨鎺掍换鍔″垎椤靛垪琛� POST /api/flexjob/taskUser/getWaitArrangeTasks */
+export async function getWaitArrangeTasks(
+ body: API.GetWaitArrangeTasksQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetWaitArrangeTasksQueryResult>('/api/flexjob/taskUser/getWaitArrangeTasks', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 浠诲姟瀹夋帓 PUT /api/flexjob/taskUser/setTaskUserArrange */
export async function setTaskUserArrange(
body: API.SetTaskUserArrangeCommand,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 5fa6e13..62cea36 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -104,6 +104,11 @@
maxDeep?: number;
}
+ interface APIgetArrangeTaskEnterpriseEmployeeParams {
+ /** 鐏靛伐Id */
+ id?: string;
+ }
+
interface APIgetCheckReceiveTaskUserSubmitParams {
/** 鎻愪氦Id锛堢敤浜嶣绔鎴风锛� */
submitId?: string;
@@ -399,6 +404,8 @@
interface APIgetStandardOrderParams {
/** 璁㈠崟Id */
id?: string;
+ /** 闄愬埗鍦烘櫙锛堜笉浼犲垯涓嶉檺鍒讹級 */
+ scene?: EnumGetStandardOrdersQueryScene;
}
interface APIgetStandardServiceParams {
@@ -411,6 +418,11 @@
request?: GetSupplierEnterpriseSelectQuery;
}
+ interface APIgetSureStandardOrderParams {
+ /** 璁㈠崟Id */
+ id?: string;
+ }
+
interface APIgetTaskEnterpriseParams {
/** 浼佷笟Id */
id?: string;
@@ -1236,13 +1248,27 @@
Pass = 30,
}
- enum EnumGetStandardOrdersQueryScene {
- /**棰勭害璁㈠崟 */
- Appointment = 10,
- /**鏀粯璁㈠崟 */
+ enum EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus {
+ /**寰呮敮浠� */
+ Wait = 10,
+ /**宸叉敮浠� */
Pay = 20,
- /**缁撶畻璁㈠崟 */
- Settlement = 30,
+ /**宸插畬鎴� */
+ Completed = 30,
+ }
+
+ enum EnumGetStandardOrdersQueryScene {
+ /**鐢叉柟浼佷笟璁㈠崟绠＄悊 */
+ PartAEnterpriseOrder = 10,
+ /**浜鸿祫浼佷笟璁㈠崟绠＄悊 */
+ SupplierEnterpriseOrder = 100,
+ }
+
+ enum EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus {
+ /**寰呮敹娆� */
+ Wait = 10,
+ /**宸插畬鎴� */
+ Completed = 30,
}
enum EnumInsuranceSupplierAccess {
@@ -2189,6 +2215,42 @@
timestamp?: number;
}
+ interface FriendlyResultGetArrangeTaskEnterpriseEmployeeQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetArrangeTaskEnterpriseEmployeeQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetArrangeTaskEnterpriseEmployeesQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetArrangeTaskEnterpriseEmployeesQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetArrangeTaskUsersQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3485,6 +3547,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetSureStandardOrderQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetSureStandardOrderQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetTaskEnterpriseQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3773,6 +3853,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetWaitArrangeTasksQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetWaitArrangeTasksQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetWxmpSettingsQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -4682,6 +4780,66 @@
quickQuery?: string;
}
+ interface GetArrangeTaskEnterpriseEmployeeQueryResult {
+ /** 鐏靛伐Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
+ /** 鐢靛瓙鍚堝悓 */
+ contractUrl?: string;
+ /** 鍗忚璧峰鏃堕棿 */
+ contractBegin?: string;
+ /** 鍗忚缁堟鏃堕棿 */
+ contractEnd?: string;
+ /** 宸插畨鎺掍换鍔� */
+ taskInfos?: GetWaitArrangeTasksQueryResultItem[];
+ }
+
+ interface GetArrangeTaskEnterpriseEmployeesQuery {
+ /** 鍏抽敭瀛楋紙濮撳悕銆佽韩浠借瘉鍙枫�佹墜鏈哄彿锛� */
+ keywords?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetArrangeTaskEnterpriseEmployeesQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetArrangeTaskEnterpriseEmployeesQueryResultItem[];
+ }
+
+ interface GetArrangeTaskEnterpriseEmployeesQueryResultItem {
+ /** Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
+ /** 宸插畨鎺� */
+ arrangeTaskCount?: number;
+ }
+
interface GetArrangeTaskUsersQuery {
/** 浠诲姟Id */
id?: string;
@@ -5584,8 +5742,26 @@
name?: string;
/** 鑱旂郴鐢佃瘽 */
contactPhoneNumber?: string;
- /** 鐪佸競鍖�+璇︾粏鍦板潃+闂ㄧ墝鍙� */
+ /** 鐪佷唤缂栧彿 */
+ provinceCode?: string;
+ /** 鐪佷唤 */
+ provinceContent?: string;
+ /** 鍩庡競缂栧彿 */
+ cityCode?: string;
+ /** 鍩庡競 */
+ cityContent?: string;
+ /** 鍖虹紪鍙� */
+ areaCode?: string;
+ /** 鍖� */
+ areaContent?: string;
+ /** 璇︾粏鍦板潃 */
+ addressName?: string;
+ /** 闂ㄧ墝鍙� */
addressDetail?: string;
+ /** 缁忓害 */
+ longitude?: number;
+ /** 绾害 */
+ latitude?: number;
/** 鏄惁榛樿 */
isDefault?: boolean;
}
@@ -7987,20 +8163,6 @@
name?: string;
/** 鑱旂郴鐢佃瘽 */
contactPhoneNumber?: string;
- /** 鐪佷唤缂栧彿 */
- provinceCode?: string;
- /** 鐪佷唤 */
- provinceContent?: string;
- /** 鍩庡競缂栧彿 */
- cityCode?: string;
- /** 鍩庡競 */
- cityContent?: string;
- /** 鍖虹紪鍙� */
- areaCode?: string;
- /** 鍖� */
- areaContent?: string;
- /** 璇︾粏鍦板潃 */
- addressName?: string;
/** 闂ㄧ墝鍙� */
addressDetail?: string;
/** 缁忓害 */
@@ -8040,6 +8202,8 @@
receiveAmount?: number;
/** 缁撶畻閲戦 */
settlementAmount?: number;
+ partAEnterpriseOrderStatus?: EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus;
+ supplierEnterpriseOrderStatus?: EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus;
}
interface GetStandardOrderQueryResultServer {
@@ -8065,6 +8229,8 @@
payTimeEnd?: string;
appointmentStatus?: EnumStandardOrderAppointmentStatus;
payStatus?: EnumStandardOrderPayStatus;
+ partAEnterpriseOrderStatus?: EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus;
+ supplierEnterpriseOrderStatus?: EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus;
settlementStatus?: EnumStandardOrderSettlementStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -8086,6 +8252,12 @@
serviceCode?: string;
/** 鏈嶅姟鍥剧墖 */
serviceFile?: string;
+ /** 鐪佸競鍖�+璇︾粏鍦板潃+闂ㄧ墝鍙� */
+ addressDetail?: string;
+ /** 鏈嶅姟璧峰鏃堕棿 */
+ beginTime?: string;
+ /** 鏈嶅姟鎴鏃堕棿 */
+ endTime?: string;
/** 涓嬪崟鐢ㄦ埛Id */
createdUserId?: string;
/** 涓嬪崟鐢ㄦ埛 */
@@ -8103,8 +8275,10 @@
supplierEnterpriseId?: string;
/** 渚涘簲鍟� */
supplierEnterpriseName?: string;
- /** 渚涘簲鍟嗚仈绯荤數璇� */
- supplierContactPhoneNumber?: string;
+ /** 鏈嶅姟浜哄憳 */
+ serverNames?: string;
+ /** 鏈嶅姟浜哄憳鑱旂郴鐢佃瘽 */
+ serverContactPhoneNumbers?: string;
payStatus?: EnumStandardOrderPayStatus;
/** 鏀粯瀹屾垚鏃堕棿 */
payCompletedTime?: string;
@@ -8122,6 +8296,8 @@
settlementTime?: string;
/** 缁撶畻閲戦 */
settlementAmount?: number;
+ partAEnterpriseOrderStatus?: EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus;
+ supplierEnterpriseOrderStatus?: EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus;
}
interface GetStandardServiceCommentsQuery {
@@ -8379,6 +8555,17 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
}
+ interface GetSureStandardOrderQueryResult {
+ /** 璁㈠崟Id */
+ id?: string;
+ /** 楠屾敹瀹屾垚鏃堕棿 */
+ checkReceiveTime?: string;
+ /** 闄勪欢 */
+ files?: string[];
+ /** 澶囨敞 */
+ remark?: string;
+ }
+
interface GetTaskEnterpriseQueryResult {
/** 浼佷笟鍏ㄧО */
enterpriseName?: string;
@@ -9141,6 +9328,37 @@
pageModel?: PagedListQueryPageModel;
}
+ interface GetWaitArrangeTasksQuery {
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
+ /** 鍏抽敭瀛楋紙浠诲姟鍚嶃�佷换鍔″崟鍙凤級 */
+ keywords?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetWaitArrangeTasksQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetWaitArrangeTasksQueryResultItem[];
+ }
+
+ interface GetWaitArrangeTasksQueryResultItem {
+ /** Id */
+ id?: string;
+ /** 浠诲姟鍚嶇О */
+ name?: string;
+ /** 浠诲姟鍗曞彿 */
+ code?: string;
+ /** 鍙戝崟瀹㈡埛Id */
+ enterpriseId?: string;
+ /** 鍙戝崟瀹㈡埛 */
+ enterpriseName?: string;
+ /** 浠诲姟寮�濮嬫椂闂� */
+ beginTime?: string;
+ /** 浠诲姟缁撴潫鏃堕棿 */
+ endTime?: string;
+ }
+
type GetWxmpSettingsQuery = Record<string, any>;
interface GetWxmpSettingsQueryResult {
@@ -10524,6 +10742,11 @@
Refunded = 20,
}
+ interface SettlementStandardOrderCommand {
+ /** 璁㈠崟Id */
+ id?: string;
+ }
+
interface SetUserInfoRolesCommand {
/** 鐢ㄦ埛Id */
userInfoId?: string;
@@ -10632,10 +10855,8 @@
interface SureStandardOrderCommand {
/** 璁㈠崟Id */
id?: string;
- /** 璇勫垎 */
- commentStar?: number;
- /** 璇勪环 */
- commentContent?: string;
+ /** 棰勭害璁㈠崟瀹屾垚澶囨敞 */
+ appointmentCompletedRemark?: string;
}
interface SureTaskSettlementCommand {
diff --git a/src/views/FinanceManage/OrderSettlementManage.vue b/src/views/FinanceManage/OrderSettlementManage.vue
index 66a67a4..6c60ac8 100644
--- a/src/views/FinanceManage/OrderSettlementManage.vue
+++ b/src/views/FinanceManage/OrderSettlementManage.vue
@@ -5,8 +5,8 @@
<template #query>
<QueryFilterItem tip-content="缁撶畻鐘舵��">
<FieldRadio
- v-model="extraParamState.status"
- :value-enum="[]"
+ v-model="extraParamState.settlementStatus"
+ :value-enum="EnumStandardOrderSettlementStatusText"
buttonStyle
showAllBtn
@change="getList()"
@@ -36,7 +36,6 @@
ProTableV2,
LoadingLayout,
AppContainer,
- useTable,
useFormDialog,
ProTableQueryFilterBar,
QueryFilterItem,
@@ -44,9 +43,9 @@
SearchInput,
} from '@bole-core/components';
import { useAccess } from '@/hooks';
-import { ModelValueType } from 'element-plus';
-import * as userServices from '@/services/api/user';
import OrderSettlementDetailDialog from './components/OrderSettlementDetailDialog.vue';
+import { useGetStandardOrders } from '@/hooks';
+import { EnumStandardOrderSettlementStatusText } from '@/constants';
defineOptions({
name: 'OrderSettlementManage',
@@ -68,46 +67,13 @@
const state = reactive({ ...BaseState });
+const { getList, proTableProps, paginationState, extraParamState, reset } = useGetStandardOrders();
+
onMounted(async () => {
await getList();
state.loading = false;
});
-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, {
- showLoading: !state.loading,
- });
- return res;
- } catch (error) {}
- },
- {
- defaultExtraParams: {
- status: '',
- keywords: '',
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
- },
- columnsRenderProps: {
- transDate: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
- },
- }
-);
-
async function handleSettlement(row) {}
const { dialogProps, handleEdit, editForm } = useFormDialog({
diff --git a/src/views/StandardOrderManage/OrderManage.vue b/src/views/StandardOrderManage/OrderManage.vue
index 12a9627..bd231a6 100644
--- a/src/views/StandardOrderManage/OrderManage.vue
+++ b/src/views/StandardOrderManage/OrderManage.vue
@@ -67,19 +67,15 @@
LoadingLayout,
AppContainer,
QueryFilterItem,
- useTable,
FieldDatePicker,
FieldSelect,
} from '@bole-core/components';
import { useAccess } from '@/hooks';
-import { ModelValueType } from 'element-plus';
-import * as standardOrderServices from '@/services/api/standardOrder';
import {
EnumStandardOrderAppointmentStatusText,
EnumStandardOrderPayStatusText,
- EnumStandardOrderSettlementStatusText,
} from '@/constants';
-import { format } from '@/utils';
+import { useGetStandardOrders } from '@/hooks';
defineOptions({
name: 'OrderManage',
@@ -100,63 +96,13 @@
const state = reactive({ ...BaseState });
+const { getList, proTableProps, paginationState, extraParamState, reset } = useGetStandardOrders();
+
onMounted(async () => {
await getList();
state.loading = false;
});
-const {
- getDataSource: getList,
- proTableProps,
- paginationState,
- extraParamState,
- reset,
-} = useTable(
- async ({ pageIndex, pageSize }, extraParamState) => {
- try {
- let params: API.GetStandardOrdersQuery = {
- pageModel: {
- rows: pageSize,
- page: pageIndex,
- orderInput: extraParamState.orderInput,
- },
- keywords: extraParamState.keywords,
- appointmentStatus: extraParamState.appointmentStatus,
- payStatus: extraParamState.payStatus,
- createdTimeBegin: format(extraParamState.createdTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- createdTimeEnd: format(extraParamState.createdTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
- payTimeBegin: format(extraParamState.payTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- payTimeEnd: format(extraParamState.payTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
- };
- let res = await standardOrderServices.getStandardOrders(params, {
- showLoading: !state.loading,
- });
- return res;
- } catch (error) {}
- },
- {
- defaultExtraParams: {
- keywords: '',
- appointmentStatus: '' as any as EnumStandardOrderAppointmentStatus,
- payStatus: '' as any as EnumStandardOrderPayStatus,
- createdTime: [] as unknown as ModelValueType,
- payTime: [] as unknown as ModelValueType,
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
- },
- columnsRenderProps: {
- createdTime: { type: 'date' },
- payCompletedTime: { type: 'date' },
- payAmount: { type: 'money' },
- receiveAmount: { type: 'money' },
- serviceFee: { type: 'money' },
- settlementAmount: { type: 'money' },
- appointmentStatus: { type: 'enum', valueEnum: EnumStandardOrderAppointmentStatusText },
- payStatus: { type: 'enum', valueEnum: EnumStandardOrderPayStatusText },
- settlementStatus: { type: 'enum', valueEnum: EnumStandardOrderSettlementStatusText },
- },
- }
-);
-
function goDetail(row?: API.GetStandardOrdersQueryResultItem) {
router.push({ name: 'OrderManageDetail', params: { id: row?.id ?? '' } });
}
diff --git a/src/views/StandardOrderManage/OrderManageDetail.vue b/src/views/StandardOrderManage/OrderManageDetail.vue
index c21de49..37912d1 100644
--- a/src/views/StandardOrderManage/OrderManageDetail.vue
+++ b/src/views/StandardOrderManage/OrderManageDetail.vue
@@ -192,7 +192,7 @@
form.serviceCode = data.serviceCode;
form.createdUserName = data.createdUserName;
form.time = [data.beginTime, data.endTime];
- form.address = `${data.provinceContent}${data.cityContent}${data.addressName}${data.addressName}${data.addressDetail}\t${data.name}\t${data.contactPhoneNumber}`;
+ form.address = `${data.addressDetail}\t${data.createdUserName}\t${data.contactPhoneNumber}`;
form.serviceName = data.serviceName;
form.supplierEnterpriseName = data.supplierEnterpriseName;
form.servers = data.servers?.length ? data.servers.map((x) => x.name).join(',') : '';
--
Gitblit v1.10.0