From 6c4510ab6dfd1f0962e77268fa6e49e17861a00a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 25 十二月 2025 16:26:36 +0800
Subject: [PATCH] feat: 订单
---
src/services/api/userWallet.ts | 15
src/services/api/standardOrder.ts | 128 +---
src/hooks/enterprise.ts | 27
src/views/StandardOrderManage/OrderManage.vue | 82 +-
src/constants/standardOrder.ts | 24 +
src/views/OperationManage/components/AddOrEditAdvertisementDialog.vue | 6
.eslintrc-auto-import.json | 7
src/services/api/typings.d.ts | 607 +++++++++++++-----------
src/views/StandardOrderManage/components/AddSupplierDialog.vue | 5
src/constants/enterprise.ts | 5
src/views/UserManage/UserManageList.vue | 79 --
src/services/api/standardService.ts | 90 +++
src/services/api/index.ts | 4
src/views/StandardOrderManage/OrderManageDetail.vue | 255 +++++++---
src/views/StandardOrderManage/components/AddOrEditServicesManageView.vue | 8
auto-imports.d.ts | 16
src/constants/apiEnum.ts | 22
src/views/EnterpriseManage/EnterpriseManageList.vue | 20
18 files changed, 825 insertions(+), 575 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index fec16f1..68b177d 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -76,6 +76,8 @@
"EnumGetCheckReceiveTaskCheckInUsersQueryStatus": true,
"EnumGetCheckReceiveTasksQueryResultItemCheckStatus": true,
"EnumGetEnterpriseEmployeesQuerySignContractStatus": true,
+ "EnumGetStandardOrdersQueryScene": true,
+ "EnumGetStandardOrdersQuerySceneText": true,
"EnumInsuranceSupplierAccess": true,
"EnumInsuranceSupplierAccessText": true,
"EnumLogLevel": true,
@@ -112,8 +114,12 @@
"EnumSmsStatus": true,
"EnumSmsStatusText": true,
"EnumStandardOrderAppointmentStatus": true,
+ "EnumStandardOrderAppointmentStatusText": true,
"EnumStandardOrderPayStatus": true,
+ "EnumStandardOrderPayStatusText": true,
+ "EnumStandardOrderRefundStatus": true,
"EnumStandardOrderSettlementStatus": true,
+ "EnumStandardOrderSettlementStatusText": true,
"EnumStandardServiceRecommendStatus": true,
"EnumStandardServiceReleaseStatus": true,
"EnumStandardServiceReleaseStatusText": true,
@@ -211,6 +217,7 @@
"InjectionKey": true,
"IsConfiguredText": true,
"IsRealText": true,
+ "IsRealTextForPartA": true,
"MaybeRef": true,
"MaybeRefOrGetter": true,
"MenuSvgIconMap": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index f792e38..5e72a5f 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -80,6 +80,8 @@
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 EnumGetStandardOrdersQueryScene: typeof import('./src/constants/apiEnum')['EnumGetStandardOrdersQueryScene']
+ const EnumGetStandardOrdersQuerySceneText: typeof import('./src/constants/standardOrder')['EnumGetStandardOrdersQuerySceneText']
const EnumInsuranceSupplierAccess: typeof import('./src/constants/apiEnum')['EnumInsuranceSupplierAccess']
const EnumInsuranceSupplierAccessText: typeof import('./src/constants/enterprise')['EnumInsuranceSupplierAccessText']
const EnumLogLevel: typeof import('./src/constants/apiEnum')['EnumLogLevel']
@@ -117,8 +119,12 @@
const EnumSmsStatus: typeof import('./src/constants/apiEnum')['EnumSmsStatus']
const EnumSmsStatusText: typeof import('./src/constants/logs')['EnumSmsStatusText']
const EnumStandardOrderAppointmentStatus: typeof import('./src/constants/apiEnum')['EnumStandardOrderAppointmentStatus']
+ const EnumStandardOrderAppointmentStatusText: typeof import('./src/constants/standardOrder')['EnumStandardOrderAppointmentStatusText']
const EnumStandardOrderPayStatus: typeof import('./src/constants/apiEnum')['EnumStandardOrderPayStatus']
+ const EnumStandardOrderPayStatusText: typeof import('./src/constants/standardOrder')['EnumStandardOrderPayStatusText']
+ const EnumStandardOrderRefundStatus: typeof import('./src/constants/apiEnum')['EnumStandardOrderRefundStatus']
const EnumStandardOrderSettlementStatus: typeof import('./src/constants/apiEnum')['EnumStandardOrderSettlementStatus']
+ const EnumStandardOrderSettlementStatusText: typeof import('./src/constants/standardOrder')['EnumStandardOrderSettlementStatusText']
const EnumStandardServiceRecommendStatus: typeof import('./src/constants/apiEnum')['EnumStandardServiceRecommendStatus']
const EnumStandardServiceReleaseStatus: typeof import('./src/constants/apiEnum')['EnumStandardServiceReleaseStatus']
const EnumStandardServiceReleaseStatusText: typeof import('./src/constants/standardOrder')['EnumStandardServiceReleaseStatusText']
@@ -209,6 +215,7 @@
const IdentityCodeEnum: typeof import('./src/constants/dic')['IdentityCodeEnum']
const IsConfiguredText: typeof import('./src/constants/enterprise')['IsConfiguredText']
const IsRealText: typeof import('./src/constants/enterprise')['IsRealText']
+ const IsRealTextForPartA: typeof import('./src/constants/enterprise')['IsRealTextForPartA']
const MenuSvgIconMap: typeof import('./src/constants/menu')['MenuSvgIconMap']
const ModuleColumns: typeof import('./src/constants/module')['ModuleColumns']
const MyRegExp: typeof import('./src/constants/regExp')['MyRegExp']
@@ -355,7 +362,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, EnumInsuranceSupplierAccess, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumReadScene, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumStandardOrderAppointmentStatus, EnumStandardOrderPayStatus, 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, EnumInsuranceSupplierAccess, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumReadScene, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumStandardOrderAppointmentStatus, EnumStandardOrderPayStatus, 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, 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'
import('./src/constants/apiEnum')
// @ts-ignore
export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -472,6 +479,8 @@
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 EnumGetStandardOrdersQueryScene: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetStandardOrdersQueryScene']>
+ readonly EnumGetStandardOrdersQuerySceneText: UnwrapRef<typeof import('./src/constants/standardOrder')['EnumGetStandardOrdersQuerySceneText']>
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']>
@@ -508,8 +517,12 @@
readonly EnumSmsStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumSmsStatus']>
readonly EnumSmsStatusText: UnwrapRef<typeof import('./src/constants/logs')['EnumSmsStatusText']>
readonly EnumStandardOrderAppointmentStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumStandardOrderAppointmentStatus']>
+ readonly EnumStandardOrderAppointmentStatusText: UnwrapRef<typeof import('./src/constants/standardOrder')['EnumStandardOrderAppointmentStatusText']>
readonly EnumStandardOrderPayStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumStandardOrderPayStatus']>
+ readonly EnumStandardOrderPayStatusText: UnwrapRef<typeof import('./src/constants/standardOrder')['EnumStandardOrderPayStatusText']>
+ readonly EnumStandardOrderRefundStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumStandardOrderRefundStatus']>
readonly EnumStandardOrderSettlementStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumStandardOrderSettlementStatus']>
+ readonly EnumStandardOrderSettlementStatusText: UnwrapRef<typeof import('./src/constants/standardOrder')['EnumStandardOrderSettlementStatusText']>
readonly EnumStandardServiceRecommendStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumStandardServiceRecommendStatus']>
readonly EnumStandardServiceReleaseStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumStandardServiceReleaseStatus']>
readonly EnumStandardServiceReleaseStatusText: UnwrapRef<typeof import('./src/constants/standardOrder')['EnumStandardServiceReleaseStatusText']>
@@ -599,6 +612,7 @@
readonly IdentityCodeEnum: UnwrapRef<typeof import('./src/constants/dic')['IdentityCodeEnum']>
readonly IsConfiguredText: UnwrapRef<typeof import('./src/constants/enterprise')['IsConfiguredText']>
readonly IsRealText: UnwrapRef<typeof import('./src/constants/enterprise')['IsRealText']>
+ readonly IsRealTextForPartA: UnwrapRef<typeof import('./src/constants/enterprise')['IsRealTextForPartA']>
readonly MenuSvgIconMap: UnwrapRef<typeof import('./src/constants/menu')['MenuSvgIconMap']>
readonly ModuleColumns: UnwrapRef<typeof import('./src/constants/module')['ModuleColumns']>
readonly MyRegExp: UnwrapRef<typeof import('./src/constants/regExp')['MyRegExp']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index a8c9942..c97d63f 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -303,6 +303,16 @@
Pass = 30,
}
+/** 鏌ヨ鏍囧噯璁㈠崟鍒嗛〉鍒楄〃-闄愬埗鍦烘櫙 */
+export enum EnumGetStandardOrdersQueryScene {
+ /**棰勭害璁㈠崟 */
+ Appointment = 10,
+ /**鏀粯璁㈠崟 */
+ Pay = 20,
+ /**缁撶畻璁㈠崟 */
+ Settlement = 30,
+}
+
/** 鎶曚繚渚涘簲鍟嗚处鍙� */
export enum EnumInsuranceSupplierAccess {
/**浜鸿祫鍥� */
@@ -597,6 +607,16 @@
Cancelled = 30,
}
+/** 鏍囧噯璁㈠崟閫�娆剧姸鎬� */
+export enum EnumStandardOrderRefundStatus {
+ /**寰呴��娆� */
+ Wait = 10,
+ /**宸查��娆� */
+ Completed = 20,
+ /**閫�娆惧け璐� */
+ Fail = 30,
+}
+
/** 鏍囧噯璁㈠崟缁撶畻鐘舵�� */
export enum EnumStandardOrderSettlementStatus {
/**寰呯粨绠� */
@@ -825,6 +845,8 @@
export enum EnumUserWalletTransactionType {
/**鏀粯 */
Payment = 1,
+ /**閫�娆� */
+ Refund = 2,
/**鏀跺叆 */
Income = 10,
/**鎻愮幇 */
diff --git a/src/constants/enterprise.ts b/src/constants/enterprise.ts
index a29d83b..3db066d 100644
--- a/src/constants/enterprise.ts
+++ b/src/constants/enterprise.ts
@@ -121,6 +121,11 @@
false: '鏈疄鍚�',
true: '宸插疄鍚�',
};
+
+export const IsRealTextForPartA = {
+ false: '涓汉',
+ true: '浼佷笟',
+};
export const IsConfiguredText = {
false: '鏈厤缃�',
true: '宸查厤缃�',
diff --git a/src/constants/standardOrder.ts b/src/constants/standardOrder.ts
index dc6ae04..80fdb9b 100644
--- a/src/constants/standardOrder.ts
+++ b/src/constants/standardOrder.ts
@@ -2,3 +2,27 @@
[EnumStandardServiceReleaseStatus.InProcess]: '鍙戝竷涓�',
[EnumStandardServiceReleaseStatus.Stopped]: '宸插仠姝�',
};
+
+export const EnumStandardOrderAppointmentStatusText = {
+ [EnumStandardOrderAppointmentStatus.WaitSure]: '寰呯‘璁�',
+ [EnumStandardOrderAppointmentStatus.WaitServe]: '寰呮湇鍔�',
+ [EnumStandardOrderAppointmentStatus.Completed]: '宸插畬鎴�',
+ [EnumStandardOrderAppointmentStatus.Cancelled]: '宸插彇娑�',
+};
+
+export const EnumStandardOrderPayStatusText = {
+ [EnumStandardOrderPayStatus.Wait]: '寰呮敮浠�',
+ [EnumStandardOrderPayStatus.Completed]: '宸叉敮浠�',
+ [EnumStandardOrderPayStatus.Cancelled]: '宸插彇娑�',
+};
+
+export const EnumStandardOrderSettlementStatusText = {
+ [EnumStandardOrderSettlementStatus.Wait]: '寰呯粨绠�',
+ [EnumStandardOrderSettlementStatus.Completed]: '宸插畬鎴�',
+};
+
+export const EnumGetStandardOrdersQuerySceneText = {
+ [EnumGetStandardOrdersQueryScene.Appointment]: '棰勭害璁㈠崟',
+ [EnumGetStandardOrdersQueryScene.Pay]: '鏀粯璁㈠崟',
+ [EnumGetStandardOrdersQueryScene.Settlement]: '缁撶畻璁㈠崟',
+};
diff --git a/src/hooks/enterprise.ts b/src/hooks/enterprise.ts
index dae6c1f..fbd1886 100644
--- a/src/hooks/enterprise.ts
+++ b/src/hooks/enterprise.ts
@@ -1,17 +1,21 @@
-import { useTableV2 } from '@bole-core/components';
+import { useTableV2, useTable } from '@bole-core/components';
import * as enterpriseServices from '@/services/api/enterprise';
+import { ModelValueType } from 'element-plus';
+import { format } from '@/utils';
-type UseGetEnterprisesOptions = {};
+type UseGetEnterprisesOptions = {
+ type?: MaybeRef<EnumEnterpriseType>;
+};
-export function useGetEnterprises() {
+export function useGetEnterprises(options: UseGetEnterprisesOptions) {
+ const { type } = options;
const {
getDataSource: getList,
proTableProps,
paginationState,
extraParamState,
reset,
- isInitialLoading,
- } = useTableV2(
+ } = useTable(
async ({ pageIndex, pageSize, isInitialLoading }, extraParamState) => {
try {
let params: API.GetEnterprisesQuery = {
@@ -22,6 +26,9 @@
},
isConfigured: extraParamState.isConfigured,
keywords: extraParamState.keywords,
+ createdTimeBegin: format(extraParamState.createdTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ createdTimeEnd: format(extraParamState.createdTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ type: unref(type),
};
let res = await enterpriseServices.getEnterprises(params, {
@@ -35,14 +42,19 @@
{
defaultExtraParams: {
keywords: '',
+ createdTime: [] as unknown as ModelValueType,
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
isConfigured: '' as any as boolean,
},
- queryKey: ['enterpriseServices/getEnterprises'],
+ queryKey: ['enterpriseServices/getEnterprises', type],
columnsRenderProps: {
- isReal: { type: 'enum', valueEnum: IsRealText },
+ isReal: {
+ type: 'enum',
+ valueEnum: unref(type) === EnumEnterpriseType.PartyA ? IsRealTextForPartA : IsRealText,
+ },
isConfigured: { type: 'enum', valueEnum: IsConfiguredText },
type: { type: 'enum', valueEnum: EnumEnterpriseTypeText },
+ createdTime: { type: 'date', format: 'YYYY-MM-DD hh:mm:ss' },
serviceFeeRate: {
formatter: (row: API.GetEnterprisesQueryResultItem) =>
row.serviceFeeRate ? `${row.serviceFeeRate}%` : '',
@@ -57,6 +69,5 @@
paginationState,
extraParamState,
reset,
- isInitialLoading,
};
}
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index c4b5954..74abc28 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -14,12 +14,12 @@
import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
import * as taskCheckReceive from './taskCheckReceive';
+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 standardOrder from './standardOrder';
import * as eventUtils from './eventUtils';
import * as enterpriseCooperationWallet from './enterpriseCooperationWallet';
import * as insuranceProduct from './insuranceProduct';
@@ -45,12 +45,12 @@
logRecords,
dictionary,
taskCheckReceive,
+ standardOrder,
standardService,
userResume,
auth,
taskUser,
enterpriseInsuranceProduct,
- standardOrder,
eventUtils,
enterpriseCooperationWallet,
insuranceProduct,
diff --git a/src/services/api/standardOrder.ts b/src/services/api/standardOrder.ts
index 04b9b57..e71a5e6 100644
--- a/src/services/api/standardOrder.ts
+++ b/src/services/api/standardOrder.ts
@@ -17,7 +17,7 @@
});
}
-/** 鏍囧噯璁㈠崟鍙栨秷 POST /api/flexjob/standardOrder/cancelStandardOrderAppointment */
+/** 鏍囧噯璁㈠崟鍙栨秷棰勭害 POST /api/flexjob/standardOrder/cancelStandardOrderAppointment */
export async function cancelStandardOrderAppointment(
body: API.CancelStandardOrderAppointmentCommand,
options?: API.RequestConfig
@@ -32,6 +32,42 @@
});
}
+/** 鏍囧噯璁㈠崟鏍￠獙鏀粯缁撴灉 POST /api/flexjob/standardOrder/checkPayStandardOrder */
+export async function checkPayStandardOrder(
+ body: API.CheckPayStandardOrderCommand,
+ options?: API.RequestConfig
+) {
+ return request<API.CheckPayStandardOrderCommandResult>(
+ '/api/flexjob/standardOrder/checkPayStandardOrder',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏍囧噯璁㈠崟鏍￠獙閫�娆剧粨鏋� POST /api/flexjob/standardOrder/checkRefundStandardOrder */
+export async function checkRefundStandardOrder(
+ body: API.CheckRefundStandardOrderCommand,
+ options?: API.RequestConfig
+) {
+ return request<API.CheckRefundStandardOrderCommandResult>(
+ '/api/flexjob/standardOrder/checkRefundStandardOrder',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ鏍囧噯璁㈠崟璇︽儏 GET /api/flexjob/standardOrder/getStandardOrder */
export async function getStandardOrder(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
@@ -47,42 +83,6 @@
});
}
-/** 鏌ヨ鏍囧噯璁㈠崟棰勭害鍒嗛〉鍒楄〃 POST /api/flexjob/standardOrder/getStandardOrderAppointments */
-export async function getStandardOrderAppointments(
- body: API.GetStandardOrderAppointmentsQuery,
- options?: API.RequestConfig
-) {
- return request<API.GetStandardOrderAppointmentsQueryResult>(
- '/api/flexjob/standardOrder/getStandardOrderAppointments',
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- }
- );
-}
-
-/** 鏌ヨ鏍囧噯璁㈠崟鏀粯鍒嗛〉鍒楄〃 POST /api/flexjob/standardOrder/getStandardOrderPays */
-export async function getStandardOrderPays(
- body: API.GetStandardOrderPaysQuery,
- options?: API.RequestConfig
-) {
- return request<API.GetStandardOrderPaysQueryResult>(
- '/api/flexjob/standardOrder/getStandardOrderPays',
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- }
- );
-}
-
/** 鏌ヨ鏍囧噯璁㈠崟鍒嗛〉鍒楄〃 POST /api/flexjob/standardOrder/getStandardOrders */
export async function getStandardOrders(
body: API.GetStandardOrdersQuery,
@@ -98,60 +98,6 @@
});
}
-/** 鏌ヨ鏍囧噯璁㈠崟鏈嶅姟浜哄憳鍒嗛〉鍒楄〃 POST /api/flexjob/standardOrder/getStandardOrderServers */
-export async function getStandardOrderServers(
- body: API.GetStandardOrderServersQuery,
- options?: API.RequestConfig
-) {
- return request<API.GetStandardOrderServersQueryResult>(
- '/api/flexjob/standardOrder/getStandardOrderServers',
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- }
- );
-}
-
-/** 鏌ヨ鏍囧噯璁㈠崟缁撶畻鍒嗛〉鍒楄〃 POST /api/flexjob/standardOrder/getStandardOrderSettlements */
-export async function getStandardOrderSettlements(
- body: API.GetStandardOrderSettlementsQuery,
- options?: API.RequestConfig
-) {
- return request<API.GetStandardOrderSettlementsQueryResult>(
- '/api/flexjob/standardOrder/getStandardOrderSettlements',
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- }
- );
-}
-
-/** 鏌ヨ鏍囧噯璁㈠崟渚涘簲鍟嗗垎椤靛垪琛� POST /api/flexjob/standardOrder/getStandardOrderSupplierEnterprises */
-export async function getStandardOrderSupplierEnterprises(
- body: API.GetStandardOrderSupplierEnterprisesQuery,
- options?: API.RequestConfig
-) {
- return request<API.GetStandardOrderSupplierEnterprisesQueryResult>(
- '/api/flexjob/standardOrder/getStandardOrderSupplierEnterprises',
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- }
- );
-}
-
/** 鏍囧噯璁㈠崟鏀粯 POST /api/flexjob/standardOrder/payStandardOrder */
export async function payStandardOrder(
body: API.PayStandardOrderCommand,
diff --git a/src/services/api/standardService.ts b/src/services/api/standardService.ts
index 337c5f4..132122c 100644
--- a/src/services/api/standardService.ts
+++ b/src/services/api/standardService.ts
@@ -17,6 +17,60 @@
});
}
+/** 鏌ヨ鏍囧噯璁㈠崟鏈嶅姟璇︽儏 GET /api/flexjob/standardService/getOpenStandardService */
+export async function getOpenStandardService(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetOpenStandardServiceParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetStandardServiceQueryResult>(
+ '/api/flexjob/standardService/getOpenStandardService',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ寮�鏀炬爣鍑嗚鍗曟湇鍔″垎椤靛垪琛� POST /api/flexjob/standardService/getOpenStandardServiceList */
+export async function getOpenStandardServiceList(
+ body: API.GetOpenStandardServiceListQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetStandardServicesQueryResultItem[]>(
+ '/api/flexjob/standardService/getOpenStandardServiceList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ寮�鏀炬爣鍑嗚鍗曟湇鍔″垎椤靛垪琛� POST /api/flexjob/standardService/getOpenStandardServices */
+export async function getOpenStandardServices(
+ body: API.GetOpenStandardServicesQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetStandardServicesQueryResult>(
+ '/api/flexjob/standardService/getOpenStandardServices',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ鏍囧噯璁㈠崟鏈嶅姟璇︽儏 GET /api/flexjob/standardService/getStandardService */
export async function getStandardService(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
@@ -71,6 +125,42 @@
);
}
+/** 鏌ヨ鏍囧噯璁㈠崟鏈嶅姟浜哄憳鍒嗛〉鍒楄〃 POST /api/flexjob/standardService/getStandardServiceServers */
+export async function getStandardServiceServers(
+ body: API.GetStandardServiceServersQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetStandardServiceServersQueryResult>(
+ '/api/flexjob/standardService/getStandardServiceServers',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ鏍囧噯璁㈠崟鏈嶅姟渚涘簲鍟嗗垎椤靛垪琛� POST /api/flexjob/standardService/getStandardServiceSupplierEnterprises */
+export async function getStandardServiceSupplierEnterprises(
+ body: API.GetStandardServiceSupplierEnterprisesQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetStandardServiceSupplierEnterprisesQueryResult>(
+ '/api/flexjob/standardService/getStandardServiceSupplierEnterprises',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 淇濆瓨鏍囧噯璁㈠崟鏈嶅姟 POST /api/flexjob/standardService/saveStandardService */
export async function saveStandardService(
body: API.SaveStandardServiceCommand,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 8815df5..5fa6e13 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -314,6 +314,11 @@
roleId?: string;
}
+ interface APIgetOpenStandardServiceParams {
+ /** Id */
+ id?: string;
+ }
+
interface APIgetPartyAEnterpriseParams {
/** 鍚堜綔Id */
id?: string;
@@ -718,6 +723,19 @@
operatorToken?: string;
}
+ interface CheckPayStandardOrderCommand {
+ /** 璁㈠崟Id */
+ id?: string;
+ }
+
+ interface CheckPayStandardOrderCommandResult {
+ payStatus?: EnumStandardOrderPayStatus;
+ /** 鏀粯鏃堕棿 */
+ payTime?: string;
+ /** 鏀粯瀹屾垚鏃堕棿 */
+ payCompletedTime?: string;
+ }
+
interface CheckReceiveTaskCommand {
/** 鎻愪氦Id */
id?: string;
@@ -741,6 +759,26 @@
checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
}
+ interface CheckRefundStandardOrderCommand {
+ /** 璁㈠崟Id锛堜簩閫変竴锛� */
+ id?: string;
+ /** 閫�娆句氦鏄撶紪鍙凤紙浜岄�変竴锛� */
+ refundCode?: string;
+ }
+
+ interface CheckRefundStandardOrderCommandResult {
+ payStatus?: EnumStandardOrderPayStatus;
+ /** 鏀粯鏃堕棿 */
+ payTime?: string;
+ /** 鏀粯瀹屾垚鏃堕棿 */
+ payCompletedTime?: string;
+ refundStatus?: EnumStandardOrderRefundStatus;
+ /** 閫�娆炬椂闂� */
+ refundTime?: string;
+ /** 閫�娆惧畬鎴愭椂闂� */
+ refundCompletedTime?: string;
+ }
+
type ChooseWxmpPhoneNumberCommand = Record<string, any>;
type ClearTaskCollectCommand = Record<string, any>;
@@ -1198,6 +1236,15 @@
Pass = 30,
}
+ enum EnumGetStandardOrdersQueryScene {
+ /**棰勭害璁㈠崟 */
+ Appointment = 10,
+ /**鏀粯璁㈠崟 */
+ Pay = 20,
+ /**缁撶畻璁㈠崟 */
+ Settlement = 30,
+ }
+
enum EnumInsuranceSupplierAccess {
/**浜鸿祫鍥� */
WaterDropCloud = 10,
@@ -1471,6 +1518,15 @@
Cancelled = 30,
}
+ enum EnumStandardOrderRefundStatus {
+ /**寰呴��娆� */
+ Wait = 10,
+ /**宸查��娆� */
+ Completed = 20,
+ /**閫�娆惧け璐� */
+ Fail = 30,
+ }
+
enum EnumStandardOrderSettlementStatus {
/**寰呯粨绠� */
Wait = 10,
@@ -1674,6 +1730,8 @@
enum EnumUserWalletTransactionType {
/**鏀粯 */
Payment = 1,
+ /**閫�娆� */
+ Refund = 2,
/**鏀跺叆 */
Income = 10,
/**鎻愮幇 */
@@ -2004,6 +2062,42 @@
timestamp?: number;
}
+ interface FriendlyResultCheckPayStandardOrderCommandResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: CheckPayStandardOrderCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultCheckRefundStandardOrderCommandResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: CheckRefundStandardOrderCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultEnterpriseUserElectronSignCommandResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3265,42 +3359,6 @@
timestamp?: number;
}
- interface FriendlyResultGetStandardOrderAppointmentsQueryResult {
- /** 璺熻釜Id */
- traceId?: string;
- /** 鐘舵�佺爜 */
- code?: number;
- /** 閿欒鐮� */
- errorCode?: string;
- data?: GetStandardOrderAppointmentsQueryResult;
- /** 鎵ц鎴愬姛 */
- success?: boolean;
- /** 閿欒淇℃伅 */
- msg?: any;
- /** 闄勫姞鏁版嵁 */
- extras?: any;
- /** 鏃堕棿鎴� */
- timestamp?: number;
- }
-
- interface FriendlyResultGetStandardOrderPaysQueryResult {
- /** 璺熻釜Id */
- traceId?: string;
- /** 鐘舵�佺爜 */
- code?: number;
- /** 閿欒鐮� */
- errorCode?: string;
- data?: GetStandardOrderPaysQueryResult;
- /** 鎵ц鎴愬姛 */
- success?: boolean;
- /** 閿欒淇℃伅 */
- msg?: any;
- /** 闄勫姞鏁版嵁 */
- extras?: any;
- /** 鏃堕棿鎴� */
- timestamp?: number;
- }
-
interface FriendlyResultGetStandardOrderQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3319,42 +3377,6 @@
timestamp?: number;
}
- interface FriendlyResultGetStandardOrderServersQueryResult {
- /** 璺熻釜Id */
- traceId?: string;
- /** 鐘舵�佺爜 */
- code?: number;
- /** 閿欒鐮� */
- errorCode?: string;
- data?: GetStandardOrderServersQueryResult;
- /** 鎵ц鎴愬姛 */
- success?: boolean;
- /** 閿欒淇℃伅 */
- msg?: any;
- /** 闄勫姞鏁版嵁 */
- extras?: any;
- /** 鏃堕棿鎴� */
- timestamp?: number;
- }
-
- interface FriendlyResultGetStandardOrderSettlementsQueryResult {
- /** 璺熻釜Id */
- traceId?: string;
- /** 鐘舵�佺爜 */
- code?: number;
- /** 閿欒鐮� */
- errorCode?: string;
- data?: GetStandardOrderSettlementsQueryResult;
- /** 鎵ц鎴愬姛 */
- success?: boolean;
- /** 閿欒淇℃伅 */
- msg?: any;
- /** 闄勫姞鏁版嵁 */
- extras?: any;
- /** 鏃堕棿鎴� */
- timestamp?: number;
- }
-
interface FriendlyResultGetStandardOrdersQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3373,24 +3395,6 @@
timestamp?: number;
}
- interface FriendlyResultGetStandardOrderSupplierEnterprisesQueryResult {
- /** 璺熻釜Id */
- traceId?: string;
- /** 鐘舵�佺爜 */
- code?: number;
- /** 閿欒鐮� */
- errorCode?: string;
- data?: GetStandardOrderSupplierEnterprisesQueryResult;
- /** 鎵ц鎴愬姛 */
- success?: boolean;
- /** 閿欒淇℃伅 */
- msg?: any;
- /** 闄勫姞鏁版嵁 */
- extras?: any;
- /** 鏃堕棿鎴� */
- timestamp?: number;
- }
-
interface FriendlyResultGetStandardServiceCommentsQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3427,6 +3431,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetStandardServiceServersQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetStandardServiceServersQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetStandardServicesQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3445,6 +3467,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetStandardServiceSupplierEnterprisesQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetStandardServiceSupplierEnterprisesQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetTaskEnterpriseQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -4033,6 +4073,25 @@
timestamp?: number;
}
+ interface FriendlyResultListGetStandardServicesQueryResultItem {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: GetStandardServicesQueryResultItem[];
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultListGetUserInfoRolesQueryResultItem {
/** 璺熻釜Id */
traceId?: string;
@@ -6610,6 +6669,37 @@
remark?: string;
}
+ interface GetOpenStandardServiceListQuery {
+ /** 鍏抽敭瀛楋紙鏈嶅姟鍚�/Id锛� */
+ keywords?: string;
+ /** 宀椾綅缂栧彿 */
+ jobCode?: string;
+ /** 鍒涘缓鏃堕棿-璧峰 */
+ createdTimeBegin?: string;
+ /** 鍒涘缓鏃堕棿-鎴 */
+ createdTimeEnd?: string;
+ releaseStatus?: EnumStandardServiceReleaseStatus;
+ recommendStatus?: EnumStandardServiceRecommendStatus;
+ /** 鏄惁鏀惰棌 */
+ isCollected?: boolean;
+ }
+
+ interface GetOpenStandardServicesQuery {
+ /** 鍏抽敭瀛楋紙鏈嶅姟鍚�/Id锛� */
+ keywords?: string;
+ /** 宀椾綅缂栧彿 */
+ jobCode?: string;
+ /** 鍒涘缓鏃堕棿-璧峰 */
+ createdTimeBegin?: string;
+ /** 鍒涘缓鏃堕棿-鎴 */
+ createdTimeEnd?: string;
+ releaseStatus?: EnumStandardServiceReleaseStatus;
+ recommendStatus?: EnumStandardServiceRecommendStatus;
+ /** 鏄惁鏀惰棌 */
+ isCollected?: boolean;
+ pageModel?: PagedListQueryPageModel;
+ }
+
interface GetOpenTaskInfosQuery {
/** 鍏抽敭瀛楋紙浠诲姟鍚嶇О锛� */
keywords?: string;
@@ -7860,68 +7950,6 @@
signName?: string;
}
- interface GetStandardOrderAppointmentsQuery {
- appointmentStatus?: EnumStandardOrderAppointmentStatus;
- pageModel?: PagedListQueryPageModel;
- }
-
- interface GetStandardOrderAppointmentsQueryResult {
- pageModel?: PagedListQueryResultPageModel;
- /** 鏁版嵁 */
- data?: GetStandardOrderAppointmentsQueryResultItem[];
- }
-
- interface GetStandardOrderAppointmentsQueryResultItem {
- /** 璁㈠崟Id */
- id?: string;
- /** 鏈嶅姟鍚嶇О */
- serviceName?: string;
- /** 瀹炰粯閲戦 */
- payAmount?: number;
- /** 鏈嶅姟璧峰鏃堕棿 */
- beginTime?: string;
- /** 鏈嶅姟鎴鏃堕棿 */
- endTime?: string;
- /** 鏈嶅姟鍦板潃锛堢渷甯傚尯+璇︾粏鍦板潃+闂ㄧ墝鍙凤級 */
- addressDetail?: string;
- /** 鏈嶅姟鏈烘瀯 */
- supplierEnterpriseName?: string;
- /** 鏈嶅姟浜哄憳 */
- serverNames?: string[];
- appointmentStatus?: EnumStandardOrderAppointmentStatus;
- }
-
- interface GetStandardOrderPaysQuery {
- payStatus?: EnumStandardOrderPayStatus;
- pageModel?: PagedListQueryPageModel;
- }
-
- interface GetStandardOrderPaysQueryResult {
- pageModel?: PagedListQueryResultPageModel;
- /** 鏁版嵁 */
- data?: GetStandardOrderPaysQueryResultItem[];
- }
-
- interface GetStandardOrderPaysQueryResultItem {
- /** 璁㈠崟Id */
- id?: string;
- /** 鏈嶅姟鍚嶇О */
- serviceName?: string;
- /** 瀹炰粯閲戦 */
- payAmount?: number;
- /** 鏈嶅姟璧峰鏃堕棿 */
- beginTime?: string;
- /** 鏈嶅姟鎴鏃堕棿 */
- endTime?: string;
- /** 鏈嶅姟鍦板潃锛堢渷甯傚尯+璇︾粏鍦板潃+闂ㄧ墝鍙凤級 */
- addressDetail?: string;
- /** 鏈嶅姟鏈烘瀯 */
- supplierEnterpriseName?: string;
- /** 鏈嶅姟浜哄憳 */
- serverNames?: string[];
- payStatus?: EnumStandardOrderPayStatus;
- }
-
interface GetStandardOrderQueryResult {
/** 璁㈠崟Id */
id?: string;
@@ -7929,6 +7957,18 @@
serviceId?: string;
/** 鏈嶅姟鍚� */
serviceName?: string;
+ /** 鏈嶅姟鍗曞彿 */
+ serviceCode?: string;
+ /** 鏈嶅姟鍥剧墖 */
+ serviceFile?: string;
+ /** 涓嬪崟鐢ㄦ埛Id */
+ createdUserId?: string;
+ /** 涓嬪崟鐢ㄦ埛 */
+ createdUserName?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ createdUserContactPhoneNumber?: string;
+ /** 涓嬪崟鏃堕棿 */
+ createdTime?: string;
/** 鐢叉柟浼佷笟Id */
partyAEnterpriseId?: string;
/** 鐢叉柟浼佷笟 */
@@ -7975,12 +8015,8 @@
supplierEnterpriseId?: string;
/** 渚涘簲鍟� */
supplierEnterpriseName?: string;
- /** 鏈嶅姟浜哄憳Id */
- serverId?: string;
- /** 鏈嶅姟浜哄憳濮撳悕 */
- serverName?: string;
- /** 鏈嶅姟浜哄憳鑱旂郴鐢佃瘽 */
- serverContactPhoneNumber?: string;
+ /** 鏈嶅姟浜哄憳 */
+ servers?: GetStandardOrderQueryResultServer[];
/** 澶囨敞 */
remark?: string;
payAccess?: EnumUserBankCardAccess;
@@ -7994,6 +8030,8 @@
payAmount?: number;
/** 鏀粯鏃堕棿 */
payTime?: string;
+ /** 鏀粯瀹屾垚鏃堕棿 */
+ payCompletedTime?: string;
settlementStatus?: EnumStandardOrderSettlementStatus;
serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
/** 鏈嶅姟璐� */
@@ -8004,99 +8042,17 @@
settlementAmount?: number;
}
- interface GetStandardOrderServersQuery {
- /** 璁㈠崟Id */
- orderId?: string;
- pageModel?: PagedListQueryPageModel;
- }
-
- interface GetStandardOrderServersQueryResult {
- pageModel?: PagedListQueryResultPageModel;
- /** 鏁版嵁 */
- data?: GetStandardOrderServersQueryResultItem[];
- }
-
- interface GetStandardOrderServersQueryResultItem {
+ interface GetStandardOrderQueryResultServer {
/** Id */
id?: string;
- /** 澶村儚 */
- avatar?: string;
/** 濮撳悕 */
name?: string;
- gender?: EnumUserGender;
- /** 鏄惁瀹炲悕 */
- isReal?: boolean;
- realMethod?: EnumUserRealMethod;
- /** 骞撮緞 */
- age?: number;
- /** 韬唤缂栧彿 */
- personalIdentityCode?: string;
- /** 韬唤 */
- personalIdentityContent?: string;
- /** 瀛﹀巻缂栧彿 */
- educationalBackgroundCode?: string;
- /** 瀛﹀巻 */
- educationalBackgroundContent?: string;
- /** 涓婂矖娆℃暟 */
- taskCount?: number;
- /** 宸ヤ綔璧勫巻 */
- workSeniority?: string;
- /** 宸ヤ綔缁忛獙 */
- workExperience?: string;
- }
-
- interface GetStandardOrderSettlementsQuery {
- /** 鍏抽敭瀛楋紙璁㈠崟鍙�/鏈嶅姟鍚�/渚涘簲鍟嗭級 */
- keywords?: string;
- settlementStatus?: EnumStandardOrderSettlementStatus;
- pageModel?: PagedListQueryPageModel;
- }
-
- interface GetStandardOrderSettlementsQueryResult {
- pageModel?: PagedListQueryResultPageModel;
- /** 鏁版嵁 */
- data?: GetStandardOrderSettlementsQueryResultItem[];
- }
-
- interface GetStandardOrderSettlementsQueryResultItem {
- /** 璁㈠崟Id */
- id?: string;
- /** 璁㈠崟鍙� */
- code?: string;
- /** 鏈嶅姟鍚嶇О */
- serviceName?: string;
- /** 鏈嶅姟鍗曞彿 */
- serviceCode?: string;
- /** 鐢叉柟浼佷笟Id */
- partyAEnterpriseId?: string;
- /** 鐢叉柟浼佷笟 */
- partyAEnterpriseName?: string;
- /** 鏈嶅姟鍦板潃锛堢渷甯傚尯+璇︾粏鍦板潃+闂ㄧ墝鍙凤級 */
- addressDetail?: string;
- /** 鏈嶅姟鏈烘瀯 */
- supplierEnterpriseName?: string;
- /** 鏈嶅姟浜哄憳 */
- serverNames?: string[];
- /** 瀹炰粯閲戦 */
- payAmount?: number;
- /** 瀹炴敹閲戦 */
- receiveAmount?: number;
- /** 鏈嶅姟璐� */
- serviceFee?: number;
- /** 缁撶畻閲戦 */
- settlementAmount?: number;
- /** 缁撶畻鍗曞彿 */
- settlementCode?: string;
- settlementStatus?: EnumStandardOrderSettlementStatus;
- /** 缁撶畻鏃堕棿 */
- settlementTime?: string;
- /** 鏈嶅姟璧峰鏃堕棿 */
- beginTime?: string;
- /** 鏈嶅姟鎴鏃堕棿 */
- endTime?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
}
interface GetStandardOrdersQuery {
+ scene?: EnumGetStandardOrdersQueryScene;
/** 鍏抽敭瀛楋紙璁㈠崟鍙�/鏈嶅姟鍚嶏級 */
keywords?: string;
/** 涓嬪崟鏃堕棿-璧峰 */
@@ -8109,6 +8065,7 @@
payTimeEnd?: string;
appointmentStatus?: EnumStandardOrderAppointmentStatus;
payStatus?: EnumStandardOrderPayStatus;
+ settlementStatus?: EnumStandardOrderSettlementStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -8127,56 +8084,46 @@
serviceName?: string;
/** 鏈嶅姟鍗曞彿 */
serviceCode?: string;
+ /** 鏈嶅姟鍥剧墖 */
+ serviceFile?: string;
+ /** 涓嬪崟鐢ㄦ埛Id */
+ createdUserId?: string;
+ /** 涓嬪崟鐢ㄦ埛 */
+ createdUserName?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ createdUserContactPhoneNumber?: string;
/** 涓嬪崟鏃堕棿 */
createdTime?: string;
- /** 鏀粯鏃堕棿 */
- payTime?: string;
appointmentStatus?: EnumStandardOrderAppointmentStatus;
- payStatus?: EnumStandardOrderPayStatus;
- settlementStatus?: EnumStandardOrderSettlementStatus;
/** 鐢叉柟浼佷笟Id */
partyAEnterpriseId?: string;
/** 鐢叉柟浼佷笟 */
partyAEnterpriseName?: string;
- /** 鑱旂郴鐢佃瘽 */
- contactPhoneNumber?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 渚涘簲鍟� */
+ supplierEnterpriseName?: string;
+ /** 渚涘簲鍟嗚仈绯荤數璇� */
+ supplierContactPhoneNumber?: string;
+ payStatus?: EnumStandardOrderPayStatus;
+ /** 鏀粯瀹屾垚鏃堕棿 */
+ payCompletedTime?: string;
/** 瀹炰粯閲戦 */
payAmount?: number;
/** 瀹炴敹閲戦 */
receiveAmount?: number;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
/** 鏈嶅姟璐� */
serviceFee?: number;
+ settlementStatus?: EnumStandardOrderSettlementStatus;
+ /** 缁撶畻鍗曞彿 */
+ settlementCode?: string;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
/** 缁撶畻閲戦 */
settlementAmount?: number;
}
- interface GetStandardOrderSupplierEnterprisesQuery {
- /** 璁㈠崟Id */
- orderId?: string;
- pageModel?: PagedListQueryPageModel;
- }
-
- interface GetStandardOrderSupplierEnterprisesQueryResult {
- pageModel?: PagedListQueryResultPageModel;
- /** 鏁版嵁 */
- data?: GetStandardOrderSupplierEnterprisesQueryResultItem[];
- }
-
- interface GetStandardOrderSupplierEnterprisesQueryResultItem {
- /** Id */
- id?: string;
- /** 澶村儚 */
- avatar?: string;
- /** 浼佷笟鍏ㄧО */
- enterpriseName?: string;
- /** 鏈嶅姟浜哄憳 */
- serverCount?: number;
- /** 鏈嶅姟浜烘 */
- serviceCount?: number;
- /** 缁忚惀鑼冨洿 */
- mainBusiness?: string;
- }
-
interface GetStandardServiceCommentsQuery {
pageModel?: PagedListQueryPageModel;
}
@@ -8261,6 +8208,51 @@
cityContent?: string;
}
+ interface GetStandardServiceServersQuery {
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 鏈嶅姟璧峰鏃堕棿 */
+ beginTime?: string;
+ /** 鏈嶅姟鎴鏃堕棿 */
+ endTime?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetStandardServiceServersQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetStandardServiceServersQueryResultItem[];
+ }
+
+ interface GetStandardServiceServersQueryResultItem {
+ /** Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 濮撳悕 */
+ name?: string;
+ gender?: EnumUserGender;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
+ /** 骞撮緞 */
+ age?: number;
+ /** 韬唤缂栧彿 */
+ personalIdentityCode?: string;
+ /** 韬唤 */
+ personalIdentityContent?: string;
+ /** 瀛﹀巻缂栧彿 */
+ educationalBackgroundCode?: string;
+ /** 瀛﹀巻 */
+ educationalBackgroundContent?: string;
+ /** 涓婂矖娆℃暟 */
+ taskCount?: number;
+ /** 宸ヤ綔璧勫巻 */
+ workSeniority?: string;
+ /** 宸ヤ綔缁忛獙 */
+ workExperience?: string;
+ }
+
interface GetStandardServicesQuery {
/** 鍏抽敭瀛楋紙鏈嶅姟鍚�/Id锛� */
keywords?: string;
@@ -8290,6 +8282,8 @@
file?: string;
/** 琛屼笟绫诲埆 */
industryCategoryContent?: string;
+ /** 宀椾綅缂栧彿 */
+ jobCode?: string;
/** 宀椾綅 */
jobContent?: string;
/** 鏈嶅姟鍚� */
@@ -8302,12 +8296,41 @@
recommendStatus?: EnumStandardServiceRecommendStatus;
/** 鏄惁鏀惰棌 */
isCollection?: boolean;
+ /** 鏀惰棌鏃堕棿 */
+ collectionTime?: string;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
/** 渚涘簲鍟嗘暟閲� */
supplierCount?: number;
}
+ interface GetStandardServiceSupplierEnterprisesQuery {
+ /** 鏈嶅姟Id */
+ serviceId?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetStandardServiceSupplierEnterprisesQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetStandardServiceSupplierEnterprisesQueryResultItem[];
+ }
+
+ interface GetStandardServiceSupplierEnterprisesQueryResultItem {
+ /** Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 鏈嶅姟浜哄憳 */
+ serverCount?: number;
+ /** 鏈嶅姟浜烘 */
+ serviceCount?: number;
+ /** 缁忚惀鑼冨洿 */
+ mainBusiness?: string;
+ }
+
type GetSupplierEnterpriseSelectQuery = Record<string, any>;
interface GetSupplierEnterpriseSelectQueryOption {
@@ -11426,6 +11449,36 @@
reject_reason: string;
}
+ interface WeChatPayTransactionsJsApiNotifyCommand {
+ /** 閫氱煡ID锛屽洖璋冮�氱煡鐨勫敮涓�缂栧彿 */
+ id?: string;
+ /** 閫氱煡鍒涘缓鏃堕棿
+1銆佸畾涔夛細鏈鍥炶皟閫氱煡鍒涘缓鐨勬椂闂�
+2銆佹牸寮忥細閬靛惊rfc3339鏍囧噯鏍煎紡锛歽yyy-MM-DDTHH:mm:ss+TIMEZONE锛堢ず渚嬶細2015-05-20T13:29:35+08:00 琛ㄧず鍖椾含鏃堕棿2015骞�5鏈�20鏃�13鐐�29鍒�35绉掞級 */
+ create_time?: string;
+ /** 閫氱煡鐨勭被鍨嬶紝寰俊鏀粯鍥炶皟閫氱煡鐨勭被鍨�
+鏀粯鎴愬姛閫氱煡鐨勭被鍨嬩负TRANSACTION.SUCCESS */
+ event_type?: string;
+ /** 閫氱煡鏁版嵁绫诲瀷锛岄�氱煡鐨勮祫婧愭暟鎹被鍨嬶紝鍥哄畾涓篹ncrypt-resource */
+ resource_type?: string;
+ resource?: WeChatPayTransactionsJsApiNotifyCommandResource;
+ /** 鍥炶皟鎽樿锛屽井淇℃敮浠樺鍥炶皟鍐呭鐨勬憳瑕佸娉� */
+ summary?: string;
+ }
+
+ interface WeChatPayTransactionsJsApiNotifyCommandResource {
+ /** 鍔犲瘑绠楁硶绫诲瀷锛屽洖璋冩暟鎹瘑鏂囩殑鍔犲瘑绠楁硶绫诲瀷锛岀洰鍓嶄负AEAD_AES_256_GCM锛屽紑鍙戣�呴渶瑕佷娇鐢ㄥ悓鏍风被鍨嬬殑鏁版嵁杩涜瑙ｅ瘑 */
+ algorithm?: string;
+ /** 鏁版嵁瀵嗘枃锛孊ase64缂栫爜鍚庣殑鍥炶皟鏁版嵁瀵嗘枃锛屾湇鍔″晢闇�Base64瑙ｇ爜骞朵娇鐢ˋPIV3瀵嗛挜瑙ｅ瘑锛屽叿浣撳弬鑰冨浣曡В瀵嗚瘉涔﹀拰鍥炶皟鎶ユ枃 */
+ ciphertext?: string;
+ /** 闄勫姞鏁版嵁锛屽弬涓庤В瀵嗙殑闄勫姞鏁版嵁锛岃瀛楁鍙兘涓虹┖ */
+ associated_data?: string;
+ /** 鍘熷鍥炶皟绫诲瀷锛屽姞瀵嗗墠鐨勫璞＄被鍨嬶紝涓簍ransaction */
+ original_type?: string;
+ /** 闅忔満涓诧紝鍙備笌瑙ｅ瘑鐨勯殢鏈轰覆 */
+ nonce?: string;
+ }
+
interface WxmpLoginCommand {
/** 鐢ㄦ埛鐧诲綍鍑瘉 */
code: string;
diff --git a/src/services/api/userWallet.ts b/src/services/api/userWallet.ts
index 6443e40..d945ac1 100644
--- a/src/services/api/userWallet.ts
+++ b/src/services/api/userWallet.ts
@@ -16,3 +16,18 @@
...(options || {}),
});
}
+
+/** 寰俊JS鏀粯閫氱煡 POST /api/user/userWallet/weChatPayTransactionsJsApiNotify */
+export async function weChatPayTransactionsJsApiNotify(
+ body: API.WeChatPayTransactionsJsApiNotifyCommand,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/userWallet/weChatPayTransactionsJsApiNotify', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue
index 1de4e4c..6da17ba 100644
--- a/src/views/EnterpriseManage/EnterpriseManageList.vue
+++ b/src/views/EnterpriseManage/EnterpriseManageList.vue
@@ -1,5 +1,5 @@
<template>
- <LoadingLayout :loading="isInitialLoading">
+ <LoadingLayout :loading="state.loading">
<AppContainer>
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
@@ -58,6 +58,7 @@
import { Message } from '@bole-core/core';
import * as enterpriseServices from '@/services/api/enterprise';
import WechatWalletOpen from './components/WechatWalletOpen.vue';
+import { stat } from 'fs';
defineOptions({
name: 'EnterpriseManageList',
@@ -84,8 +85,16 @@
});
const router = useRouter();
-const { getList, proTableProps, paginationState, extraParamState, reset, isInitialLoading } =
- useGetEnterprises();
+
+const BaseState = {
+ loading: true,
+};
+
+const state = reactive({ ...BaseState });
+
+const { getList, proTableProps, paginationState, extraParamState, reset } = useGetEnterprises({
+ type: EnumEnterpriseType.Supplier,
+});
function openDialog(row?: API.GetEnterprisesQueryResultItem) {
handleEdit({
@@ -133,4 +142,9 @@
function handleDetail(row: API.GetEnterprisesQueryResultItem) {
router.push({ name: 'EnterpriseDetail', params: { id: row?.id ?? '' } });
}
+onMounted(() => {
+ state.loading = true;
+ getList();
+ state.loading = false;
+});
</script>
diff --git a/src/views/OperationManage/components/AddOrEditAdvertisementDialog.vue b/src/views/OperationManage/components/AddOrEditAdvertisementDialog.vue
index cac2bcb..cf7bdbc 100644
--- a/src/views/OperationManage/components/AddOrEditAdvertisementDialog.vue
+++ b/src/views/OperationManage/components/AddOrEditAdvertisementDialog.vue
@@ -32,7 +32,11 @@
prop="file"
:check-rules="[{ type: 'array', message: '璇烽�夋嫨骞垮憡鍥剧墖' }]"
>
- <ProFormImageUpload v-model:file-url="form.file" :limitFileCount="1"></ProFormImageUpload>
+ <ProFormImageUpload
+ v-model:file-url="form.file"
+ :limit-file-size="10"
+ :limitFileCount="1"
+ ></ProFormImageUpload>
</ProFormItemV2>
<ProFormItemV2
label="骞垮憡鏃ユ湡:"
diff --git a/src/views/StandardOrderManage/OrderManage.vue b/src/views/StandardOrderManage/OrderManage.vue
index fdd770d..12a9627 100644
--- a/src/views/StandardOrderManage/OrderManage.vue
+++ b/src/views/StandardOrderManage/OrderManage.vue
@@ -5,21 +5,23 @@
<template #query>
<QueryFilterItem tip-content="棰勭害鐘舵��">
<FieldSelect
- v-model="extraParamState.releaseStatus"
- :value-enum="EnumTaskReleaseStatusText"
+ v-model="extraParamState.appointmentStatus"
+ :value-enum="EnumStandardOrderAppointmentStatusText"
@change="getList()"
+ clearable
/>
</QueryFilterItem>
<QueryFilterItem tip-content="璁㈠崟鐘舵��">
<FieldSelect
- v-model="extraParamState.releaseStatus"
- :value-enum="EnumTaskReleaseStatusText"
+ v-model="extraParamState.payStatus"
+ :value-enum="EnumStandardOrderPayStatusText"
@change="getList()"
+ clearable
/>
</QueryFilterItem>
<QueryFilterItem tip-content="涓嬪崟鏃堕棿">
<FieldDatePicker
- v-model="extraParamState.time"
+ v-model="extraParamState.createdTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
@@ -30,7 +32,7 @@
</QueryFilterItem>
<QueryFilterItem tip-content="鏀粯鏃堕棿">
<FieldDatePicker
- v-model="extraParamState.time"
+ v-model="extraParamState.payTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
@@ -71,17 +73,20 @@
} from '@bole-core/components';
import { useAccess } from '@/hooks';
import { ModelValueType } from 'element-plus';
-import * as taskServices from '@/services/api/task';
-import { EnumTaskReleaseStatusText } from '@/constants';
+import * as standardOrderServices from '@/services/api/standardOrder';
+import {
+ EnumStandardOrderAppointmentStatusText,
+ EnumStandardOrderPayStatusText,
+ EnumStandardOrderSettlementStatusText,
+} from '@/constants';
import { format } from '@/utils';
-import { Message } from '@bole-core/core';
defineOptions({
name: 'OrderManage',
});
const operationBtnMap: Record<string, OperationBtnType> = {
- detailBtn: { emits: { onClick: (row: API.GetTaskInfosQueryResultItem) => goDetail(row) } },
+ detailBtn: { emits: { onClick: (row: API.GetStandardOrdersQueryResultItem) => goDetail(row) } },
};
const { checkSubModuleItemShow, column, operationBtns } = useAccess({
@@ -109,19 +114,21 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetTaskInfosQuery = {
+ let params: API.GetStandardOrdersQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
keywords: extraParamState.keywords,
- releaseStatus: extraParamState.releaseStatus,
- recommendStatus: extraParamState.recommendStatus,
- beginTime: format(extraParamState.time?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- endTime: format(extraParamState.time?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ 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 taskServices.getTaskInfos(params, {
+ let res = await standardOrderServices.getStandardOrders(params, {
showLoading: !state.loading,
});
return res;
@@ -130,36 +137,27 @@
{
defaultExtraParams: {
keywords: '',
- releaseStatus: '' as any as EnumTaskReleaseStatus,
- recommendStatus: '' as any as EnumTaskRecommendStatus,
- time: [] as unknown as ModelValueType,
- orderInput: [{ property: 'createdTime', order: EnumPagedListOrder.Desc }],
+ 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: {},
+ 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 },
+ },
}
);
-async function setTaskInfoRecommendStatus(row: API.GetTaskInfosQueryResultItem) {
- try {
- await Message.tipMessage(
- `纭瑕�${row.recommendStatus === EnumTaskRecommendStatus.Yes ? '鍙栨秷' : '鎺ㄨ崘'}鍚楋紵`
- );
- let params: API.SetTaskInfoRecommendStatusCommand = {
- ids: [row.id],
- recommendStatus:
- row.recommendStatus === EnumTaskRecommendStatus.Yes
- ? EnumTaskRecommendStatus.No
- : EnumTaskRecommendStatus.Yes,
- };
- let res = await taskServices.setTaskInfoRecommendStatus(params);
- if (res) {
- Message.successMessage('鎿嶄綔鎴愬姛');
- getList(paginationState.pageIndex);
- }
- } catch (error) {}
-}
-
-function goDetail(row?: API.GetEnterprisesQueryResultItem) {
+function goDetail(row?: API.GetStandardOrdersQueryResultItem) {
router.push({ name: 'OrderManageDetail', params: { id: row?.id ?? '' } });
}
</script>
diff --git a/src/views/StandardOrderManage/OrderManageDetail.vue b/src/views/StandardOrderManage/OrderManageDetail.vue
index 4bf37c1..c21de49 100644
--- a/src/views/StandardOrderManage/OrderManageDetail.vue
+++ b/src/views/StandardOrderManage/OrderManageDetail.vue
@@ -3,68 +3,104 @@
<AppScrollContainer>
<ChunkCell title="鐘舵��">
<ProForm :model="form" ref="formRef" label-width="120px" :is-read="true">
- <ProFormItemV2 label="棰勭害鐘舵��:" prop="cooperationStatus">
- <ProFormRadio v-model="form.access" :value-enum="EnumWalletTransactionStatusText" />
+ <ProFormItemV2 label="棰勭害鐘舵��:" prop="appointmentStatus">
+ <ProFormRadio
+ v-model="form.appointmentStatus"
+ :value-enum="EnumStandardOrderAppointmentStatusText"
+ />
</ProFormItemV2>
- <ProFormItemV2 label="璁㈠崟鐘舵��:" prop="cooperationStatus">
- <ProFormRadio v-model="form.access" :value-enum="EnumWalletTransactionStatusText" />
+ <ProFormItemV2 label="璁㈠崟鐘舵��:" prop="payStatus">
+ <ProFormRadio v-model="form.payStatus" :value-enum="EnumStandardOrderPayStatusText" />
</ProFormItemV2>
- <ProFormItemV2 label="缁撶畻鐘舵��:" prop="cooperationStatus">
- <ProFormRadio v-model="form.access" :value-enum="EnumWalletTransactionStatusText" />
+ <ProFormItemV2 label="缁撶畻鐘舵��:" prop="settlementStatus">
+ <ProFormRadio
+ v-model="form.settlementStatus"
+ :value-enum="EnumStandardOrderSettlementStatusText"
+ />
</ProFormItemV2>
</ProForm>
</ChunkCell>
<ChunkCell title="璁㈠崟淇℃伅">
<ProForm :model="form" ref="formRef" label-width="120px" :is-read="true">
- <ProFormItemV2 label="鏈嶅姟鍗曞彿:" prop="cooperationStatus">
- <ProFormText v-model.trim="form.access" />
+ <ProFormItemV2 label="鏈嶅姟鍗曞彿:" prop="serviceCode">
+ <ProFormText v-model.trim="form.serviceCode" />
</ProFormItemV2>
- <ProFormItemV2 label="涓嬪崟鐢ㄦ埛:" prop="cooperationStatus">
- <ProFormText v-model.trim="form.access" />
+ <ProFormItemV2 label="涓嬪崟鐢ㄦ埛:" prop="createdUserName">
+ <ProFormText v-model.trim="form.createdUserName" />
</ProFormItemV2>
- <ProFormItemV2 label="鏈嶅姟鏃堕棿:" prop="cooperationStatus">
+ <ProFormItemV2 label="鏈嶅姟鏃堕棿:" prop="time">
<ProFormDatePicker
- v-model="form.access"
+ v-model="form.time"
type="date"
- value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨鏃ユ湡"
></ProFormDatePicker>
</ProFormItemV2>
- <ProFormItemV2 label="鏈嶅姟鍦板潃:" prop="cooperationStatus">
- <ProFormText v-model.trim="form.access" />
+ <ProFormItemV2 label="鏈嶅姟鍦板潃:" prop="address">
+ <ProFormText v-model.trim="form.address" />
</ProFormItemV2>
- <ProFormItemV2 label="鏈嶅姟鏈烘瀯:" prop="cooperationStatus">
- <ProFormText v-model.trim="form.access" />
+ <ProFormItemV2 label="鏈嶅姟鏈烘瀯:" prop="supplierEnterpriseName">
+ <ProFormText v-model.trim="form.supplierEnterpriseName" />
</ProFormItemV2>
- <ProFormItemV2 label="鏈嶅姟浜哄憳:" prop="cooperationStatus">
- <ProFormText v-model.trim="form.access" />
+ <ProFormItemV2 label="鏈嶅姟浜哄憳:" prop="servers">
+ <ProFormText v-model.trim="form.servers" />
</ProFormItemV2>
- <ProFormItemV2 label="澶囨敞:" prop="cooperationStatus">
- <ProFormText v-model.trim="form.access" />
+ <ProFormItemV2 label="澶囨敞:" prop="remark">
+ <ProFormText v-model.trim="form.remark" />
</ProFormItemV2>
- <ProFormItemV2 label="瀹炰粯娆�:" prop="invoiceTaxPointRate">
- <ProFormInputNumber v-model="form.balance" :controls="false" :min="0" :precision="2" />
+ <ProFormItemV2 label="鏈嶅姟:" prop="remark">
+ <ProTableV2
+ v-bind="proTableProps"
+ :columns="column"
+ :show-operation-column="false"
+ :auto-height="false"
+ :table-props="{
+ height: '185px',
+ }"
+ :show-pagination="false"
+ >
+ <template #serviceName="{ row }">
+ <div class="service-name-wrapper">
+ <img class="service-name-img" :src="setOSSLink(row.serviceFile)" alt="" />
+ <div class="service-name-text">{{ row.serviceName }}</div>
+ </div>
+ </template>
+ </ProTableV2>
</ProFormItemV2>
- <ProFormItemV2 label="瀹炴敹娆�:" prop="cooperationStatus">
- <ProFormInputNumber v-model="form.balance" :controls="false" :min="0" :precision="2" />
+
+ <ProFormItemV2 label="瀹炰粯娆�:" prop="payAmount">
+ <ProFormInputNumber
+ v-model="form.payAmount"
+ :controls="false"
+ :min="0"
+ :precision="2"
+ />
</ProFormItemV2>
- <ProFormItemV2 label="鏈嶅姟璐�:" prop="cooperationStatus">
- <ProFormInputNumber v-model="form.balance" :controls="false" :min="0" :precision="2" />
+ <ProFormItemV2 label="瀹炴敹娆�:" prop="receiveAmount">
+ <ProFormInputNumber
+ v-model="form.receiveAmount"
+ :controls="false"
+ :min="0"
+ :precision="2"
+ />
</ProFormItemV2>
- <ProFormItemV2 label="缁撶畻娆�:" prop="cooperationStatus">
- <ProFormInputNumber v-model="form.balance" :controls="false" :min="0" :precision="2" />
+ <ProFormItemV2 label="鏈嶅姟璐�:" prop="serviceFee">
+ <ProFormInputNumber
+ v-model="form.serviceFee"
+ :controls="false"
+ :min="0"
+ :precision="2"
+ />
+ </ProFormItemV2>
+ <ProFormItemV2 label="缁撶畻娆�:" prop="settlementAmount">
+ <ProFormInputNumber
+ v-model="form.settlementAmount"
+ :controls="false"
+ :min="0"
+ :precision="2"
+ />
</ProFormItemV2>
</ProForm>
- <ProTableV2
- v-bind="proTableProps"
- :columns="column"
- :show-operation-column="false"
- :auto-height="false"
- :table-props="{
- height: '400px',
- }"
- >
- </ProTableV2>
</ChunkCell>
</AppScrollContainer>
</LoadingLayout>
@@ -83,23 +119,53 @@
useTable,
ProTableV2,
} from '@bole-core/components';
-import { EnumWalletTransactionStatusText } from '@/constants';
-import * as userServices from '@/services/api/user';
-import { format, setOSSLink } from '@/utils';
+import {
+ EnumStandardOrderAppointmentStatusText,
+ EnumStandardOrderPayStatusText,
+ EnumStandardOrderSettlementStatusText,
+} from '@/constants';
+import * as standardOrderServices from '@/services/api/standardOrder';
+import { format, paginateList, setOSSLink } from '@/utils';
+import { useQuery } from '@tanstack/vue-query';
+import { ModelValueType } from 'element-plus';
defineOptions({
name: 'OrderManageDetail',
});
+type ServiceItem = {
+ serviceName: string;
+ serviceFile: string;
+ specName: string;
+ specNumber: number;
+ specPrice: number;
+ payAmount: number;
+};
+
const { column, operationBtns } = useAccess({});
const route = useRoute();
const id = (route.params.id as string) ?? '';
const form = reactive({
- identity: '',
- access: '' as any as EnumEnterpriseWalletAccess,
- balance: 0,
+ appointmentStatus: '' as any as EnumStandardOrderAppointmentStatus,
+ payStatus: '' as any as EnumStandardOrderPayStatus,
+ settlementStatus: '' as any as EnumStandardOrderSettlementStatus,
+ serviceCode: '',
+ createdUserName: '',
+ time: [] as unknown as ModelValueType,
+ address: '',
+ supplierEnterpriseName: '',
+ serviceName: '',
+ servers: '',
+ remark: '',
+
+ payAmount: 0,
+ receiveAmount: 0,
+ serviceFee: 0,
+ settlementAmount: 0,
+
+ serviceItems: [] as ServiceItem[],
});
const BaseState = {
@@ -108,75 +174,98 @@
const state = reactive({ ...BaseState });
+const { isLoading } = useQuery({
+ queryKey: ['standardOrderServices/getStandardOrder', id],
+ queryFn: async () => {
+ return await standardOrderServices.getStandardOrder(
+ { id: id },
+ {
+ showLoading: false,
+ }
+ );
+ },
+ placeholderData: () => ({} as API.GetStandardOrderQueryResult),
+ onSuccess(data) {
+ form.appointmentStatus = data.appointmentStatus;
+ form.payStatus = data.payStatus;
+ form.settlementStatus = data.settlementStatus;
+ 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.serviceName = data.serviceName;
+ form.supplierEnterpriseName = data.supplierEnterpriseName;
+ form.servers = data.servers?.length ? data.servers.map((x) => x.name).join(',') : '';
+ form.remark = data.remark;
+ form.payAmount = data.payAmount;
+ form.receiveAmount = data.receiveAmount;
+ form.serviceFee = data.serviceFee;
+ form.settlementAmount = data.settlementAmount;
+
+ form.serviceItems = [
+ {
+ serviceName: data.serviceName,
+ serviceFile: data.serviceFile,
+ specName: data.specName,
+ specNumber: data.specNumber,
+ specPrice: data.specPrice,
+ payAmount: data.payAmount,
+ },
+ ];
+ getList();
+ },
+ enabled: computed(() => !!id),
+});
+
const {
getDataSource: getList,
proTableProps,
paginationState,
extraParamState,
- reset,
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetPersonalUserTransactionsQuery = {
+ let list = [...form.serviceItems];
+ return Promise.resolve({
pageModel: {
rows: pageSize,
page: pageIndex,
- orderInput: extraParamState.orderInput,
+ totalCount: list.length,
},
- enterpriseWalletId: id,
- };
- let res = await userServices.getPersonalUserTransactions(params);
- if (res.objectData?.enterpriseWallet) {
- form.identity = res.objectData.enterpriseWallet.identity;
- form.access = res.objectData.enterpriseWallet.access;
- form.balance = res.objectData.enterpriseWallet.balance;
- }
- return res;
- } catch (error) {}
+ data: paginateList(list, pageIndex, pageSize),
+ });
+ } catch (error) {
+ console.log('error: ', error);
+ }
},
{
defaultExtraParams: {
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
columnsRenderProps: {
- transDate: { type: 'date' },
- sendTime: { type: 'date' },
- amount: { type: 'money' },
- transactionStatus: { type: 'enum', valueEnum: EnumWalletTransactionStatusText },
- ereceiptDownloadOssUrl: {
- type: 'url',
- formatter: (row: API.GetPersonalUserTransactionsQueryResultItem) =>
- row.ereceiptDownloadOssUrl ? setOSSLink(row.ereceiptDownloadOssUrl) : '',
- },
+ specPrice: { type: 'money' },
+ payAmount: { type: 'money' },
},
}
);
onMounted(() => {
state.loading = false;
- getList();
});
</script>
<style lang="scss" scoped>
@use '@/style/common.scss' as *;
-.step-wrapper {
- margin: 0 auto;
- padding: 24px 0;
-}
+.service-name-wrapper {
+ display: flex;
+ align-items: center;
-.settlement-user-list-chunk {
- :deep() {
- .no-data img {
- width: 280px;
- }
+ .service-name-img {
+ margin-right: 10px;
+ width: 120px;
+ height: 120px;
+ object-fit: cover;
}
}
</style>
-<style lang="scss">
-.text-over-tooltip-content {
- max-width: 600px;
- word-break: break-all;
-}
-</style>
diff --git a/src/views/StandardOrderManage/components/AddOrEditServicesManageView.vue b/src/views/StandardOrderManage/components/AddOrEditServicesManageView.vue
index 1493a58..5f38d28 100644
--- a/src/views/StandardOrderManage/components/AddOrEditServicesManageView.vue
+++ b/src/views/StandardOrderManage/components/AddOrEditServicesManageView.vue
@@ -249,7 +249,9 @@
operationBtnMap,
});
-const { proTableProps: enterpriseProTableProps } = useGetEnterprises();
+const { getList: getSuppliers, proTableProps: enterpriseProTableProps } = useGetEnterprises({
+ type: EnumEnterpriseType.Supplier,
+});
const form = reactive({
id: '',
@@ -459,6 +461,10 @@
name: 'ServicesManage',
});
}
+
+onMounted(async () => {
+ await getSuppliers();
+});
</script>
<style lang="scss" scoped>
diff --git a/src/views/StandardOrderManage/components/AddSupplierDialog.vue b/src/views/StandardOrderManage/components/AddSupplierDialog.vue
index b4a0f57..9cf4588 100644
--- a/src/views/StandardOrderManage/components/AddSupplierDialog.vue
+++ b/src/views/StandardOrderManage/components/AddSupplierDialog.vue
@@ -136,6 +136,7 @@
() => visible.value,
async (value) => {
if (value) {
+ await getSuppliers();
tableList.value = enterpriseProTableProps.value?.tableData.map((x) => ({
...x,
choose: form.value?.ids.includes(x.id),
@@ -145,7 +146,9 @@
}
);
-const { proTableProps: enterpriseProTableProps } = useGetEnterprises();
+const { getList: getSuppliers, proTableProps: enterpriseProTableProps } = useGetEnterprises({
+ type: EnumEnterpriseType.Supplier,
+});
const {
getDataSource: getList,
diff --git a/src/views/UserManage/UserManageList.vue b/src/views/UserManage/UserManageList.vue
index 68f07f2..d9574db 100644
--- a/src/views/UserManage/UserManageList.vue
+++ b/src/views/UserManage/UserManageList.vue
@@ -5,7 +5,7 @@
<template #query>
<QueryFilterItem tip-content="娉ㄥ唽鏃堕棿">
<FieldDatePicker
- v-model="extraParamState.time"
+ v-model="extraParamState.createdTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
@@ -40,14 +40,10 @@
LoadingLayout,
AppContainer,
QueryFilterItem,
- useTable,
FieldDatePicker,
} from '@bole-core/components';
import { useAccess } from '@/hooks';
-import { ModelValueType } from 'element-plus';
-import * as taskServices from '@/services/api/task';
-import { EnumTaskRecommendStatusText } from '@/constants';
-import { format } from '@/utils';
+import * as enterpriseServices from '@/services/api/enterprise';
import { Message } from '@bole-core/core';
defineOptions({
@@ -56,15 +52,15 @@
const operationBtnMap: Record<string, OperationBtnType> = {
enableBtn: {
- emits: { onClick: (row: API.GetTaskInfosQueryResultItem) => setTaskInfoRecommendStatus(row) },
+ emits: { onClick: (row: API.GetEnterprisesQueryResultItem) => disabledEnterprise(row) },
extraProps: {
- hide: (row) => row.recommendStatus === EnumTaskRecommendStatus.Yes,
+ hide: (row) => row.isDisabled,
},
},
disableBtn: {
- emits: { onClick: (row: API.GetTaskInfosQueryResultItem) => setTaskInfoRecommendStatus(row) },
+ emits: { onClick: (row: API.GetEnterprisesQueryResultItem) => disabledEnterprise(row) },
extraProps: {
- hide: (row) => row.recommendStatus === EnumTaskRecommendStatus.No,
+ hide: (row) => !row.isDisabled,
},
},
};
@@ -85,69 +81,22 @@
state.loading = false;
});
-const {
- getDataSource: getList,
- proTableProps,
- paginationState,
- extraParamState,
- reset,
-} = useTable(
- async ({ pageIndex, pageSize }, extraParamState) => {
- try {
- let params: API.GetTaskInfosQuery = {
- pageModel: {
- rows: pageSize,
- page: pageIndex,
- orderInput: extraParamState.orderInput,
- },
- keywords: extraParamState.keywords,
- releaseStatus: extraParamState.releaseStatus,
- recommendStatus: extraParamState.recommendStatus,
- beginTime: format(extraParamState.time?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- endTime: format(extraParamState.time?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
- };
- let res = await taskServices.getTaskInfos(params, {
- showLoading: !state.loading,
- });
- return res;
- } catch (error) {}
- },
- {
- defaultExtraParams: {
- keywords: '',
- releaseStatus: '' as any as EnumTaskReleaseStatus,
- recommendStatus: '' as any as EnumTaskRecommendStatus,
- time: [] as unknown as ModelValueType,
- orderInput: [{ property: 'createdTime', order: EnumPagedListOrder.Desc }],
- },
- columnsRenderProps: {
- endTime: { type: 'date', format: 'YYYY-MM-DD' },
- recommendStatus: { type: 'enum', valueEnum: EnumTaskRecommendStatusText },
- },
- }
-);
+const { getList, proTableProps, paginationState, extraParamState, reset } = useGetEnterprises({
+ type: EnumEnterpriseType.PartyA,
+});
-async function setTaskInfoRecommendStatus(row: API.GetTaskInfosQueryResultItem) {
+async function disabledEnterprise(row: API.GetEnterprisesQueryResultItem) {
try {
- await Message.tipMessage(
- `纭瑕�${row.recommendStatus === EnumTaskRecommendStatus.Yes ? '鍙栨秷' : '鎺ㄨ崘'}鍚楋紵`
- );
- let params: API.SetTaskInfoRecommendStatusCommand = {
+ await Message.tipMessage(`纭瑕�${row.isDisabled ? '鍚敤' : '绂佺敤'}鍚楋紵`);
+ let params: API.DisabledEnterpriseCommand = {
ids: [row.id],
- recommendStatus:
- row.recommendStatus === EnumTaskRecommendStatus.Yes
- ? EnumTaskRecommendStatus.No
- : EnumTaskRecommendStatus.Yes,
+ isDisabled: !row.isDisabled,
};
- let res = await taskServices.setTaskInfoRecommendStatus(params);
+ let res = await enterpriseServices.disabledEnterprise(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
getList(paginationState.pageIndex);
}
} catch (error) {}
}
-
-function goDetail(row) {
- router.push({ name: 'TaskManageDetail', params: { id: row?.id ?? '' } });
-}
</script>
--
Gitblit v1.10.0