From 45383d3d3c35934e1986d89bf695afde04ba7d2d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 26 十二月 2025 16:44:10 +0800
Subject: [PATCH] feat: init
---
src/services/api/standardOrder.ts | 51 ++
src/views/EmploymentManage/StandardOrder.vue | 78 ---
.eslintrc-auto-import.json | 5
src/services/api/typings.d.ts | 364 ++++++++++++++++-
src/views/FinanceManage/OrderSettlementManage.vue | 123 +----
src/views/EmploymentManage/TaskArrange.vue | 19
src/hooks/standardOrder.ts | 112 +++++
src/hooks/index.ts | 2
src/services/api/taskUser.ts | 66 +++
src/views/EmploymentManage/TaskArrangeDetail.vue | 134 ++++--
src/services/api/index.ts | 8
src/views/EmploymentManage/StandardOrderDetail.vue | 10
src/views/EmploymentManage/components/AddTaskDialog.vue | 39 +
src/hooks/task.ts | 55 ++
auto-imports.d.ts | 13
src/constants/apiEnum.ts | 30 +
src/views/FinanceManage/components/OrderSettlementDetailDialog.vue | 40 +
src/services/api/user.ts | 15
18 files changed, 884 insertions(+), 280 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 221fc4c..e0965b7 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -64,8 +64,10 @@
"EnumGetCheckReceiveTaskCheckInUsersQueryStatus": true,
"EnumGetCheckReceiveTasksQueryResultItemCheckStatus": true,
"EnumGetEnterpriseEmployeesQuerySignContractStatus": true,
+ "EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus": true,
"EnumGetStandardOrdersQueryScene": true,
"EnumGetStandardOrdersQuerySceneText": true,
+ "EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus": true,
"EnumInsuranceSupplierAccess": true,
"EnumLogLevel": true,
"EnumMenuType": true,
@@ -299,7 +301,9 @@
"useEnterpriseInsuranceProductSelect": true,
"useEnterpriseWalletAccessSelect": true,
"useGetDictionaryCategorySelect": true,
+ "useGetStandardOrders": true,
"useGetSupplierEnterpriseSelect": true,
+ "useGetWaitArrangeTasks": true,
"useGlobalEventContext": true,
"useGlobalEventProvide": true,
"useGroupColumns": true,
@@ -320,6 +324,7 @@
"useRouter": true,
"useSetReactive": true,
"useSlots": true,
+ "useStandardOrder": true,
"useTaskSelect": true,
"useTemplateRef": true,
"useUser": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index f4fad70..da3b7d2 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -75,8 +75,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']
@@ -304,7 +306,10 @@
const useEnterpriseInsuranceProductSelect: typeof import('./src/hooks/insurance')['useEnterpriseInsuranceProductSelect']
const useEnterpriseWalletAccessSelect: typeof import('./src/hooks/settlement')['useEnterpriseWalletAccessSelect']
const useGetDictionaryCategorySelect: typeof import('./src/hooks/dic')['useGetDictionaryCategorySelect']
+ const useGetEnterprises: typeof import('./src/hooks/task')['useGetEnterprises']
+ const useGetStandardOrders: typeof import('./src/hooks/standardOrder')['useGetStandardOrders']
const useGetSupplierEnterpriseSelect: typeof import('./src/hooks/supplier')['useGetSupplierEnterpriseSelect']
+ const useGetWaitArrangeTasks: typeof import('./src/hooks/task')['useGetWaitArrangeTasks']
const useGlobalEventContext: typeof import('./src/hooks/useEvent')['useGlobalEventContext']
const useGlobalEventProvide: typeof import('./src/hooks/useEvent')['useGlobalEventProvide']
const useGroupColumns: typeof import('./src/hooks/useAccess')['useGroupColumns']
@@ -328,6 +333,7 @@
const useSetReactive: typeof import('./src/hooks/global/helper')['useSetReactive']
const useSign: typeof import('./src/hooks/sign')['useSign']
const useSlots: typeof import('vue')['useSlots']
+ const useStandardOrder: typeof import('./src/hooks/standardOrder')['useStandardOrder']
const useTaskSelect: typeof import('./src/hooks/settlement')['useTaskSelect']
const useTemplateRef: typeof import('vue')['useTemplateRef']
const useUser: typeof import('./src/hooks/useUser')['useUser']
@@ -345,7 +351,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 { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic'
@@ -441,8 +447,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 EnumLogLevel: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumLogLevel']>
readonly EnumMenuType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuType']>
@@ -654,7 +662,9 @@
readonly useEnterpriseInsuranceProductSelect: UnwrapRef<typeof import('./src/hooks/insurance')['useEnterpriseInsuranceProductSelect']>
readonly useEnterpriseWalletAccessSelect: UnwrapRef<typeof import('./src/hooks/settlement')['useEnterpriseWalletAccessSelect']>
readonly useGetDictionaryCategorySelect: UnwrapRef<typeof import('./src/hooks/dic')['useGetDictionaryCategorySelect']>
+ readonly useGetStandardOrders: UnwrapRef<typeof import('./src/hooks/standardOrder')['useGetStandardOrders']>
readonly useGetSupplierEnterpriseSelect: UnwrapRef<typeof import('./src/hooks/supplier')['useGetSupplierEnterpriseSelect']>
+ readonly useGetWaitArrangeTasks: UnwrapRef<typeof import('./src/hooks/task')['useGetWaitArrangeTasks']>
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']>
@@ -675,6 +685,7 @@
readonly useRouter: UnwrapRef<typeof import('vue-router')['useRouter']>
readonly useSetReactive: UnwrapRef<typeof import('./src/hooks/global/helper')['useSetReactive']>
readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
+ readonly useStandardOrder: UnwrapRef<typeof import('./src/hooks/standardOrder')['useStandardOrder']>
readonly useTaskSelect: UnwrapRef<typeof import('./src/hooks/settlement')['useTaskSelect']>
readonly useTemplateRef: UnwrapRef<typeof import('vue')['useTemplateRef']>
readonly useUser: UnwrapRef<typeof import('./src/hooks/useUser')['useUser']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index c97d63f..69697f3 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -265,6 +265,8 @@
export enum EnumEnterpriseWalletTransactionType {
/**鍏呭�� */
Recharge = 10,
+ /**鏀跺叆 */
+ Income = 11,
/**杞处 */
Transfer = 20,
}
@@ -303,14 +305,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/hooks/index.ts b/src/hooks/index.ts
index 5460294..6782eb9 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -11,3 +11,5 @@
export * from './sign';
export * from './settlement';
export * from './portraitTable';
+export * from './task';
+export * from './standardOrder';
diff --git a/src/hooks/standardOrder.ts b/src/hooks/standardOrder.ts
new file mode 100644
index 0000000..9d56f14
--- /dev/null
+++ b/src/hooks/standardOrder.ts
@@ -0,0 +1,112 @@
+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';
+import { useQuery } from '@tanstack/vue-query';
+
+type UseGetStandardOrdersOptions = {
+ isSettlement?: boolean;
+};
+
+export function useGetStandardOrders(options: UseGetStandardOrdersOptions) {
+ const { isSettlement = false } = options;
+ 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: isSettlement
+ ? EnumStandardOrderAppointmentStatus.Completed
+ : 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,
+ };
+}
+
+type UseStandardOrderOptions = {
+ id: MaybeRef<string>;
+ scene?: EnumGetStandardOrdersQueryScene;
+ onSuccess?: (data: API.GetStandardOrderQueryResult) => any;
+};
+
+export function useStandardOrder({ id, scene, onSuccess }: UseStandardOrderOptions) {
+ const {
+ isLoading,
+ isError,
+ data: detail,
+ refetch,
+ } = useQuery({
+ queryKey: ['standardOrderServices/getStandardOrder', id, scene],
+ queryFn: async () => {
+ const params: API.APIgetStandardOrderParams = {
+ id: unref(id),
+ scene: scene,
+ };
+ return await standardOrderServices.getStandardOrder(params, {
+ showLoading: false,
+ });
+ },
+ placeholderData: () => ({} as API.GetStandardOrderQueryResult),
+ onSuccess(data) {
+ onSuccess?.(data);
+ },
+ enabled: computed(() => !!unref(id)),
+ });
+
+ return { detail, isLoading, isError, refetch };
+}
diff --git a/src/hooks/task.ts b/src/hooks/task.ts
new file mode 100644
index 0000000..66abaaa
--- /dev/null
+++ b/src/hooks/task.ts
@@ -0,0 +1,55 @@
+import { useTable } from '@bole-core/components';
+import * as taskUserServices from '@/services/api/taskUser';
+
+type UseWaitArrangeTasksOptions = {
+ id?: MaybeRef<string>;
+};
+
+export function useGetWaitArrangeTasks(options: UseWaitArrangeTasksOptions) {
+ const { id } = options;
+ const {
+ getDataSource: getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+ } = useTable(
+ async ({ pageIndex, pageSize }, extraParamState) => {
+ try {
+ let params: API.GetWaitArrangeTasksQuery = {
+ pageModel: {
+ rows: pageSize,
+ page: pageIndex,
+ orderInput: extraParamState.orderInput,
+ },
+ };
+ if (unref(id)) {
+ params.enterpriseEmployeeId = unref(id);
+ }
+
+ let res = await taskUserServices.getWaitArrangeTasks(params);
+ return res;
+ } catch (error) {
+ console.log('error: ', error);
+ }
+ },
+ {
+ defaultExtraParams: {
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ },
+ queryKey: ['taskUserServices/getWaitArrangeTasks', id],
+ columnsRenderProps: {
+ beginTime: { type: 'date' },
+ endTime: { type: 'date' },
+ },
+ }
+ );
+
+ return {
+ getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+ };
+}
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 74abc28..aa4cd2f 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -9,16 +9,16 @@
import * as task from './task';
import * as enterpriseWallet from './enterpriseWallet';
import * as ocrUtils from './ocrUtils';
+import * as standardOrder from './standardOrder';
import * as electronSign from './electronSign';
import * as resource from './resource';
import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
import * as taskCheckReceive from './taskCheckReceive';
-import * as standardOrder from './standardOrder';
+import * as taskUser from './taskUser';
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';
@@ -40,16 +40,16 @@
task,
enterpriseWallet,
ocrUtils,
+ standardOrder,
electronSign,
resource,
logRecords,
dictionary,
taskCheckReceive,
- standardOrder,
+ taskUser,
standardService,
userResume,
auth,
- taskUser,
enterpriseInsuranceProduct,
eventUtils,
enterpriseCooperationWallet,
diff --git a/src/services/api/standardOrder.ts b/src/services/api/standardOrder.ts
index e71a5e6..a38f968 100644
--- a/src/services/api/standardOrder.ts
+++ b/src/services/api/standardOrder.ts
@@ -98,6 +98,42 @@
});
}
+/** 鏌ヨ鏍囧噯璁㈠崟缁撶畻璇︽儏 GET /api/flexjob/standardOrder/getStandardOrderSettlement */
+export async function getStandardOrderSettlement(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetStandardOrderSettlementParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetStandardOrderSettlementQueryResult>(
+ '/api/flexjob/standardOrder/getStandardOrderSettlement',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ鏍囧噯璁㈠崟璇︽儏 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 +149,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..574ebbc 100644
--- a/src/services/api/taskUser.ts
+++ b/src/services/api/taskUser.ts
@@ -14,6 +14,21 @@
});
}
+/** 鎵归噺浠诲姟瀹夋帓 POST /api/flexjob/taskUser/batchSetTaskUserArrange */
+export async function batchSetTaskUserArrange(
+ body: API.BatchSetTaskUserArrangeCommand,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/flexjob/taskUser/batchSetTaskUserArrange', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 娓呯┖宸插仠姝㈢殑浠诲姟鏀惰棌 DELETE /api/flexjob/taskUser/clearTaskCollect */
export async function clearTaskCollect(
body: API.ClearTaskCollectCommand,
@@ -41,6 +56,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 +155,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..d7ac05a 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,13 @@
interface APIgetStandardOrderParams {
/** 璁㈠崟Id */
id?: string;
+ /** 闄愬埗鍦烘櫙锛堜笉浼犲垯涓嶉檺鍒讹級 */
+ scene?: EnumGetStandardOrdersQueryScene;
+ }
+
+ interface APIgetStandardOrderSettlementParams {
+ /** 璁㈠崟Id */
+ id?: string;
}
interface APIgetStandardServiceParams {
@@ -411,6 +423,11 @@
request?: GetSupplierEnterpriseSelectQuery;
}
+ interface APIgetSureStandardOrderParams {
+ /** 璁㈠崟Id */
+ id?: string;
+ }
+
interface APIgetTaskEnterpriseParams {
/** 浼佷笟Id */
id?: string;
@@ -610,6 +627,14 @@
errorMessages?: string;
}
+ interface BatchSetTaskUserArrangeCommand {
+ /** 浠诲姟Id */
+ taskInfoIds?: string[];
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
+ arrangeStatus?: EnumTaskUserArrangeStatus;
+ }
+
interface BindWxmpUserInfoCommand {
/** 璁块棶浠ょ墝 */
accessToken: string;
@@ -1202,6 +1227,8 @@
enum EnumEnterpriseWalletTransactionType {
/**鍏呭�� */
Recharge = 10,
+ /**鏀跺叆 */
+ Income = 11,
/**杞处 */
Transfer = 20,
}
@@ -1236,13 +1263,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 +2230,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;
@@ -3377,6 +3454,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetStandardOrderSettlementQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetStandardOrderSettlementQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetStandardOrdersQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3485,6 +3580,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 +3886,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 +4813,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 +5775,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 +8196,6 @@
name?: string;
/** 鑱旂郴鐢佃瘽 */
contactPhoneNumber?: string;
- /** 鐪佷唤缂栧彿 */
- provinceCode?: string;
- /** 鐪佷唤 */
- provinceContent?: string;
- /** 鍩庡競缂栧彿 */
- cityCode?: string;
- /** 鍩庡競 */
- cityContent?: string;
- /** 鍖虹紪鍙� */
- areaCode?: string;
- /** 鍖� */
- areaContent?: string;
- /** 璇︾粏鍦板潃 */
- addressName?: string;
/** 闂ㄧ墝鍙� */
addressDetail?: string;
/** 缁忓害 */
@@ -8016,6 +8211,10 @@
/** 渚涘簲鍟� */
supplierEnterpriseName?: string;
/** 鏈嶅姟浜哄憳 */
+ serverNames?: string;
+ /** 鏈嶅姟浜哄憳鑱旂郴鐢佃瘽 */
+ serverContactPhoneNumbers?: string;
+ /** 鏈嶅姟浜哄憳 */
servers?: GetStandardOrderQueryResultServer[];
/** 澶囨敞 */
remark?: string;
@@ -8040,6 +8239,9 @@
receiveAmount?: number;
/** 缁撶畻閲戦 */
settlementAmount?: number;
+ taskCheckReceiveStatus?: EnumTaskCheckReceiveStatus;
+ partAEnterpriseOrderStatus?: EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus;
+ supplierEnterpriseOrderStatus?: EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus;
}
interface GetStandardOrderQueryResultServer {
@@ -8051,6 +8253,38 @@
contactPhoneNumber?: string;
}
+ interface GetStandardOrderSettlementQueryResult {
+ /** 璁㈠崟Id */
+ id?: string;
+ /** 浠樻浜鸿处鎴� */
+ payerAccount?: string;
+ /** 浠樻浜哄悕绉� */
+ payerName?: string;
+ /** 浠樻浜哄紑鎴疯 */
+ payerBank?: string;
+ /** 浠樻浜烘敮琛� */
+ payerBankBranch?: string;
+ /** 鏀舵浜哄鍚� */
+ receiveName?: string;
+ /** 鏀舵璐︽埛 */
+ receiveAccount?: string;
+ /** 鏀舵浜哄紑鎴疯 */
+ receiveBank?: string;
+ /** 鏀舵浜烘敮琛� */
+ receiveBankBranch?: string;
+ /** 甯佺 */
+ currency?: string;
+ /** 甯佺 */
+ currencyName?: string;
+ settlementStatus?: EnumStandardOrderSettlementStatus;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ /** 鐢靛瓙鏀舵嵁涓嬭浇閾炬帴 */
+ ereceiptDownloadOssUrl?: string;
+ }
+
interface GetStandardOrdersQuery {
scene?: EnumGetStandardOrdersQueryScene;
/** 鍏抽敭瀛楋紙璁㈠崟鍙�/鏈嶅姟鍚嶏級 */
@@ -8065,7 +8299,10 @@
payTimeEnd?: string;
appointmentStatus?: EnumStandardOrderAppointmentStatus;
payStatus?: EnumStandardOrderPayStatus;
+ partAEnterpriseOrderStatus?: EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus;
+ supplierEnterpriseOrderStatus?: EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus;
settlementStatus?: EnumStandardOrderSettlementStatus;
+ taskCheckReceiveStatus?: EnumTaskCheckReceiveStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -8086,6 +8323,12 @@
serviceCode?: string;
/** 鏈嶅姟鍥剧墖 */
serviceFile?: string;
+ /** 鐪佸競鍖�+璇︾粏鍦板潃+闂ㄧ墝鍙� */
+ addressDetail?: string;
+ /** 鏈嶅姟璧峰鏃堕棿 */
+ beginTime?: string;
+ /** 鏈嶅姟鎴鏃堕棿 */
+ endTime?: string;
/** 涓嬪崟鐢ㄦ埛Id */
createdUserId?: string;
/** 涓嬪崟鐢ㄦ埛 */
@@ -8103,8 +8346,10 @@
supplierEnterpriseId?: string;
/** 渚涘簲鍟� */
supplierEnterpriseName?: string;
- /** 渚涘簲鍟嗚仈绯荤數璇� */
- supplierContactPhoneNumber?: string;
+ /** 鏈嶅姟浜哄憳 */
+ serverNames?: string;
+ /** 鏈嶅姟浜哄憳鑱旂郴鐢佃瘽 */
+ serverContactPhoneNumbers?: string;
payStatus?: EnumStandardOrderPayStatus;
/** 鏀粯瀹屾垚鏃堕棿 */
payCompletedTime?: string;
@@ -8122,6 +8367,8 @@
settlementTime?: string;
/** 缁撶畻閲戦 */
settlementAmount?: number;
+ partAEnterpriseOrderStatus?: EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus;
+ supplierEnterpriseOrderStatus?: EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus;
}
interface GetStandardServiceCommentsQuery {
@@ -8379,6 +8626,17 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
}
+ interface GetSureStandardOrderQueryResult {
+ /** 璁㈠崟Id */
+ id?: string;
+ /** 楠屾敹瀹屾垚鏃堕棿 */
+ checkReceiveTime?: string;
+ /** 闄勪欢 */
+ files?: string[];
+ /** 澶囨敞 */
+ remark?: string;
+ }
+
interface GetTaskEnterpriseQueryResult {
/** 浼佷笟鍏ㄧО */
enterpriseName?: string;
@@ -9141,11 +9399,44 @@
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 {
/** 闅愯棌鏀粯瀹� */
hiddenAlipay?: boolean;
+ /** 寰俊瀹℃牳涓� */
+ wxmpAuditInProcess?: boolean;
}
interface HistoryQueryResult {
@@ -9987,6 +10278,22 @@
id?: string;
}
+ interface SaveOperationUserCommand {
+ /** 濮撳悕 */
+ name?: string;
+ /** 鐢ㄦ埛鍚� */
+ userName: string;
+ /** 鎵嬫満鍙� */
+ phoneNumber?: string;
+ /** 瀵嗙爜 */
+ password?: string;
+ status?: EnumUserStatus;
+ /** 澶囨敞 */
+ remark?: string;
+ /** Id */
+ id?: string;
+ }
+
interface SavePartyAEnterpriseCommand {
/** Id */
id?: string;
@@ -10524,6 +10831,11 @@
Refunded = 20,
}
+ interface SettlementStandardOrderCommand {
+ /** 璁㈠崟Id */
+ id?: string;
+ }
+
interface SetUserInfoRolesCommand {
/** 鐢ㄦ埛Id */
userInfoId?: string;
@@ -10632,10 +10944,8 @@
interface SureStandardOrderCommand {
/** 璁㈠崟Id */
id?: string;
- /** 璇勫垎 */
- commentStar?: number;
- /** 璇勪环 */
- commentContent?: string;
+ /** 棰勭害璁㈠崟瀹屾垚澶囨敞 */
+ appointmentCompletedRemark?: string;
}
interface SureTaskSettlementCommand {
diff --git a/src/services/api/user.ts b/src/services/api/user.ts
index 99cf0de..df6fe54 100644
--- a/src/services/api/user.ts
+++ b/src/services/api/user.ts
@@ -251,6 +251,21 @@
});
}
+/** 淇濆瓨杩愯惀绔敤鎴� POST /api/user/user/saveOperationUser */
+export async function saveOperationUser(
+ body: API.SaveOperationUserCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/user/saveOperationUser', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 淇濆瓨鐢ㄦ埛閾惰鍗′俊鎭� POST /api/user/user/savePersonalUserBankCard */
export async function savePersonalUserBankCard(
body: API.SavePersonalUserBankCardCommand,
diff --git a/src/views/EmploymentManage/StandardOrder.vue b/src/views/EmploymentManage/StandardOrder.vue
index d3547af..e9f95d1 100644
--- a/src/views/EmploymentManage/StandardOrder.vue
+++ b/src/views/EmploymentManage/StandardOrder.vue
@@ -67,31 +67,31 @@
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';
defineOptions({
name: 'StandardOrder',
});
const operationBtnMap: Record<string, OperationBtnType> = {
- detailBtn: { emits: { onClick: (row: API.GetStandardOrdersQueryResultItem) => goDetail(row) } },
+ detailBtn: {
+ emits: { onClick: (row: API.GetStandardOrdersQueryResultItem) => goDetail(row, 'detail') },
+ },
confirmBtn: {
- emits: { onClick: (row: API.GetStandardOrdersQueryResultItem) => goDetail(row) },
+ emits: { onClick: (row: API.GetStandardOrdersQueryResultItem) => goDetail(row, 'confirm') },
extraProps: {
hide: (row: API.GetStandardOrdersQueryResultItem) =>
- row.appointmentStatus !== EnumStandardOrderAppointmentStatus.WaitSure,
+ !(
+ row.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure &&
+ row.payStatus === EnumStandardOrderPayStatus.Completed
+ ),
},
},
};
@@ -118,59 +118,15 @@
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 },
- },
- }
-);
+const { getList, proTableProps, paginationState, extraParamState, reset } = useGetStandardOrders({
+ isSettlement: false,
+});
-function goDetail(row?: API.GetStandardOrdersQueryResultItem) {
- router.push({ name: 'StandardOrderDetail', params: { id: row?.id ?? '' } });
+function goDetail(row: API.GetStandardOrdersQueryResultItem, type: string) {
+ router.push({
+ name: 'StandardOrderDetail',
+ params: { id: row?.id ?? '' },
+ query: { type: type },
+ });
}
</script>
diff --git a/src/views/EmploymentManage/StandardOrderDetail.vue b/src/views/EmploymentManage/StandardOrderDetail.vue
index d90ffdb..51e89c5 100644
--- a/src/views/EmploymentManage/StandardOrderDetail.vue
+++ b/src/views/EmploymentManage/StandardOrderDetail.vue
@@ -103,7 +103,10 @@
</ProForm>
<div
class="chuck-add-or-edit-actions"
- v-if="form.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure"
+ v-if="
+ form.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure &&
+ type === 'confirm'
+ "
>
<el-button class="chuck-add-or-edit-actions" @click="cancelStandardOrderAppointment"
>鍙栨秷棰勭害</el-button
@@ -160,6 +163,7 @@
const route = useRoute();
const id = (route.params.id as string) ?? '';
+const type = (route.query.type as string) ?? '';
const { closeViewPush } = useRouteView();
const form = reactive({
@@ -193,7 +197,7 @@
queryKey: ['standardOrderServices/getStandardOrder', id],
queryFn: async () => {
return await standardOrderServices.getStandardOrder(
- { id: id },
+ { id: id, scene: EnumGetStandardOrdersQueryScene.SupplierEnterpriseOrder },
{
showLoading: false,
}
@@ -207,7 +211,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(',') : '';
diff --git a/src/views/EmploymentManage/TaskArrange.vue b/src/views/EmploymentManage/TaskArrange.vue
index a445ce2..2ba4a56 100644
--- a/src/views/EmploymentManage/TaskArrange.vue
+++ b/src/views/EmploymentManage/TaskArrange.vue
@@ -30,7 +30,7 @@
QueryFilterItem,
useTable,
} from '@bole-core/components';
-import * as taskServices from '@/services/api/task';
+import * as taskUserServices from '@/services/api/taskUser';
defineOptions({
name: 'TaskArrange',
@@ -73,7 +73,7 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetTaskInfosQuery = {
+ let params: API.GetArrangeTaskEnterpriseEmployeesQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
@@ -82,7 +82,7 @@
keywords: extraParamState.keywords,
};
- let res = await taskServices.getTaskInfos(params, {
+ let res = await taskUserServices.getArrangeTaskEnterpriseEmployees(params, {
showLoading: !state.loading,
});
return res;
@@ -96,13 +96,20 @@
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
queryKey: ['taskServices/getTaskInfos'],
- columnsRenderProps: {},
+ columnsRenderProps: {
+ gender: { type: 'enum', valueEnum: EnumUserGenderText },
+ isReal: {
+ formatter: (row: API.GetArrangeTaskEnterpriseEmployeesQueryResultItem) => {
+ return row.isReal ? '宸插疄鍚�' : '鏈疄鍚�';
+ },
+ },
+ },
}
);
-function handleArrange(row: API.GetTaskInfosQueryResultItem) {
+function handleArrange(row: API.GetArrangeTaskEnterpriseEmployeesQueryResultItem) {
router.push({
- name: 'EmploymentManageArrange',
+ name: 'TaskArrangeDetail',
params: {
id: row?.id ?? '',
},
diff --git a/src/views/EmploymentManage/TaskArrangeDetail.vue b/src/views/EmploymentManage/TaskArrangeDetail.vue
index b6bf954..94969ae 100644
--- a/src/views/EmploymentManage/TaskArrangeDetail.vue
+++ b/src/views/EmploymentManage/TaskArrangeDetail.vue
@@ -11,12 +11,7 @@
</ProFormColItem>
<ProFormColItem :span="12">
<ProFormItemV2 label="鏈嶅姟鍗忚锛�" prop="contractUrl">
- <ProFormUpload
- v-model:file-url="form.contractUrl"
- :limit="1"
- :limitFileSize="10"
- accept="jpg/jpeg,png,pdf"
- ></ProFormUpload>
+ <ProFormUpload v-model:file-url="form.contractUrl"></ProFormUpload>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -63,13 +58,13 @@
</ProForm>
</ChunkCell>
<ChunkCell title="浠诲姟瀹夋帓">
- <ProTableQueryFilterBar>
+ <ProTableQueryFilterBar :show-reset-btn="false">
<template #btn>
<el-button
v-if="checkSubModuleItemShow('pageButton', 'addBtn')"
type="primary"
link
- @click="handleAdd()"
+ @click="openDialog()"
>鏂板浠诲姟</el-button
>
</template>
@@ -117,30 +112,36 @@
import * as taskUserServices from '@/services/api/taskUser';
import AddTaskDialog from './components/AddTaskDialog.vue';
import { EnumUserGenderTextForPerson } from '@/constants';
-import { paginateList } from '@/utils';
+import { paginateList, convertApi2FormUrlOnlyOne } from '@/utils';
+import { useGetWaitArrangeTasks } from '@/hooks';
+import { Message } from '@bole-core/core';
defineOptions({
name: 'TaskArrangeDetail',
});
+type GetWaitArrangeTasksQueryResultItemWithChoose = API.GetWaitArrangeTasksQueryResultItem & {
+ choose: boolean;
+};
+
const { closeViewPush } = useRouteView();
const eventContext = useGlobalEventContext();
const operationBtnMap: Record<string, OperationBtnType> = {
arrangeBtn: {
emits: {
- onClick: (role) => openDialog(role),
+ onClick: (role) => setTaskUserArrange(role),
},
extraProps: {
- hide: (row: API.GetSettlementTaskUsersQueryResultItem) => false,
+ hide: (row) => !row.choose,
},
},
cancelArrangeBtn: {
emits: {
- onClick: (role) => openDialog(role),
+ onClick: (role) => setTaskUserArrange(role),
},
extraProps: {
- hide: (row: API.GetSettlementTaskUsersQueryResultItem) => false,
+ hide: (row) => row.choose,
},
},
};
@@ -156,10 +157,12 @@
contractUrl: [] as UploadUserFile[],
contractTime: [],
contactPhoneNumber: '',
- gender: '',
+ gender: '' as any as EnumUserGender,
age: 0,
identity: '',
- settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],
+ taskInfos: [] as GetWaitArrangeTasksQueryResultItemWithChoose[],
+
+ arrangeList: [] as API.GetWaitArrangeTasksQueryResultItem[],
});
const BaseState = {
@@ -168,22 +171,34 @@
const state = reactive({ ...BaseState });
+const { proTableProps: waitArrangeTasksProTableProps } = useGetWaitArrangeTasks({
+ id: id,
+});
+
const { isLoading, refetch } = useQuery({
- queryKey: ['taskUserServices/getSettlementTaskUsers', id],
+ queryKey: ['taskUserServices/getArrangeTaskEnterpriseEmployee', id],
queryFn: async () => {
let params: API.APIgetSettlementTaskUsersParams = {
id: id,
};
- return await taskUserServices.getSettlementTaskUsers(params, {
+ return await taskUserServices.getArrangeTaskEnterpriseEmployee(params, {
showLoading: false,
});
},
- placeholderData: () => ({} as API.GetSettlementTaskUsersQueryResult),
+ placeholderData: () => ({} as API.GetArrangeTaskEnterpriseEmployeeQueryResult),
onSuccess(res) {
- form.settlementTaskUsers = res?.data ?? [];
- if (res?.detail) {
- form.name = res?.detail?.name;
- }
+ form.name = res?.name;
+ form.contractUrl = convertApi2FormUrlOnlyOne(res?.contractUrl);
+ form.contractTime = [res.contractBegin, res.contractEnd];
+ form.contactPhoneNumber = res?.contactPhoneNumber;
+ form.gender = res?.gender;
+ form.age = res?.age ?? 0;
+ form.identity = res?.identity ?? '';
+ form.taskInfos = res?.taskInfos.map((x) => ({
+ ...x,
+ choose: true,
+ }));
+
getList();
},
enabled: !!id,
@@ -198,17 +213,7 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let list = [...form.settlementTaskUsers];
- if (extraParamState.keywords) {
- list = list?.filter((item) => {
- return (
- item.name.includes(extraParamState.keywords) ||
- item.contactPhoneNumber.includes(extraParamState.keywords) ||
- item.identity.includes(extraParamState.keywords)
- );
- });
- }
-
+ let list = [...form.taskInfos];
return Promise.resolve({
pageModel: {
rows: pageSize,
@@ -223,48 +228,71 @@
},
{
defaultExtraParams: {
- keywords: '',
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- queryKey: ['taskUserServices/getSettlementTaskUsers'],
columnsRenderProps: {
- settlementTime: { type: 'date' },
+ beginTime: { type: 'date' },
+ endTime: { type: 'date' },
},
}
);
-const { dialogProps, handleAdd, handleEdit, editForm } = useFormDialog({
+async function setTaskUserArrange(row: GetWaitArrangeTasksQueryResultItemWithChoose) {
+ try {
+ let params: API.SetTaskUserArrangeCommand = {
+ enterpriseEmployeeId: id,
+ taskInfoId: row.id,
+ arrangeStatus: row.choose
+ ? EnumTaskUserArrangeStatus.Wait
+ : EnumTaskUserArrangeStatus.Complete,
+ };
+ let res = await taskUserServices.setTaskUserArrange(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ form.taskInfos = form.taskInfos.map((x) => {
+ if (x.id == row.id) {
+ x.choose = !x.choose;
+ }
+ return x;
+ });
+ getList();
+ }
+ } catch (error) {}
+}
+
+const { dialogProps, handleEdit, editForm } = useFormDialog({
onConfirm: handleAddOrEdit,
defaultFormParams: {
id: '',
+ selectedIds: [] as string[],
},
});
-function openDialog(row?: API.GetSettlementTaskUsersQueryResultItem) {
- if (row) {
- handleEdit({
- id: row?.id,
- });
- }
+function openDialog() {
+ handleEdit({
+ id: id,
+ selectedIds: [] as string[],
+ });
}
async function handleAddOrEdit() {
try {
- // let params: API.EditTaskSettlementOrderRosterCommand = {
- // id: editForm.id,
- // };
- // let res = await taskServices.editTaskSettlementOrderRoster(params);
- // if (res) {
- // Message.successMessage('鎿嶄綔鎴愬姛');
- // refetch();
- // getList(paginationState.pageIndex);
- // }
+ let params: API.BatchSetTaskUserArrangeCommand = {
+ enterpriseEmployeeId: id,
+ taskInfoIds: editForm.selectedIds,
+ arrangeStatus: EnumTaskUserArrangeStatus.Complete,
+ };
+ let res = await taskUserServices.batchSetTaskUserArrange(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ getList();
+ }
} catch (error) {}
}
function handleBack() {
closeViewPush(route, {
- name: 'ServiceChargeManageList',
+ name: 'TaskArrange',
});
}
</script>
diff --git a/src/views/EmploymentManage/components/AddTaskDialog.vue b/src/views/EmploymentManage/components/AddTaskDialog.vue
index 4a18c8a..2f07511 100644
--- a/src/views/EmploymentManage/components/AddTaskDialog.vue
+++ b/src/views/EmploymentManage/components/AddTaskDialog.vue
@@ -43,7 +43,7 @@
QueryFilterItem,
SearchInput,
} from '@bole-core/components';
-import * as userServices from '@/services/api/user';
+import * as taskUserServices from '@/services/api/taskUser';
defineOptions({
name: 'AddTaskDialog',
@@ -55,6 +55,7 @@
const form = defineModel<Form>('form');
const visible = defineModel<boolean>('modelValue');
+const selectedIds = ref<string[]>([]);
const emit = defineEmits<{
(e: 'onConfirm'): void;
@@ -71,7 +72,7 @@
onClick: (role) => handleChoose(role),
},
extraProps: {
- hide: (row) => row.recommendStatus === EnumTaskRecommendStatus.No,
+ hide: (row) => selectedIds.value.includes(row.id),
},
},
{
@@ -80,10 +81,10 @@
name: '鍙栨秷閫夋嫨',
},
emits: {
- onClick: (role) => handleChoose(role),
+ onClick: (role) => handleCancelChoose(role),
},
extraProps: {
- hide: (row) => row.recommendStatus === EnumTaskRecommendStatus.No,
+ hide: (row) => !selectedIds.value.includes(row.id),
},
},
]);
@@ -96,27 +97,27 @@
},
{
id: '2',
- enCode: 'name',
+ enCode: 'code',
name: '浠诲姟鍗曞彿',
},
{
id: '3',
- enCode: 'name',
+ enCode: 'enterpriseName',
name: '鍙戝崟瀹㈡埛',
},
{
id: '4',
- enCode: 'name',
+ enCode: 'enterpriseId',
name: '瀹㈡埛ID',
},
{
id: '5',
- enCode: 'name',
+ enCode: 'beginTime',
name: '浠诲姟寮�濮�',
},
{
id: '6',
- enCode: 'name',
+ enCode: 'endTime',
name: '浠诲姟缁撴潫',
},
]);
@@ -138,15 +139,16 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetPersonalUserInfoSignContractsQuery = {
+ let params: API.GetWaitArrangeTasksQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- id: form.value.id,
+ enterpriseEmployeeId: form.value.id,
+ keywords: extraParamState.keywords,
};
- let res = await userServices.getPersonalUserInfoSignContracts(params);
+ let res = await taskUserServices.getWaitArrangeTasks(params);
return res;
} catch (error) {}
},
@@ -156,14 +158,19 @@
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
columnsRenderProps: {
- applyTime: { type: 'date' },
- hireTime: { type: 'date' },
- enterpriseSignContractTime: { type: 'date' },
+ beginTime: { type: 'date' },
+ endTime: { type: 'date' },
},
}
);
-function handleChoose(row) {}
+function handleChoose(row: API.GetWaitArrangeTasksQueryResultItem) {
+ selectedIds.value.push(row.id);
+}
+
+function handleCancelChoose(row: API.GetWaitArrangeTasksQueryResultItem) {
+ selectedIds.value = selectedIds.value.filter((id) => id !== row.id);
+}
function handleConfirm() {
emit('onConfirm');
diff --git a/src/views/FinanceManage/OrderSettlementManage.vue b/src/views/FinanceManage/OrderSettlementManage.vue
index 552b635..e441dd7 100644
--- a/src/views/FinanceManage/OrderSettlementManage.vue
+++ b/src/views/FinanceManage/OrderSettlementManage.vue
@@ -6,7 +6,7 @@
<QueryFilterItem tip-content="缁撶畻鐘舵��">
<FieldRadio
v-model="extraParamState.settlementStatus"
- :value-enum="EnumTaskSettlementStatusText"
+ :value-enum="EnumStandardOrderSettlementStatusText"
buttonStyle
showAllBtn
@change="getList()"
@@ -15,10 +15,9 @@
<QueryFilterItem>
<SearchInput
v-model="extraParamState.keywords"
- style="width: 250px"
+ style="width: 260px"
placeholder="璁㈠崟鍙�/鏈嶅姟鍚�/渚涘簲鍟�"
- @on-click-search="getList()"
- @keyup.enter="getList()"
+ @on-click-search="getList"
>
</SearchInput>
</QueryFilterItem>
@@ -33,122 +32,78 @@
<script setup lang="ts">
import {
- ProTableQueryFilterBar,
+ OperationBtnType,
ProTableV2,
- SearchInput,
LoadingLayout,
AppContainer,
- QueryFilterItem,
- useTable,
- FieldRadio,
useFormDialog,
+ ProTableQueryFilterBar,
+ QueryFilterItem,
+ FieldRadio,
+ SearchInput,
} from '@bole-core/components';
-import {
- EnumTaskSettlementStatusText,
- EnumTaskSettlementOrderStatus,
- EnumTaskSettlementStatus,
- EnumTaskCheckReceiveStatus,
-} from '@/constants';
-import * as taskServices from '@/services/api/task';
-import { ModelValueType } from 'element-plus';
+import { useAccess } from '@/hooks';
import OrderSettlementDetailDialog from './components/OrderSettlementDetailDialog.vue';
+import { useGetStandardOrders } from '@/hooks';
+import { EnumStandardOrderSettlementStatusText } from '@/constants';
+import * as standardOrderServices from '@/services/api/standardOrder';
+import { Message } from '@bole-core/core';
+import { toThousand } from '@/utils';
defineOptions({
name: 'OrderSettlementManage',
});
const operationBtnMap: Record<string, OperationBtnType> = {
- detailBtn: {
- emits: {
- onClick: (role: API.GetSettlementTasksQueryResultItem) => openDialog(role.id),
- },
- },
+ settlementBtn: { emits: { onClick: (role) => handleSettlement(role) } },
+ detailBtn: { emits: { onClick: (role) => openDialog(role) } },
};
-const { column, operationBtns, checkSubModuleItemShow } = useAccess({
+const { column, operationBtns } = useAccess({
operationBtnMap,
});
const router = useRouter();
-
const BaseState = {
loading: true,
};
const state = reactive({ ...BaseState });
+const { getList, proTableProps, paginationState, extraParamState, reset } = useGetStandardOrders({
+ isSettlement: true,
+});
+
onMounted(async () => {
await getList();
state.loading = false;
});
-const {
- getDataSource: getList,
- proTableProps,
- paginationState,
- extraParamState,
- reset,
-} = useTable(
- async ({ pageIndex, pageSize }, extraParamState) => {
- try {
- let params: API.GetSettlementTasksQuery = {
- pageModel: {
- rows: pageSize,
- page: pageIndex,
- orderInput: extraParamState.orderInput,
- },
- keywords: extraParamState.keywords,
- settlementStatus: extraParamState.settlementStatus,
- };
-
- let res = await taskServices.getSettlementTasks(params, {
- showLoading: !state.loading,
- });
- return res;
- } catch (error) {
- console.log('error: ', error);
+async function handleSettlement(row: API.GetStandardOrdersQueryResultItem) {
+ try {
+ await Message.tipMessage(
+ `纭灏�${toThousand(row.settlementAmount)}鍏冪粨绠楃粰${row.supplierEnterpriseName}鍚楋紵`
+ );
+ let params: API.SettlementStandardOrderCommand = {
+ id: row.id,
+ };
+ let res = await standardOrderServices.settlementStandardOrder(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ getList(paginationState.pageIndex);
}
- },
- {
- defaultExtraParams: {
- keywords: '',
- settlementOrderStatus: '' as any as EnumTaskSettlementOrderStatus,
- checkReceiveStatus: '' as any as EnumTaskCheckReceiveStatus,
- settlementStatus: '' as any as EnumTaskSettlementStatus,
- time: [] as unknown as ModelValueType,
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
- },
- queryKey: ['taskServices/getSettlementTasks'],
- columnsRenderProps: {
- settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
- },
- }
-);
+ } catch (error) {}
+}
-const { dialogProps, handleAdd, editForm } = useFormDialog({
- onConfirm: handleAddOrEdit,
+const { dialogProps, handleEdit, editForm } = useFormDialog({
defaultFormParams: {
id: '',
},
});
-function openDialog(id: string) {
- handleAdd({
- id: id,
- });
-}
-
-async function handleAddOrEdit() {
- try {
- } catch (error) {}
-}
-
-function goDetail(id: string, settlement?: string) {
- router.push({
- name: 'ServiceChargeDetail',
- params: {
- id: id ?? '',
- },
+function openDialog(row: API.GetStandardOrdersQueryResultItem) {
+ handleEdit({
+ id: row.id,
});
}
</script>
diff --git a/src/views/FinanceManage/components/OrderSettlementDetailDialog.vue b/src/views/FinanceManage/components/OrderSettlementDetailDialog.vue
index 1ee399e..06f2cbc 100644
--- a/src/views/FinanceManage/components/OrderSettlementDetailDialog.vue
+++ b/src/views/FinanceManage/components/OrderSettlementDetailDialog.vue
@@ -19,9 +19,11 @@
import { FormInstance } from 'element-plus';
import { ProDialog } from '@bole-core/components';
import { usePortraitTableWithAttachment } from '@/hooks';
-import { convertApi2FormUrl } from '@/utils';
+import { convertApi2FormUrl, convertApi2FormUrlOnlyOne } from '@/utils';
import { useQuery } from '@tanstack/vue-query';
-import * as enterpriseCooperationWalletServices from '@/services/api/enterpriseCooperationWallet';
+import * as standardOrderServices from '@/services/api/standardOrder';
+import { EnumStandardOrderSettlementStatusText } from '@/constants';
+import PortraitTableWithAttachment from '@/components/Table/PortraitTableWithAttachment.vue';
defineOptions({
name: 'OrderSettlementDetailDialog',
@@ -51,67 +53,67 @@
);
const { data: detail, refetch } = useQuery({
- queryKey: [
- 'enterpriseCooperationWalletServices/getCooperationWalletRechargeTransaction',
- form.value.id,
- ],
+ queryKey: ['standardOrderServices/getStandardOrderSettlement', form.value.id],
queryFn: async () => {
- return await enterpriseCooperationWalletServices.getCooperationWalletRechargeTransaction({
+ return await standardOrderServices.getStandardOrderSettlement({
id: form.value.id,
});
},
- placeholderData: () => ({} as API.GetCooperationWalletRechargeTransactionQueryResult),
+ placeholderData: () => ({} as API.GetStandardOrderSettlementQueryResult),
enabled: computed(() => !!form.value.id),
});
const { portraitTableWithAttachmentProps } = usePortraitTableWithAttachment({
data: detail,
annexList: computed(() =>
- detail.value?.files ? detail.value?.files.map((item) => convertApi2FormUrl(item)) : []
+ detail.value?.ereceiptDownloadOssUrl
+ ? convertApi2FormUrlOnlyOne(detail.value?.ereceiptDownloadOssUrl)
+ : []
),
columns: [
{
label: '浠樻浜鸿处鎴�',
- key: 'receiveUnit',
+ key: 'payerAccount',
},
{
label: '鏀舵浜鸿处鎴�',
- key: 'receiveName',
+ key: 'receiveAccount',
},
{
label: '浠樻浜哄悕绉�',
- key: 'receiveBank',
+ key: 'payerName',
},
{
label: '鏀舵浜哄悕绉�',
- key: 'receiveAccount',
+ key: 'receiveName',
},
{
label: '浠樻浜哄紑鎴疯',
- key: 'receiveAccount',
+ key: 'payerBank',
},
{
label: '鏀舵浜哄紑鎴疯',
- key: 'receiveAccount',
+ key: 'receiveBank',
},
{
label: '甯佺',
- key: 'receiveAccount',
+ key: 'currencyName',
},
{
label: '缁撶畻閲戦',
- key: 'amount',
+ key: 'settlementAmount',
type: 'money',
},
{
label: '缁撶畻鏃堕棿',
- key: 'createdTime',
+ key: 'settlementTime',
type: 'date',
},
{
label: '缁撶畻鐘舵��',
- key: 'transactionStatus',
+ key: 'settlementStatus',
type: 'enum',
+ valueEnum: EnumStandardOrderSettlementStatusText,
},
],
});
--
Gitblit v1.10.0