From 1a7bb09ed0e74ba2b7349a6e015faa0e6d9fc6f5 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 02 十二月 2025 13:18:17 +0800
Subject: [PATCH] fix: 谢绝
---
src/views/EmploymentManage/EmploymentSignList.vue | 43 ++++++++--
.eslintrc-auto-import.json | 1
src/services/api/typings.d.ts | 52 +++++++++++-
src/views/EmploymentManage/components/RefuseDialog.vue | 67 ++++++++++++++++
auto-imports.d.ts | 4
src/constants/apiEnum.ts | 14 +++
src/services/api/enterpriseWallet.ts | 15 +++
src/services/api/user.ts | 15 +++
8 files changed, 194 insertions(+), 17 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 843d5b6..fe80b23 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -30,6 +30,7 @@
"EnumDbAuditOperate": true,
"EnumElectronSignAccess": true,
"EnumElectronSignVerifyType": true,
+ "EnumEnterpriseCooperationServiceFeeCollectType": true,
"EnumEnterpriseCooperationSignStatus": true,
"EnumEnterpriseCooperationSignStatusText": true,
"EnumEnterpriseCooperationStatus": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 7b3c688..16d1f1e 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -33,6 +33,7 @@
const EnumDbAuditOperate: typeof import('./src/constants/apiEnum')['EnumDbAuditOperate']
const EnumElectronSignAccess: typeof import('./src/constants/apiEnum')['EnumElectronSignAccess']
const EnumElectronSignVerifyType: typeof import('./src/constants/apiEnum')['EnumElectronSignVerifyType']
+ const EnumEnterpriseCooperationServiceFeeCollectType: typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationServiceFeeCollectType']
const EnumEnterpriseCooperationSignStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationSignStatus']
const EnumEnterpriseCooperationSignStatusText: typeof import('./src/constants/supplier')['EnumEnterpriseCooperationSignStatusText']
const EnumEnterpriseCooperationStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationStatus']
@@ -302,7 +303,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, 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, 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'
+ 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'
@@ -364,6 +365,7 @@
readonly EnumDbAuditOperate: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumDbAuditOperate']>
readonly EnumElectronSignAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumElectronSignAccess']>
readonly EnumElectronSignVerifyType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumElectronSignVerifyType']>
+ readonly EnumEnterpriseCooperationServiceFeeCollectType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationServiceFeeCollectType']>
readonly EnumEnterpriseCooperationSignStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationSignStatus']>
readonly EnumEnterpriseCooperationSignStatusText: UnwrapRef<typeof import('./src/constants/supplier')['EnumEnterpriseCooperationSignStatusText']>
readonly EnumEnterpriseCooperationStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationStatus']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index c684e71..3fc61b0 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -101,6 +101,14 @@
Face = 20,
}
+/** 鏈嶅姟璐规敹鍙栨柟寮� */
+export enum EnumEnterpriseCooperationServiceFeeCollectType {
+ /**鎸夋瘮渚� */
+ Rate = 10,
+ /**鍗曚汉鍗曟 */
+ SingleTime = 20,
+}
+
/** 绛剧害鐘舵�� */
export enum EnumEnterpriseCooperationSignStatus {
/**鏈绾� */
@@ -447,8 +455,10 @@
UserServerEnterpriseEmployee = 23,
/**鐢靛瓙绛� */
ElectronSignServerElectronSign = 24,
- /**鐢靛瓙绛� */
+ /**鐭俊 */
ToolServerSms = 25,
+ /**灏忕▼搴� */
+ ToolServerWxmp = 26,
}
/** 璧勬簮璇锋眰鏂瑰紡 */
@@ -629,6 +639,8 @@
Pass = 20,
/**宸茶阿缁� */
Refuse = 30,
+ /**宸插彇娑� */
+ Cancel = 40,
}
/** 浠诲姟鐢ㄦ埛绛剧害鐘舵�� */
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
index 603bc5b..36618fa 100644
--- a/src/services/api/enterpriseWallet.ts
+++ b/src/services/api/enterpriseWallet.ts
@@ -508,6 +508,21 @@
);
}
+/** 1.3.0.2鐗堟湰淇浼佷笟閽卞寘浜ゆ槗鏁版嵁 POST /api/user/enterpriseWallet/repairEnterpriseWalletTransaction_1_3_0_2 */
+export async function repairEnterpriseWalletTransaction1302(
+ body: API.RepairEnterpriseWalletTransaction1302Command,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/enterpriseWallet/repairEnterpriseWalletTransaction_1_3_0_2', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 淇敼浼佷笟寰俊鏀粯閽卞寘缁撶畻璐︽埛 POST /api/user/enterpriseWallet/updateEnterpriseWeChatPayWalletBankAccountInfo */
export async function updateEnterpriseWeChatPayWalletBankAccountInfo(
body: API.UpdateEnterpriseWeChatPayWalletBankAccountInfoCommand,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index e139225..b9f42a2 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -875,6 +875,13 @@
Face = 20,
}
+ enum EnumEnterpriseCooperationServiceFeeCollectType {
+ /**鎸夋瘮渚� */
+ Rate = 10,
+ /**鍗曚汉鍗曟 */
+ SingleTime = 20,
+ }
+
enum EnumEnterpriseCooperationSignStatus {
/**鏈绾� */
None = 10,
@@ -1191,8 +1198,10 @@
UserServerEnterpriseEmployee = 23,
/**鐢靛瓙绛� */
ElectronSignServerElectronSign = 24,
- /**鐢靛瓙绛� */
+ /**鐭俊 */
ToolServerSms = 25,
+ /**灏忕▼搴� */
+ ToolServerWxmp = 26,
}
enum EnumResourceMethod {
@@ -1355,6 +1364,8 @@
Pass = 20,
/**宸茶阿缁� */
Refuse = 30,
+ /**宸插彇娑� */
+ Cancel = 40,
}
enum EnumTaskUserSignContractStatus {
@@ -4159,6 +4170,8 @@
/** 鏈�杩戦獙鏀舵椂闂� */
lastCheckReceiveTime?: string;
checkedStatus?: EnumGetCheckReceiveTasksQueryResultItemCheckStatus;
+ /** 浜哄憳鏁伴噺 */
+ arrangeUserCount?: number;
}
interface GetCheckReceiveTaskUserSubmitCheckHistoriesQuery {
@@ -4897,6 +4910,10 @@
createdTimeStart?: string;
/** 鐧昏鏃堕棿-鏈�鏅氭椂闂� */
createdTimeEnd?: string;
+ /** 鐏靛伐绛剧害鏃堕棿-鏈�鏃╂椂闂� */
+ userSignContractTimeStart?: string;
+ /** 鐏靛伐绛剧害鏃堕棿-鏈�鏅氭椂闂� */
+ userSignContractTimeEnd?: string;
/** 绛剧害鏃堕棿-鏈�鏃╂椂闂� */
signContractTimeStart?: string;
/** 绛剧害鏃堕棿-鏈�鏅氭椂闂� */
@@ -5757,6 +5774,11 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
/** 鍚堜綔鍗忚 */
cooperationAgreementUrl?: string;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
/** 鐢ㄦ埛Id */
userId?: string;
/** 璐﹀彿 */
@@ -5792,6 +5814,11 @@
cityContent?: string;
cooperationStatus?: EnumEnterpriseCooperationStatus;
signStatus?: EnumEnterpriseCooperationSignStatus;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
}
interface GetPersonalApplyTaskInfosQuery {
@@ -6204,6 +6231,8 @@
type?: EnumUserWalletTransactionType;
/** 璁㈠崟鍙� */
code?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
/** 缁撶畻鏃ユ湡 */
@@ -6646,6 +6675,8 @@
auditStatus?: EnumTaskSettlementAuditStatus;
/** 鎿嶄綔浜� */
operator?: string;
+ /** 鍙戝崟浼佷笟鍚嶇О */
+ enterpriseName?: string;
}
interface GetSettlementTasksQueryResultObjectData {
@@ -7657,6 +7688,10 @@
}
interface ImportEnterpriseEmployeesCommandResultError {
+ /** 鍗忚璧峰 */
+ contractBegin?: string;
+ /** 鍗忚缁堟 */
+ contractEnd?: string;
/** 閿欒淇℃伅 */
errorMessage?: string;
/** 濮撳悕 */
@@ -7665,10 +7700,6 @@
contactPhoneNumber?: string;
/** 韬唤璇佸彿 */
identity?: string;
- /** 鍗忚璧峰鏃堕棿 */
- contractBegin?: string;
- /** 鍗忚缁堟鏃堕棿 */
- contractEnd?: string;
}
interface ImportTaskSettlementOrderRostersCommand {
@@ -8021,6 +8052,10 @@
type RepairContractTemplateValuePointBy1202Command = Record<string, any>;
type RepairEnterpriseEmployee1302Command = Record<string, any>;
+
+ type RepairEnterpriseUser1302Command = Record<string, any>;
+
+ type RepairEnterpriseWalletTransaction1302Command = Record<string, any>;
type RepairTaskEstimatedServiceFee1301Command = Record<string, any>;
@@ -8389,6 +8424,11 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
/** 鍚堜綔鍗忚 */
cooperationAgreementUrl?: string;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
/** 璐﹀彿 */
userName?: string;
/** 瀵嗙爜锛堥�夊～ 濉簡灏辨敼涓嶅～灏变笉鏀癸級 */
@@ -8770,6 +8810,8 @@
/** 浠诲姟浜哄憳Id */
id?: string;
hireStatus?: EnumTaskUserHireStatus;
+ /** 褰曠敤澶囨敞 */
+ hireRemark?: string;
}
enum SettlementReceiveStatus {
diff --git a/src/services/api/user.ts b/src/services/api/user.ts
index f378be8..99cf0de 100644
--- a/src/services/api/user.ts
+++ b/src/services/api/user.ts
@@ -206,6 +206,21 @@
});
}
+/** 1.3.0.2鐗堟湰淇浼佷笟鐢ㄦ埛鏁版嵁 POST /api/user/user/repairEnterpriseUser_1_3_0_2 */
+export async function repairEnterpriseUser1302(
+ body: API.RepairEnterpriseUser1302Command,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/user/repairEnterpriseUser_1_3_0_2', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 閲嶇疆鐢ㄦ埛鎿嶄綔瀵嗙爜 POST /api/user/user/resetUserOperatorPasswords */
export async function resetUserOperatorPasswords(
body: API.ResetUserOperatorPasswordsCommand,
diff --git a/src/views/EmploymentManage/EmploymentSignList.vue b/src/views/EmploymentManage/EmploymentSignList.vue
index 8d502d0..ce8b10e 100644
--- a/src/views/EmploymentManage/EmploymentSignList.vue
+++ b/src/views/EmploymentManage/EmploymentSignList.vue
@@ -28,6 +28,7 @@
</ProTableV2>
</AppContainer>
<StaffInfoDialog v-bind="dialogStaffInfoProps" />
+ <RefuseDialog v-bind="dialogProps" />
</LoadingLayout>
</template>
@@ -50,6 +51,7 @@
import { convertApi2FormUrlOnlyOne, hiddenIDNumberForEnd4 } from '@/utils';
import * as taskUserServices from '@/services/api/taskUser';
import * as enterpriseEmployeeServices from '@/services/api/enterpriseEmployee';
+import RefuseDialog from './components/RefuseDialog.vue';
defineOptions({
name: 'EmploymentSignList',
@@ -63,7 +65,7 @@
},
recruitBtn: {
emits: {
- onClick: (role) => setTaskUserHire(role, EnumTaskUserHireStatus.Pass),
+ onClick: (role) => setTaskUserHire(role.id, EnumTaskUserHireStatus.Pass),
},
extraProps: {
hide: (row: API.GetTaskUsersQueryResultItem) =>
@@ -72,7 +74,7 @@
},
refuseBtn: {
emits: {
- onClick: (role) => setTaskUserHire(role, EnumTaskUserHireStatus.Refuse),
+ onClick: (role) => openRefuseDialog(role),
},
extraProps: {
hide: (row: API.GetTaskUsersQueryResultItem) =>
@@ -193,17 +195,38 @@
} catch (error) {}
}
-async function setTaskUserHire(
- row: API.GetTaskUsersQueryResultItem,
- hireStatus: EnumTaskUserHireStatus
-) {
+const { dialogProps, handleAdd, editForm } = useFormDialog({
+ onConfirm: handleRefuse,
+ defaultFormParams: {
+ id: '',
+ remark: '',
+ },
+});
+
+async function openRefuseDialog(row: API.GetTaskUsersQueryResultItem) {
try {
- await Message.tipMessage(
- `纭瑕�${hireStatus === EnumTaskUserHireStatus.Pass ? '褰曠敤' : '璋㈢粷'}鍚楋紵`
- );
- let params: API.SetTaskUserHireCommand = {
+ await Message.tipMessage(`纭瑕佽阿缁濆悧锛焋);
+ handleAdd({
id: row.id,
+ });
+ } catch (error) {}
+}
+
+async function handleRefuse() {
+ setTaskUserHire(editForm.id, EnumTaskUserHireStatus.Refuse, editForm.remark);
+}
+
+async function setTaskUserHire(id: string, hireStatus: EnumTaskUserHireStatus, remark?: string) {
+ try {
+ if (hireStatus === EnumTaskUserHireStatus.Pass) {
+ await Message.tipMessage(
+ `纭瑕�${hireStatus === EnumTaskUserHireStatus.Pass ? '褰曠敤' : '璋㈢粷'}鍚楋紵`
+ );
+ }
+ let params: API.SetTaskUserHireCommand = {
+ id: id,
hireStatus: hireStatus,
+ hireRemark: remark,
};
let res = await taskUserServices.setTaskUserHire(params);
if (res) {
diff --git a/src/views/EmploymentManage/components/RefuseDialog.vue b/src/views/EmploymentManage/components/RefuseDialog.vue
new file mode 100644
index 0000000..8a33cd4
--- /dev/null
+++ b/src/views/EmploymentManage/components/RefuseDialog.vue
@@ -0,0 +1,67 @@
+<template>
+ <ProDialog title="璋㈢粷" v-model="visible" @close="onDialogClose" destroy-on-close draggable>
+ <ProForm :model="form" ref="dialogForm" label-width="110px">
+ <ProFormItemV2 label="璋㈢粷鍘熷洜:" prop="remark" :check-rules="[{ message: '璇疯緭鍏ヨ阿缁濆師鍥�' }]">
+ <ProFormTextArea placeholder="璇疯緭鍏ヨ阿缁濆師鍥�" v-model="form.remark"></ProFormTextArea>
+ </ProFormItemV2>
+ </ProForm>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="emit('onCancel')">鍙� 娑�</el-button>
+ <el-button type="primary" @click="handleConfirm">纭� 瀹�</el-button>
+ </span>
+ </template>
+ </ProDialog>
+</template>
+
+<script setup lang="ts">
+import { FormInstance } from 'element-plus';
+import {
+ ProDialog,
+ ProForm,
+ ProFormItemV2,
+ ProFormText,
+ ProFormTextArea,
+} from '@bole-core/components';
+
+defineOptions({
+ name: 'RefuseDialog',
+});
+
+// type Props = {};
+
+// const props = withDefaults(defineProps<Props>(), {});
+
+const visible = defineModel({ type: Boolean });
+
+type Form = {
+ title?: string;
+ id: string;
+ remark: string;
+};
+
+const form = defineModel<Form>('form');
+
+const emit = defineEmits<{
+ (e: 'onConfirm'): void;
+ (e: 'onCancel'): void;
+}>();
+
+const dialogForm = ref<FormInstance>();
+
+function onDialogClose() {
+ if (!dialogForm.value) return;
+ dialogForm.value.resetFields();
+}
+
+function handleConfirm() {
+ if (!dialogForm.value) return;
+ dialogForm.value.validate((valid) => {
+ if (valid) {
+ emit('onConfirm');
+ } else {
+ return;
+ }
+ });
+}
+</script>
--
Gitblit v1.9.1