From b6917f19d5f7410d39476984a4a1ea415457a7f7 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 13:53:49 +0800
Subject: [PATCH] feat: 1.2.0.1
---
src/services/api/task.ts | 15 ++
src/services/api/index.ts | 20 +-
src/services/api/taskCheckReceive.ts | 18 +++
.eslintrc-auto-import.json | 2
src/services/api/typings.d.ts | 170 +++++++++++++++++++++++++++
auto-imports.d.ts | 6
src/constants/apiEnum.ts | 26 ++++
src/services/api/user.ts | 45 +++++++
8 files changed, 286 insertions(+), 16 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index ef10708..d8fbbaa 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -97,6 +97,7 @@
"EnumTaskRecommendStatusText": true,
"EnumTaskReleaseStatus": true,
"EnumTaskReleaseStatusText": true,
+ "EnumTaskSettlementAuditStatus": true,
"EnumTaskSettlementOrderStatus": true,
"EnumTaskSettlementStatus": true,
"EnumTaskSettlementStatusText": true,
@@ -107,6 +108,7 @@
"EnumTaskUserHireStatusText": true,
"EnumTaskUserSignContractStatus": true,
"EnumTaskUserSignContractStatusText": true,
+ "EnumTaskUserSubmitCheckHistoryType": true,
"EnumTaskUserSubmitCheckReceiveStatus": true,
"EnumUserBankCardAccess": true,
"EnumUserGender": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 0e5562a..c111719 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -101,6 +101,7 @@
const EnumTaskRecommendStatusText: typeof import('./src/constants/task')['EnumTaskRecommendStatusText']
const EnumTaskReleaseStatus: typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']
const EnumTaskReleaseStatusText: typeof import('./src/constants/task')['EnumTaskReleaseStatusText']
+ const EnumTaskSettlementAuditStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementAuditStatus']
const EnumTaskSettlementOrderStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementOrderStatus']
const EnumTaskSettlementStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementStatus']
const EnumTaskSettlementStatusText: typeof import('./src/constants/task')['EnumTaskSettlementStatusText']
@@ -111,6 +112,7 @@
const EnumTaskUserHireStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserHireStatusText']
const EnumTaskUserSignContractStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserSignContractStatus']
const EnumTaskUserSignContractStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']
+ const EnumTaskUserSubmitCheckHistoryType: typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckHistoryType']
const EnumTaskUserSubmitCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']
const EnumUserBankCardAccess: typeof import('./src/constants/apiEnum')['EnumUserBankCardAccess']
const EnumUserGender: typeof import('./src/constants/apiEnum')['EnumUserGender']
@@ -311,7 +313,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, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
+ export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, 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, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, 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, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -449,6 +451,7 @@
readonly EnumTaskRecommendStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskRecommendStatusText']>
readonly EnumTaskReleaseStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']>
readonly EnumTaskReleaseStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskReleaseStatusText']>
+ readonly EnumTaskSettlementAuditStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementAuditStatus']>
readonly EnumTaskSettlementOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementOrderStatus']>
readonly EnumTaskSettlementStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementStatus']>
readonly EnumTaskSettlementStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskSettlementStatusText']>
@@ -459,6 +462,7 @@
readonly EnumTaskUserHireStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserHireStatusText']>
readonly EnumTaskUserSignContractStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSignContractStatus']>
readonly EnumTaskUserSignContractStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']>
+ readonly EnumTaskUserSubmitCheckHistoryType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckHistoryType']>
readonly EnumTaskUserSubmitCheckReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']>
readonly EnumUserBankCardAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserBankCardAccess']>
readonly EnumUserGender: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserGender']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index b901d56..3d11edb 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -485,6 +485,16 @@
Stopped = 100,
}
+/** 浠诲姟缁撶畻瀹℃牳鐘舵�� */
+export enum EnumTaskSettlementAuditStatus {
+ /**寰呭鏍� */
+ Wait = 10,
+ /**瀹℃牳閫氳繃 */
+ Pass = 20,
+ /**椹冲洖 */
+ Fail = 30,
+}
+
/** 浠诲姟缁撶畻鍗曠姸鎬� */
export enum EnumTaskSettlementOrderStatus {
/**寰呬笂浼� */
@@ -545,15 +555,27 @@
Stop = 50,
}
+/** 浠诲姟浜哄憳鎻愪氦淇℃伅绛惧埌璁板綍绫诲瀷 */
+export enum EnumTaskUserSubmitCheckHistoryType {
+ /**绛惧埌 */
+ CheckIn = 10,
+ /**绛惧嚭 */
+ CheckOut = 20,
+ /**鏈埌宀� */
+ UnCheckIn = 30,
+ /**鏈鍑� */
+ UnCheckOut = 40,
+}
+
/** 浠诲姟楠屾敹鐘舵�� */
export enum EnumTaskUserSubmitCheckReceiveStatus {
/**寰呮彁浜� */
WaitSubmit = 10,
- /**寰呴獙鏀�/鏈埌宀� */
+ /**寰呴獙鏀� */
WaitCheckReceive = 20,
/**楠屾敹閫氳繃/宸茬鍒� */
Success = 30,
- /**楠屾敹鏈�氳繃 */
+ /**楠屾敹鏈�氳繃/鏈埌宀� */
Fail = 40,
}
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index aa1fd08..e99bcae 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -5,11 +5,12 @@
import * as enterpriseEmployee from './enterpriseEmployee';
import * as user from './user';
import * as role from './role';
+import * as enterpriseWallet from './enterpriseWallet';
import * as ocrUtils from './ocrUtils';
import * as task from './task';
import * as enterprise from './enterprise';
+import * as logRecords from './logRecords';
import * as resource from './resource';
-import * as enterpriseWallet from './enterpriseWallet';
import * as dictionary from './dictionary';
import * as codeUrl from './codeUrl';
import * as electronSign from './electronSign';
@@ -18,21 +19,21 @@
import * as taskCheckReceive from './taskCheckReceive';
import * as taskUser from './taskUser';
import * as sms from './sms';
-import * as logRecords from './logRecords';
-import * as menu from './menu';
-import * as fileUtils from './fileUtils';
-import * as userWallet from './userWallet';
import * as settings from './settings';
+import * as menu from './menu';
+import * as userWallet from './userWallet';
+import * as fileUtils from './fileUtils';
import * as syncDatabase from './syncDatabase';
export default {
enterpriseEmployee,
user,
role,
+ enterpriseWallet,
ocrUtils,
task,
enterprise,
+ logRecords,
resource,
- enterpriseWallet,
dictionary,
codeUrl,
electronSign,
@@ -41,10 +42,9 @@
taskCheckReceive,
taskUser,
sms,
- logRecords,
- menu,
- fileUtils,
- userWallet,
settings,
+ menu,
+ userWallet,
+ fileUtils,
syncDatabase,
};
diff --git a/src/services/api/task.ts b/src/services/api/task.ts
index 0f797ab..84167b8 100644
--- a/src/services/api/task.ts
+++ b/src/services/api/task.ts
@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 瀹℃牳浠诲姟缁撶畻 POST /api/flexjob/task/auditTaskSettlement */
+export async function auditTaskSettlement(
+ body: API.AuditTaskSettlementCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/flexjob/task/auditTaskSettlement', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鍒犻櫎浠诲姟 DELETE /api/flexjob/task/deleteTaskInfo */
export async function deleteTaskInfo(body: API.DeleteTaskInfoCommand, options?: API.RequestConfig) {
return request<number>('/api/flexjob/task/deleteTaskInfo', {
diff --git a/src/services/api/taskCheckReceive.ts b/src/services/api/taskCheckReceive.ts
index 87c33b3..aaa88db 100644
--- a/src/services/api/taskCheckReceive.ts
+++ b/src/services/api/taskCheckReceive.ts
@@ -86,6 +86,24 @@
);
}
+/** 鏌ヨ楠屾敹浠诲姟璇︽儏-绛惧埌绛惧嚭璁板綍 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmitCheckHistories */
+export async function getCheckReceiveTaskUserSubmitCheckHistories(
+ body: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetCheckReceiveTaskUserSubmitCheckHistoriesQueryResult>(
+ '/api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmitCheckHistories',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ楠屾敹璇︽儏 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmits */
export async function getCheckReceiveTaskUserSubmits(
body: API.GetCheckReceiveTaskUserSubmitsQuery,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index f903ae2..f63e3b7 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -344,6 +344,16 @@
ids?: string[];
}
+ interface AuditTaskSettlementCommand {
+ /** 缁撶畻璁㈠崟Id */
+ id?: string;
+ auditStatus?: EnumTaskSettlementAuditStatus;
+ /** 瀹℃牳澶囨敞 */
+ auditRemark?: string;
+ /** 鎿嶄綔浠ょ墝 */
+ operatorToken?: string;
+ }
+
interface BaiduOcrBusinessLicenseResultModel {
/** 浼佷笟鍏ㄧО */
enterpriseName?: string;
@@ -397,6 +407,16 @@
sessionKey: string;
}
+ interface BuildOperatorTokenCommand {
+ /** 鎿嶄綔瀵嗙爜 */
+ password?: string;
+ }
+
+ interface BuildOperatorTokenCommandResult {
+ /** 鎿嶄綔浠ょ墝 */
+ operatorToken?: string;
+ }
+
interface ChangePhoneNumberCommand {
/** 鎵嬫満鍙风爜 */
phoneNumber: string;
@@ -416,9 +436,18 @@
type CheckHealthQuery = Record<string, any>;
+ interface CheckOperatorTokenCommand {
+ /** 鎿嶄綔浠ょ墝 */
+ operatorToken?: string;
+ }
+
interface CheckReceiveTaskCommand {
/** 鎻愪氦Id */
id?: string;
+ /** 绛惧埌鏃堕棿 */
+ checkInTime?: string;
+ /** 绛惧嚭鏃堕棿 */
+ checkOutTime?: string;
checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
}
@@ -494,6 +523,8 @@
interface EditTaskSettlementOrderRosterCommand {
/** 鍚嶅崟Id */
id?: string;
+ /** 绱宸ユ椂 */
+ totalWorkHours?: number;
/** 缁撶畻閲戦 */
settlementAmount: number;
/** 瀹炲彂閲戦 */
@@ -1015,6 +1046,15 @@
Stopped = 100,
}
+ enum EnumTaskSettlementAuditStatus {
+ /**寰呭鏍� */
+ Wait = 10,
+ /**瀹℃牳閫氳繃 */
+ Pass = 20,
+ /**椹冲洖 */
+ Fail = 30,
+ }
+
enum EnumTaskSettlementOrderStatus {
/**寰呬笂浼� */
Wait = 10,
@@ -1069,14 +1109,25 @@
Stop = 50,
}
+ enum EnumTaskUserSubmitCheckHistoryType {
+ /**绛惧埌 */
+ CheckIn = 10,
+ /**绛惧嚭 */
+ CheckOut = 20,
+ /**鏈埌宀� */
+ UnCheckIn = 30,
+ /**鏈鍑� */
+ UnCheckOut = 40,
+ }
+
enum EnumTaskUserSubmitCheckReceiveStatus {
/**寰呮彁浜� */
WaitSubmit = 10,
- /**寰呴獙鏀�/鏈埌宀� */
+ /**寰呴獙鏀� */
WaitCheckReceive = 20,
/**楠屾敹閫氳繃/宸茬鍒� */
Success = 30,
- /**楠屾敹鏈�氳繃 */
+ /**楠屾敹鏈�氳繃/鏈埌宀� */
Fail = 40,
}
@@ -1313,6 +1364,24 @@
timestamp?: number;
}
+ interface FriendlyResultBuildOperatorTokenCommandResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: BuildOperatorTokenCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultEnterpriseUserElectronSignCommandResult {
/** 璺熻釜Id */
traceId?: string;
@@ -1411,6 +1480,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetCheckReceiveTasksQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetCheckReceiveTaskUserSubmitCheckHistoriesQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetCheckReceiveTaskUserSubmitCheckHistoriesQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -3373,6 +3460,12 @@
/** 鏄惁瀹炲悕 */
isReal?: boolean;
realMethod?: EnumUserRealMethod;
+ /** 绛惧埌鏃堕棿 */
+ checkInTime?: string;
+ /** 绛惧嚭鏃堕棿 */
+ checkOutTime?: string;
+ /** 鎿嶄綔浜� */
+ operator?: string;
/** 鏈�杩戞彁浜ゆ椂闂� */
lastSubmitTime?: string;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
@@ -3462,6 +3555,45 @@
lastCheckReceiveTime?: string;
}
+ interface GetCheckReceiveTaskUserSubmitCheckHistoriesQuery {
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ /** 鏃ユ湡 */
+ date?: string;
+ type?: EnumTaskUserSubmitCheckHistoryType;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetCheckReceiveTaskUserSubmitCheckHistoriesQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetCheckReceiveTaskUserSubmitCheckHistoriesQueryResultItem[];
+ }
+
+ interface GetCheckReceiveTaskUserSubmitCheckHistoriesQueryResultItem {
+ /** 璁板綍Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
+ /** 绛惧埌绛惧嚭鏃堕棿 */
+ checkTime?: string;
+ /** 鎿嶄綔浜� */
+ operator?: string;
+ type?: EnumTaskUserSubmitCheckHistoryType;
+ }
+
interface GetCheckReceiveTaskUserSubmitQueryResult {
/** 鎻愪氦Id */
id?: string;
@@ -3495,6 +3627,12 @@
id?: string;
/** 楠屾敹鏃堕棿 */
date?: string;
+ /** 绛惧埌鏃堕棿 */
+ checkInTime?: string;
+ /** 绛惧嚭鏃堕棿 */
+ checkOutTime?: string;
+ /** 鎿嶄綔浜� */
+ operator?: string;
/** 鎻愪氦鏃堕棿 */
createdTime?: string;
/** 楠屾敹鐓х墖 */
@@ -5534,10 +5672,21 @@
interface GetSettlementTaskUsersQueryResultDetail {
/** 缁撶畻璁㈠崟Id */
id?: string;
+ /** 鏍￠獙楠屾敹璧峰鏃ユ湡 */
+ checkReceiveBeginDate?: string;
+ /** 鏍￠獙楠屾敹鎴鏃ユ湡 */
+ checkReceiveEndDate?: string;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟鍗曞彿 */
code?: string;
+ billingMethod?: EnumBillingMethod;
+ /** 鏈嶅姟璐� */
+ serviceFee?: number;
+ /** 鏍稿畾宸ユ椂 */
+ verifyWorkHours?: number;
+ /** 瓒呮椂鏈嶅姟璐� */
+ timeoutServiceFee?: number;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
/** 缁撶畻鍗曞悕绉� */
settlementOrderName?: string;
@@ -5557,6 +5706,8 @@
interface GetSettlementTaskUsersQueryResultItem {
/** 缁撶畻鍚嶅崟Id */
id?: string;
+ /** 浠诲姟浜哄憳Id */
+ taskInfoUserId?: string;
/** 鐢ㄦ埛淇℃伅Id */
userId?: string;
/** 濮撳悕 */
@@ -5565,6 +5716,8 @@
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
+ /** 绱宸ユ椂 */
+ totalWorkHours?: number;
/** 鎵�灞為摱琛� */
bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
@@ -6435,6 +6588,8 @@
bankBranch?: string;
/** 鏀舵璐︽埛 */
receiveAccount?: string;
+ /** 绱宸ユ椂 */
+ totalWorkHours?: number;
/** 缁撶畻閲戦 */
settlementAmount?: number;
/** 瀹炲彂閲戦 */
@@ -6705,6 +6860,13 @@
interface ResendResourceCommand {
/** 璧勬簮鏃ュ織Id */
id?: string;
+ }
+
+ interface ResetUserOperatorPasswordsCommand {
+ /** Id */
+ ids?: string[];
+ /** 鎿嶄綔瀵嗙爜 */
+ operatorPassword?: string;
}
interface ResetUserPasswordsCommand {
@@ -7121,8 +7283,10 @@
userName?: string;
/** 鎵嬫満鍙� */
phoneNumber?: string;
- /** 瀵嗙爜 */
+ /** 瀵嗙爜锛堥�夊～ 濉簡灏辨敼涓嶅～灏变笉鏀癸級 */
password?: string;
+ /** 鎿嶄綔瀵嗙爜锛堥�夊～ 濉簡灏辨敼涓嶅～灏变笉鏀癸級 */
+ operatorPassword?: string;
/** 瑙掕壊Id */
roleIds?: string[];
status?: EnumUserStatus;
diff --git a/src/services/api/user.ts b/src/services/api/user.ts
index e62b980..00b2379 100644
--- a/src/services/api/user.ts
+++ b/src/services/api/user.ts
@@ -2,6 +2,36 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鐢熸垚鎿嶄綔浠ょ墝 POST /api/user/user/buildOperatorToken */
+export async function buildOperatorToken(
+ body: API.BuildOperatorTokenCommand,
+ options?: API.RequestConfig
+) {
+ return request<API.BuildOperatorTokenCommandResult>('/api/user/user/buildOperatorToken', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 鏍￠獙鎿嶄綔浠ょ墝 POST /api/user/user/checkOperatorToken */
+export async function checkOperatorToken(
+ body: API.CheckOperatorTokenCommand,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/user/checkOperatorToken', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鍒犻櫎鐢ㄦ埛閾惰鍗′俊鎭� DELETE /api/user/user/deletePersonalUserBankCard */
export async function deletePersonalUserBankCard(
body: API.DeletePersonalUserBankCardCommand,
@@ -161,6 +191,21 @@
});
}
+/** 閲嶇疆鐢ㄦ埛鎿嶄綔瀵嗙爜 POST /api/user/user/resetUserOperatorPasswords */
+export async function resetUserOperatorPasswords(
+ body: API.ResetUserOperatorPasswordsCommand,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/user/user/resetUserOperatorPasswords', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 閲嶇疆鐢ㄦ埛瀵嗙爜 POST /api/user/user/resetUserPasswords */
export async function resetUserPasswords(
body: API.ResetUserPasswordsCommand,
--
Gitblit v1.9.1