From 17511a0d3d2635723c3d0e1c9da6db75996253d9 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 17 十月 2025 20:06:12 +0800
Subject: [PATCH] feat: 1.2.0.1
---
src/services/api/index.ts | 4
src/services/api/taskCheckReceive.ts | 18 ++++
src/constants/task.ts | 7 +
.eslintrc-auto-import.json | 2
src/services/api/typings.d.ts | 82 ++++++++++++++++++++
auto-imports.d.ts | 6 +
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 50 +++++++++--
src/constants/apiEnum.ts | 16 +++
8 files changed, 166 insertions(+), 19 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index e68d804..3415596 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -70,6 +70,7 @@
"EnumSmsAccess": true,
"EnumSmsStatus": true,
"EnumTaskCheckReceiveMethod": true,
+ "EnumTaskCheckReceiveMethodText": true,
"EnumTaskCheckReceiveStatus": true,
"EnumTaskCheckReceiveStatusText": true,
"EnumTaskCheckReceiveStatusTextForFilter": true,
@@ -92,6 +93,7 @@
"EnumTaskUserSignContractStatus": true,
"EnumTaskUserSignContractStatusText": true,
"EnumTaskUserSignContractStatusTextForFilter": true,
+ "EnumTaskUserSubmitCheckHistoryType": true,
"EnumTaskUserSubmitCheckReceiveStatus": true,
"EnumTaskUserSubmitCheckReceiveStatusText": true,
"EnumUserBankCardAccess": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 1e41f9f..b01b0c1 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -75,6 +75,7 @@
const EnumSmsStatus: typeof import('./src/constants/apiEnum')['EnumSmsStatus']
const EnumSmsTemplateType: typeof import('./src/constants/apiEnum')['EnumSmsTemplateType']
const EnumTaskCheckReceiveMethod: typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveMethod']
+ const EnumTaskCheckReceiveMethodText: typeof import('./src/constants/task')['EnumTaskCheckReceiveMethodText']
const EnumTaskCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveStatus']
const EnumTaskCheckReceiveStatusText: typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusText']
const EnumTaskCheckReceiveStatusTextForFilter: typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusTextForFilter']
@@ -97,6 +98,7 @@
const EnumTaskUserSignContractStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserSignContractStatus']
const EnumTaskUserSignContractStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']
const EnumTaskUserSignContractStatusTextForFilter: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusTextForFilter']
+ const EnumTaskUserSubmitCheckHistoryType: typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckHistoryType']
const EnumTaskUserSubmitCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']
const EnumTaskUserSubmitCheckReceiveStatusText: typeof import('./src/constants/task')['EnumTaskUserSubmitCheckReceiveStatusText']
const EnumUserBankCardAccess: typeof import('./src/constants/apiEnum')['EnumUserBankCardAccess']
@@ -279,7 +281,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, 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, 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 { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic'
@@ -381,6 +383,7 @@
readonly EnumSmsAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumSmsAccess']>
readonly EnumSmsStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumSmsStatus']>
readonly EnumTaskCheckReceiveMethod: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveMethod']>
+ readonly EnumTaskCheckReceiveMethodText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskCheckReceiveMethodText']>
readonly EnumTaskCheckReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveStatus']>
readonly EnumTaskCheckReceiveStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusText']>
readonly EnumTaskCheckReceiveStatusTextForFilter: UnwrapRef<typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusTextForFilter']>
@@ -403,6 +406,7 @@
readonly EnumTaskUserSignContractStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSignContractStatus']>
readonly EnumTaskUserSignContractStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']>
readonly EnumTaskUserSignContractStatusTextForFilter: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusTextForFilter']>
+ readonly EnumTaskUserSubmitCheckHistoryType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckHistoryType']>
readonly EnumTaskUserSubmitCheckReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']>
readonly EnumTaskUserSubmitCheckReceiveStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskUserSubmitCheckReceiveStatusText']>
readonly EnumUserBankCardAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserBankCardAccess']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index b901d56..330d7d5 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -545,15 +545,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/constants/task.ts b/src/constants/task.ts
index 4e94d14..02d025e 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -84,7 +84,7 @@
[EnumBillingMethod.Day]: '鎸夋棩',
[EnumBillingMethod.Hour]: '鎸夋椂',
[EnumBillingMethod.Piece]: '璁′欢',
- // [EnumBillingMethod.face]: '闈㈣',
+ [EnumBillingMethod.Face]: '闈㈣',
};
export const EnumBillingMethodUnitText = {
@@ -170,3 +170,8 @@
[EnumEnterpriseWalletAccess.PingAnPay]: '骞冲畨閾惰缁撶畻',
[EnumEnterpriseWalletAccess.WeChatPay]: '寰俊缁撶畻',
};
+
+export const EnumTaskCheckReceiveMethodText = {
+ [EnumTaskCheckReceiveMethod.CheckIn]: '浜哄伐绛惧埌',
+ [EnumTaskCheckReceiveMethod.Submit]: '鑷富鎻愪氦',
+};
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index aa1fd08..15a6047 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -13,9 +13,9 @@
import * as dictionary from './dictionary';
import * as codeUrl from './codeUrl';
import * as electronSign from './electronSign';
+import * as taskCheckReceive from './taskCheckReceive';
import * as userResume from './userResume';
import * as auth from './auth';
-import * as taskCheckReceive from './taskCheckReceive';
import * as taskUser from './taskUser';
import * as sms from './sms';
import * as logRecords from './logRecords';
@@ -36,9 +36,9 @@
dictionary,
codeUrl,
electronSign,
+ taskCheckReceive,
userResume,
auth,
- taskCheckReceive,
taskUser,
sms,
logRecords,
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..f0aec44 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -419,6 +419,10 @@
interface CheckReceiveTaskCommand {
/** 鎻愪氦Id */
id?: string;
+ /** 绛惧埌鏃堕棿 */
+ checkInTime?: string;
+ /** 绛惧嚭鏃堕棿 */
+ checkOutTime?: string;
checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
}
@@ -1069,14 +1073,25 @@
Stop = 50,
}
+ enum EnumTaskUserSubmitCheckHistoryType {
+ /**绛惧埌 */
+ CheckIn = 10,
+ /**绛惧嚭 */
+ CheckOut = 20,
+ /**鏈埌宀� */
+ UnCheckIn = 30,
+ /**鏈鍑� */
+ UnCheckOut = 40,
+ }
+
enum EnumTaskUserSubmitCheckReceiveStatus {
/**寰呮彁浜� */
WaitSubmit = 10,
- /**寰呴獙鏀�/鏈埌宀� */
+ /**寰呴獙鏀� */
WaitCheckReceive = 20,
/**楠屾敹閫氳繃/宸茬鍒� */
Success = 30,
- /**楠屾敹鏈�氳繃 */
+ /**楠屾敹鏈�氳繃/鏈埌宀� */
Fail = 40,
}
@@ -1411,6 +1426,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;
/** 閿欒淇℃伅 */
@@ -3462,6 +3495,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 +3567,12 @@
id?: string;
/** 楠屾敹鏃堕棿 */
date?: string;
+ /** 绛惧埌鏃堕棿 */
+ checkInTime?: string;
+ /** 绛惧嚭鏃堕棿 */
+ checkOutTime?: string;
+ /** 鎿嶄綔浜� */
+ operator?: string;
/** 鎻愪氦鏃堕棿 */
createdTime?: string;
/** 楠屾敹鐓х墖 */
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index fdb4e19..a883928 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -56,10 +56,10 @@
<template v-if="form.billingMethod === EnumBillingMethod.Hour">
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鏍稿畾宸ユ椂:" prop="name">
+ <ProFormItemV2 label="鏍稿畾宸ユ椂:" prop="verifyWorkHours">
<ProFormInputNumber
:controls="false"
- v-model="form.serviceFee"
+ v-model="form.verifyWorkHours"
placeholder="璇疯緭鍏ユ牳瀹氬伐鏃�"
:min="0"
:max="999999999999"
@@ -70,10 +70,10 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="瓒呮椂鏈嶅姟璐�:" prop="name">
+ <ProFormItemV2 label="瓒呮椂鏈嶅姟璐�:" prop="timeoutServiceFee">
<ProFormInputNumber
:controls="false"
- v-model="form.serviceFee"
+ v-model="form.timeoutServiceFee"
placeholder="璇疯緭鍏ヨ秴鏃舵湇鍔¤垂"
:min="0"
:max="999999999999"
@@ -237,10 +237,10 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鎻忚堪:" prop="addressDetail">
+ <ProFormItemV2 label="浠诲姟鎻忚堪:" prop="description">
<ProFormTextArea
:rows="4"
- v-model.trim="form.addressDetail"
+ v-model.trim="form.description"
placeholder="璇疯緭鍏ヤ换鍔℃弿杩�"
/>
</ProFormItemV2>
@@ -268,16 +268,16 @@
<ProFormColItem :span="12">
<ProFormItemV2
label="鎶ュ悕鏃堕棿:"
- prop="time"
+ prop="applyTime"
:check-rules="[{ message: '璇烽�夋嫨鎶ュ悕鏃堕棿', type: 'array' }]"
>
<ProFormDatePicker
- v-model="form.time"
+ v-model="form.applyTime"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
- :disabled-date="disabledDate"
+ :disabled-date="disabledapplyDate"
></ProFormDatePicker>
</ProFormItemV2>
</ProFormColItem>
@@ -286,10 +286,14 @@
<ProFormColItem :span="12">
<ProFormItemV2
label="楠屾敹鏂瑰紡:"
- prop="genderLimit"
+ prop="checkReceiveMethod"
:check-rules="[{ message: '璇烽�夋嫨楠屾敹鏂瑰紡' }]"
>
- <ProFormRadio v-model="form.genderLimit" :value-enum="[]"></ProFormRadio>
+ <ProFormRadio
+ v-model="form.checkReceiveMethod"
+ :value-enum="EnumTaskCheckReceiveMethodText"
+ :button-style="false"
+ ></ProFormRadio>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -334,6 +338,7 @@
EnumSettlementCycleDateMonthArray,
EnumSettlementCycleDateWeekArray,
EnumSettlementCycle,
+ EnumTaskCheckReceiveMethodText,
} from '@/constants';
import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
@@ -351,6 +356,10 @@
function disabledDate(time: Date) {
return dayjs(time).isBefore(dayjs(), 'day');
+}
+
+function disabledapplyDate(time: Date) {
+ return dayjs(time).isBefore(form.time[0], 'day');
}
const eventContext = useGlobalEventContext();
@@ -395,6 +404,11 @@
time: [] as unknown as ModelValueType,
weMapInfo: {} as WeMapModel,
addressDetail: '',
+ verifyWorkHours: null as number,
+ timeoutServiceFee: null as number,
+ description: '',
+ checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
+ applyTime: [] as unknown as ModelValueType,
});
const { isLoading } = useQuery({
@@ -423,6 +437,10 @@
format(data.beginTime, 'YYYY-MM-DD 00:00:00'),
format(data.endTime, 'YYYY-MM-DD 23:59:59'),
];
+ form.applyTime = [
+ format(data.applyBeginTime, 'YYYY-MM-DD 00:00:00'),
+ format(data.applyEndTime, 'YYYY-MM-DD 23:59:59'),
+ ];
form.weMapInfo = {
latitude: data.latitude,
longitude: data.longitude,
@@ -433,6 +451,10 @@
addressName: data.addressName,
};
form.addressDetail = data.addressDetail;
+ form.verifyWorkHours = data.verifyWorkHours;
+ form.timeoutServiceFee = data.timeoutServiceFee;
+ form.description = data.description;
+ form.checkReceiveMethod = data.checkReceiveMethod;
},
enabled: isEdit,
});
@@ -478,6 +500,12 @@
latitude: form.weMapInfo.latitude,
beginTime: dayjs(form.time[0]).format('YYYY-MM-DD 00:00:00'),
endTime: dayjs(form.time[1]).format('YYYY-MM-DD 23:59:59'),
+ applyBeginTime: dayjs(form.applyTime[0]).format('YYYY-MM-DD 00:00:00'),
+ applyEndTime: dayjs(form.applyTime[1]).format('YYYY-MM-DD 23:59:59'),
+ verifyWorkHours: form.verifyWorkHours,
+ timeoutServiceFee: form.timeoutServiceFee,
+ description: form.description,
+ checkReceiveMethod: form.checkReceiveMethod,
};
if (isEdit) {
params.id = id;
--
Gitblit v1.9.1