From 41bedb2dfa045b6cfa03b69d295c09b0b5a8d8bb Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 02 十二月 2025 15:01:00 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.3.0.4
---
.eslintrc-auto-import.json | 1
src/services/api/typings.d.ts | 39 +++++--------------
auto-imports.d.ts | 3 -
src/constants/apiEnum.ts | 18 +--------
src/services/api/syncDatabase.ts | 15 -------
5 files changed, 13 insertions(+), 63 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index fcc3f08..1b8274b 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -145,7 +145,6 @@
"EnumWeChatPayApplymentSubjectType": true,
"EnumWeChatPaySettlementModifyVerifyResult": true,
"EnumWeChatPaySettlementVerifyResult": true,
- "EnumWxmpSubscribMessageTemplate": true,
"ExtractDefaultPropTypes": true,
"ExtractPropTypes": true,
"ExtractPublicPropTypes": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index d0d8d4d..5b9f584 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -309,7 +309,7 @@
export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
import('vue')
// @ts-ignore
- export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, 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, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, 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, 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, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, 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 { 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, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, 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, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetSettlementTasksQuerySupplierPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, 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, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, 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, 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'
@@ -486,7 +486,6 @@
readonly EnumWeChatPayApplymentSubjectType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWeChatPayApplymentSubjectType']>
readonly EnumWeChatPaySettlementModifyVerifyResult: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWeChatPaySettlementModifyVerifyResult']>
readonly EnumWeChatPaySettlementVerifyResult: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWeChatPaySettlementVerifyResult']>
- readonly EnumWxmpSubscribMessageTemplate: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWxmpSubscribMessageTemplate']>
readonly FastButtonMap: UnwrapRef<typeof import('./src/constants/module')['FastButtonMap']>
readonly FastColumnList: UnwrapRef<typeof import('./src/constants/module')['FastColumnList']>
readonly FastDataButtonList: UnwrapRef<typeof import('./src/constants/module')['FastDataButtonList']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 586337d..3fc61b0 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -639,6 +639,8 @@
Pass = 20,
/**宸茶阿缁� */
Refuse = 30,
+ /**宸插彇娑� */
+ Cancel = 40,
}
/** 浠诲姟鐢ㄦ埛绛剧害鐘舵�� */
@@ -895,22 +897,6 @@
VERIFY_FAIL = 1,
/**楠岃瘉涓紝鍟嗘埛鍙彂璧锋彁鐜板皾璇� */
VERIFYING = 2,
-}
-
-/** 寰俊灏忕▼搴忚闃呮秷鎭ā鏉� */
-export enum EnumWxmpSubscribMessageTemplate {
- /**鏀粯鎴愬姛鎻愰啋 缁撶畻瀹屾垚鍚庡悜鎵挎徑绔鐞嗗憳鎺ㄩ�� */
- SettlementCompletedToSupplier = 0,
- /**鎶ラ叕缁撶畻瀹℃牳缁撴灉閫氱煡 鐢叉柟缁撶畻纭鍚庡悜鎵挎徑绔鐞嗗憳鎺ㄩ�� */
- SettlementAuditCompletedToSupplier = 1,
- /**宸ヨ祫鍙戞斁閫氱煡 缁撶畻瀹屾垚鍚庡悜C绔汉鍛橀�氱煡 */
- SettlementReceiveCompletedToUser = 2,
- /**鎶ュ悕褰曠敤缁撴灉閫氱煡 琚綍鐢ㄥ悗鍚慍绔汉鍛橀�氱煡 */
- HireCompletedToUser = 3,
- /**鎺掔彮鎴愬姛閫氱煡 鎺掔彮鍚庡悜C绔汉鍛橀�氱煡 */
- ArrangeCompletedToUser = 4,
- /**娴嬭瘯 */
- Test = 5,
}
/** 鎴戠殑鎶ュ悕鍒嗛〉鍒楄〃-鐘舵�� */
diff --git a/src/services/api/syncDatabase.ts b/src/services/api/syncDatabase.ts
index 2d526e7..b40e50d 100644
--- a/src/services/api/syncDatabase.ts
+++ b/src/services/api/syncDatabase.ts
@@ -2,21 +2,6 @@
// @ts-ignore
import { request } from '@/utils/request';
-/** 鍚屾鏁版嵁搴� POST /api/common/syncDatabase/sendWxmpSubscribMessage */
-export async function sendWxmpSubscribMessage(
- body: API.SendWxmpSubscribMessageCommand,
- options?: API.RequestConfig
-) {
- return request<boolean>('/api/common/syncDatabase/sendWxmpSubscribMessage', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- });
-}
-
/** 鍚屾鏁版嵁搴� POST /api/common/syncDatabase/syncDatabase */
export async function syncDatabase(body: API.SyncDatabaseCommand, options?: API.RequestConfig) {
return request<number>('/api/common/syncDatabase/syncDatabase', {
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 1dae424..b9f42a2 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -1364,6 +1364,8 @@
Pass = 20,
/**宸茶阿缁� */
Refuse = 30,
+ /**宸插彇娑� */
+ Cancel = 40,
}
enum EnumTaskUserSignContractStatus {
@@ -1599,21 +1601,6 @@
VERIFY_FAIL = 1,
/**楠岃瘉涓紝鍟嗘埛鍙彂璧锋彁鐜板皾璇� */
VERIFYING = 2,
- }
-
- enum EnumWxmpSubscribMessageTemplate {
- /**鏀粯鎴愬姛鎻愰啋 缁撶畻瀹屾垚鍚庡悜鎵挎徑绔鐞嗗憳鎺ㄩ�� */
- SettlementCompletedToSupplier = 0,
- /**鎶ラ叕缁撶畻瀹℃牳缁撴灉閫氱煡 鐢叉柟缁撶畻纭鍚庡悜鎵挎徑绔鐞嗗憳鎺ㄩ�� */
- SettlementAuditCompletedToSupplier = 1,
- /**宸ヨ祫鍙戞斁閫氱煡 缁撶畻瀹屾垚鍚庡悜C绔汉鍛橀�氱煡 */
- SettlementReceiveCompletedToUser = 2,
- /**鎶ュ悕褰曠敤缁撴灉閫氱煡 琚綍鐢ㄥ悗鍚慍绔汉鍛橀�氱煡 */
- HireCompletedToUser = 3,
- /**鎺掔彮鎴愬姛閫氱煡 鎺掔彮鍚庡悜C绔汉鍛橀�氱煡 */
- ArrangeCompletedToUser = 4,
- /**娴嬭瘯 */
- Test = 5,
}
interface ExportEnterpriseBalanceDetailsCommand {
@@ -4183,6 +4170,8 @@
/** 鏈�杩戦獙鏀舵椂闂� */
lastCheckReceiveTime?: string;
checkedStatus?: EnumGetCheckReceiveTasksQueryResultItemCheckStatus;
+ /** 浜哄憳鏁伴噺 */
+ arrangeUserCount?: number;
}
interface GetCheckReceiveTaskUserSubmitCheckHistoriesQuery {
@@ -6242,6 +6231,8 @@
type?: EnumUserWalletTransactionType;
/** 璁㈠崟鍙� */
code?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
/** 缁撶畻鏃ユ湡 */
@@ -6684,8 +6675,8 @@
auditStatus?: EnumTaskSettlementAuditStatus;
/** 鎿嶄綔浜� */
operator?: string;
- /** 鍒涘缓浜� */
- createdUser?: string;
+ /** 鍙戝崟浼佷笟鍚嶇О */
+ enterpriseName?: string;
}
interface GetSettlementTasksQueryResultObjectData {
@@ -8743,18 +8734,6 @@
phoneNumber: string;
}
- interface SendWxmpSubscribMessageCommand {
- /** 灏忕▼搴忕紪鍙� */
- wxmpCode: string;
- template: EnumWxmpSubscribMessageTemplate;
- /** 鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆 */
- page?: string;
- /** 鎺ユ敹鑰咃紙鐢ㄦ埛锛夌殑 openid */
- touser: string;
- /** 妯℃澘鍐呭锛屾牸寮忓舰濡倇 "phrase3": { "value": "瀹℃牳閫氳繃" }, "name1": { "value": "璁㈤槄" }, "date2": { "value": "2019-12-25 09:42" } } */
- data: any;
- }
-
interface SetDictionaryDataIsDisabledCommand {
ids?: string[];
/** 鏄惁宸茬鐢� */
@@ -8831,6 +8810,8 @@
/** 浠诲姟浜哄憳Id */
id?: string;
hireStatus?: EnumTaskUserHireStatus;
+ /** 褰曠敤澶囨敞 */
+ hireRemark?: string;
}
enum SettlementReceiveStatus {
--
Gitblit v1.9.1