From cbcc6a8eecfc19e93da08500dcc898efdabf7836 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 18:38:45 +0800
Subject: [PATCH] fix: s

---
 src/services/api/enterpriseEmployee.ts                             |   18 ++
 src/views/ServiceChargeManage/constants/columns.ts                 |   31 ++++
 src/views/ServiceChargeManage/ServiceChargeDetail.vue              |   37 ++++
 src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue |   75 ++++++++++
 .eslintrc-auto-import.json                                         |    3 
 src/services/api/electronSign.ts                                   |   30 ++++
 src/services/api/typings.d.ts                                      |  135 ++++++++++++++++++-
 auto-imports.d.ts                                                  |    8 +
 src/constants/enterpriseEmployee.ts                                |    7 
 src/constants/apiEnum.ts                                           |   16 ++
 src/views/EmploymentManage/EmploymentManageArrange.vue             |   16 ++
 11 files changed, 354 insertions(+), 22 deletions(-)

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 1561888..8f5d7d0 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -42,6 +42,8 @@
     "EnumEnterpriseWalletExpandindirectOrderStatus": true,
     "EnumEnterpriseWalletSignStatus": true,
     "EnumEnterpriseWalletTransactionType": true,
+    "EnumGetArrangeTaskUsersQueryApplyStatus": true,
+    "EnumGetArrangeTaskUsersQueryApplyStatusText": true,
     "EnumGetEnterpriseEmployeesQuerySignContractStatus": true,
     "EnumLogLevel": true,
     "EnumMenuType": true,
@@ -88,6 +90,7 @@
     "EnumTaskSettlementStatusText": true,
     "EnumTaskStatus": true,
     "EnumTaskStatusText": true,
+    "EnumTaskUserApplyStatus": true,
     "EnumTaskUserArrangeStatus": true,
     "EnumTaskUserArrangeStatusText": true,
     "EnumTaskUserHireStatus": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 94cab53..3fd99c1 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -46,6 +46,8 @@
   const EnumEnterpriseWalletSignStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']
   const EnumEnterpriseWalletTransactionStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionStatus']
   const EnumEnterpriseWalletTransactionType: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionType']
+  const EnumGetArrangeTaskUsersQueryApplyStatus: typeof import('./src/constants/apiEnum')['EnumGetArrangeTaskUsersQueryApplyStatus']
+  const EnumGetArrangeTaskUsersQueryApplyStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumGetArrangeTaskUsersQueryApplyStatusText']
   const EnumGetEnterpriseEmployeesQuerySignContractStatus: typeof import('./src/constants/apiEnum')['EnumGetEnterpriseEmployeesQuerySignContractStatus']
   const EnumLogLevel: typeof import('./src/constants/apiEnum')['EnumLogLevel']
   const EnumMenuType: typeof import('./src/constants/apiEnum')['EnumMenuType']
@@ -93,6 +95,7 @@
   const EnumTaskSettlementStatusText: typeof import('./src/constants/task')['EnumTaskSettlementStatusText']
   const EnumTaskStatus: typeof import('./src/constants/apiEnum')['EnumTaskStatus']
   const EnumTaskStatusText: typeof import('./src/constants/task')['EnumTaskStatusText']
+  const EnumTaskUserApplyStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserApplyStatus']
   const EnumTaskUserArrangeStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserArrangeStatus']
   const EnumTaskUserArrangeStatusText: typeof import('./src/constants/task')['EnumTaskUserArrangeStatusText']
   const EnumTaskUserHireStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserHireStatus']
@@ -284,7 +287,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, 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, GetSettlementTasksQueryPaymentStatus, 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, GetSettlementTasksQueryPaymentStatus, 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, EnumGetArrangeTaskUsersQueryApplyStatus, 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, 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, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetArrangeTaskUsersQueryApplyStatus, 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, 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, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
   import('./src/constants/apiEnum')
   // @ts-ignore
   export type { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic'
@@ -358,6 +361,8 @@
     readonly EnumEnterpriseWalletExpandindirectOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderStatus']>
     readonly EnumEnterpriseWalletSignStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']>
     readonly EnumEnterpriseWalletTransactionType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionType']>
+    readonly EnumGetArrangeTaskUsersQueryApplyStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetArrangeTaskUsersQueryApplyStatus']>
+    readonly EnumGetArrangeTaskUsersQueryApplyStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumGetArrangeTaskUsersQueryApplyStatusText']>
     readonly EnumGetEnterpriseEmployeesQuerySignContractStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetEnterpriseEmployeesQuerySignContractStatus']>
     readonly EnumLogLevel: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumLogLevel']>
     readonly EnumMenuType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuType']>
@@ -404,6 +409,7 @@
     readonly EnumTaskSettlementStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskSettlementStatusText']>
     readonly EnumTaskStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskStatus']>
     readonly EnumTaskStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskStatusText']>
+    readonly EnumTaskUserApplyStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserApplyStatus']>
     readonly EnumTaskUserArrangeStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserArrangeStatus']>
     readonly EnumTaskUserArrangeStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskUserArrangeStatusText']>
     readonly EnumTaskUserHireStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserHireStatus']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 1c1c992..ead0641 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -202,6 +202,14 @@
 }
 
 /** 娌″啓娉ㄩ噴 */
+export enum EnumGetArrangeTaskUsersQueryApplyStatus {
+  /**鏈姤鍚� */
+  None = 10,
+  /**宸叉姤鍚� */
+  Completed = 20,
+}
+
+/** 娌″啓娉ㄩ噴 */
 export enum EnumGetEnterpriseEmployeesQuerySignContractStatus {
   /**鐏靛伐寰呯绾� */
   UserWait = 10,
@@ -525,6 +533,14 @@
   Complete = 20,
 }
 
+/** 浠诲姟鐢ㄦ埛鎶ュ悕鐘舵�� */
+export enum EnumTaskUserApplyStatus {
+  /**鏈姤鍚� */
+  None = 10,
+  /**宸叉姤鍚� */
+  Completed = 20,
+}
+
 /** 浠诲姟鐢ㄦ埛瀹夋帓鐘舵�� */
 export enum EnumTaskUserArrangeStatus {
   /**鏈畨鎺� */
diff --git a/src/constants/enterpriseEmployee.ts b/src/constants/enterpriseEmployee.ts
index 351ddd4..1d926ed 100644
--- a/src/constants/enterpriseEmployee.ts
+++ b/src/constants/enterpriseEmployee.ts
@@ -1,4 +1,4 @@
-import { EnumTaskUserHireStatus, EnumTaskUserSignContractStatus } from './apiEnum';
+import { EnumTaskUserHireStatus, EnumTaskUserSignContractStatus,EnumGetArrangeTaskUsersQueryApplyStatus } from './apiEnum';
 
 export const EnumTaskUserHireStatusText = {
   [EnumTaskUserHireStatus.Wait]: '寰呭綍鐢�',
@@ -19,3 +19,8 @@
 };
 
 export const ImportEnterpriseEmployeesTempPath = `${TempFolderPath}/%E7%81%B5%E5%B7%A5%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx`;
+
+export const EnumGetArrangeTaskUsersQueryApplyStatusText = {
+  [EnumGetArrangeTaskUsersQueryApplyStatus.None]: '鏈姤鍚�',
+  [EnumGetArrangeTaskUsersQueryApplyStatus.Completed]: '宸叉姤鍚�',
+}
diff --git a/src/services/api/electronSign.ts b/src/services/api/electronSign.ts
index 8b63a80..e7d5a93 100644
--- a/src/services/api/electronSign.ts
+++ b/src/services/api/electronSign.ts
@@ -32,6 +32,21 @@
   });
 }
 
+/** 鏍￠獙鍚堝悓妯℃澘涓氬姟缂栧彿鏄惁瀛樺湪 POST /api/user/electronSign/checkExistContractTemplateCode */
+export async function checkExistContractTemplateCode(
+  body: API.CheckExistContractTemplateCodeCommand,
+  options?: API.RequestConfig
+) {
+  return request<boolean>('/api/user/electronSign/checkExistContractTemplateCode', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json-patch+json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
 /** 鐢靛瓙绛惧洖浼� POST /api/user/electronSign/electronSignCallback */
 export async function electronSignCallback(
   body: API.ElectronSignCallbackCommand,
@@ -205,6 +220,21 @@
   });
 }
 
+/** 淇鍚堝悓妯℃澘鍙橀噺鏁版嵁锛�1.2.0.2锛� POST /api/user/electronSign/repairContractTemplateValuePointBy_1_2_0_2_ */
+export async function repairContractTemplateValuePointBy1202_(
+  body: API.RepairContractTemplateValuePointBy1202Command,
+  options?: API.RequestConfig
+) {
+  return request<number>('/api/user/electronSign/repairContractTemplateValuePointBy_1_2_0_2_', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json-patch+json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
 /** 淇濆瓨鍚堝悓妯℃澘 POST /api/user/electronSign/saveContractTemplate */
 export async function saveContractTemplate(
   body: API.SaveContractTemplateCommand,
diff --git a/src/services/api/enterpriseEmployee.ts b/src/services/api/enterpriseEmployee.ts
index 286ed8a..622e474 100644
--- a/src/services/api/enterpriseEmployee.ts
+++ b/src/services/api/enterpriseEmployee.ts
@@ -2,6 +2,24 @@
 // @ts-ignore
 import { request } from '@/utils/request';
 
+/** 浼佷笟鎵归噺绛剧害鍚堝悓 POST /api/user/enterpriseEmployee/batchEnterpriseSignContract */
+export async function batchEnterpriseSignContract(
+  body: API.BatchEnterpriseSignContractCommand,
+  options?: API.RequestConfig
+) {
+  return request<API.BatchEnterpriseSignContractCommandResult>(
+    '/api/user/enterpriseEmployee/batchEnterpriseSignContract',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json-patch+json',
+      },
+      data: body,
+      ...(options || {}),
+    }
+  );
+}
+
 /** 缂栬緫鐏靛伐淇℃伅 POST /api/user/enterpriseEmployee/editEnterpriseEmployee */
 export async function editEnterpriseEmployee(
   body: API.EditEnterpriseEmployeeCommand,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index b417c8a..78ee6c3 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -398,6 +398,29 @@
     address?: string;
   }
 
+  interface BatchEnterpriseSignContractCommand {
+    /** 鐏靛伐Id */
+    ids?: string[];
+  }
+
+  interface BatchEnterpriseSignContractCommandResult {
+    /** 绛剧害鎴愬姛鐏靛伐Id */
+    successIds?: string[];
+    /** 绛剧害澶辫触鐨勭伒宸ヤ俊鎭� */
+    errors?: BatchEnterpriseSignContractCommandResultError[];
+  }
+
+  interface BatchEnterpriseSignContractCommandResultError {
+    /** 濮撳悕 */
+    name?: string;
+    /** 鎵嬫満鍙� */
+    contactPhoneNumber?: string;
+    /** 韬唤璇佸彿 */
+    identity?: string;
+    /** 閿欒娑堟伅 */
+    errorMessages?: string;
+  }
+
   interface BindWxmpUserInfoCommand {
     /** 璁块棶浠ょ墝 */
     accessToken: string;
@@ -436,6 +459,13 @@
     accesses?: EnumElectronSignAccess[];
   }
 
+  interface CheckExistContractTemplateCodeCommand {
+    /** 妯℃澘Id锛堢紪杈戞椂浼犲叆锛� */
+    id?: string;
+    /** 涓氬姟缂栧彿 */
+    code: string;
+  }
+
   type CheckHealthQuery = Record<string, any>;
 
   interface CheckOperatorTokenCommand {
@@ -446,6 +476,10 @@
   interface CheckReceiveTaskCommand {
     /** 鎻愪氦Id */
     id?: string;
+    /** 浠诲姟浜哄憳Id */
+    taskInfoUserId?: string;
+    /** 鏃ユ湡 */
+    date?: string;
     /** 绛惧埌鏃堕棿 */
     checkInTime?: string;
     /** 绛惧嚭鏃堕棿 */
@@ -525,8 +559,16 @@
   interface EditTaskSettlementOrderRosterCommand {
     /** 鍚嶅崟Id */
     id?: string;
-    /** 绱宸ユ椂 */
-    totalWorkHours?: number;
+    /** 鏈嶅姟璐癸紙鍏冿級 */
+    serviceFee?: number;
+    /** 瓒呮椂锛堝皬鏃讹級 */
+    timeoutHours?: number;
+    /** 瓒呮椂璐圭敤锛堝厓锛� */
+    timeoutFee?: number;
+    /** 鍏朵粬璐圭敤锛堝厓锛� */
+    otherFee?: number;
+    /** 澶囨敞 */
+    remark?: string;
     /** 缁撶畻閲戦 */
     settlementAmount: number;
     /** 瀹炲彂閲戦 */
@@ -785,6 +827,13 @@
     Recharge = 10,
     /**杞处 */
     Transfer = 20,
+  }
+
+  enum EnumGetArrangeTaskUsersQueryApplyStatus {
+    /**鏈姤鍚� */
+    None = 10,
+    /**宸叉姤鍚� */
+    Completed = 20,
   }
 
   enum EnumGetEnterpriseEmployeesQuerySignContractStatus {
@@ -1084,6 +1133,13 @@
     Complete = 20,
   }
 
+  enum EnumTaskUserApplyStatus {
+    /**鏈姤鍚� */
+    None = 10,
+    /**宸叉姤鍚� */
+    Completed = 20,
+  }
+
   enum EnumTaskUserArrangeStatus {
     /**鏈畨鎺� */
     Wait = 10,
@@ -1354,6 +1410,24 @@
   interface ExportTaskSettlementOrderRostersCommand {
     /** 缁撶畻璁㈠崟Id */
     id?: string;
+  }
+
+  interface FriendlyResultBatchEnterpriseSignContractCommandResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: BatchEnterpriseSignContractCommandResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
   }
 
   interface FriendlyResultBoolean {
@@ -3376,6 +3450,7 @@
     /** 鍏抽敭瀛楋紙濮撳悕/韬唤璇�/鐢佃瘽锛� */
     keywords?: string;
     arrangeStatus?: EnumTaskUserArrangeStatus;
+    applyStatus?: EnumGetArrangeTaskUsersQueryApplyStatus;
     pageModel?: PagedListQueryPageModel;
   }
 
@@ -3829,6 +3904,12 @@
     bindProperty?: string;
     /** 鏄惁蹇呭～ */
     required?: boolean;
+    /** 鍧愭爣X */
+    x?: number;
+    /** 鍧愭爣Y */
+    y?: number;
+    /** 椤电爜 */
+    page?: number;
   }
 
   type GetCurrentLogierMenusQuery = Record<string, any>;
@@ -4856,6 +4937,7 @@
     releaseStatus?: EnumTaskReleaseStatus;
     recommendStatus?: EnumTaskRecommendStatus;
     checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+    applyStatus?: EnumTaskUserApplyStatus;
     pageModel?: PagedListQueryPageModel;
   }
 
@@ -5003,6 +5085,8 @@
   }
 
   interface GetPersonalHireTaskInfosQuery {
+    hireStatus?: EnumTaskUserHireStatus;
+    arrangeStatus?: EnumTaskUserArrangeStatus;
     status?: GetPersonalHireTaskInfosQueryStatus;
     pageModel?: PagedListQueryPageModel;
   }
@@ -5080,8 +5164,18 @@
     hirePassTaskCount?: number;
     /** 宸插彇娑� */
     hireRefuseTaskCount?: number;
+    /** 浠诲姟涓� */
+    inProcessTaskCount?: number;
+    /** 宸插畨鎺� */
+    arrangeCompleteTaskCount?: number;
     /** 浣欓 */
     balance?: number;
+    /** 鎴戠殑鏀剁泭 */
+    incomeCount?: number;
+    /** 寰呯粨绠� */
+    waitSettlement?: number;
+    /** 宸插彂鏀� */
+    releaseedCount?: number;
     /** 宸茬粦瀹氱殑閾惰鍗￠�氶亾 */
     bankCardAAccesses?: EnumUserBankCardAccess[];
   }
@@ -5635,6 +5729,8 @@
   interface GetSettlementTasksQuery {
     /** 鍏抽敭瀛� */
     keywords?: string;
+    /** 浠诲姟Id */
+    taskInfoId?: string;
     paymentStatus?: GetSettlementTasksQueryPaymentStatus;
     settlementOrderStatus?: EnumTaskSettlementOrderStatus;
     settlementStatus?: EnumTaskSettlementStatus;
@@ -5769,14 +5865,22 @@
     /** 鏄惁瀹炲悕 */
     isReal?: boolean;
     realMethod?: EnumUserRealMethod;
-    /** 绱宸ユ椂 */
-    totalWorkHours?: number;
     /** 鎵�灞為摱琛� */
     bank?: string;
     /** 寮�鎴锋敮琛屽悕绉� */
     bankBranch?: string;
     /** 鏀舵璐︽埛 */
     receiveAccount?: string;
+    /** 鏈嶅姟璐癸紙鍏冿級 */
+    serviceFee?: number;
+    /** 瓒呮椂锛堝皬鏃讹級 */
+    timeoutHours?: number;
+    /** 瓒呮椂璐圭敤锛堝厓锛� */
+    timeoutFee?: number;
+    /** 鍏朵粬璐圭敤锛堝厓锛� */
+    otherFee?: number;
+    /** 澶囨敞 */
+    remark?: string;
     /** 缁撶畻閲戦 */
     settlementAmount?: number;
     /** 瀹炲彂閲戦 */
@@ -6034,6 +6138,7 @@
     checkReceiveStatus?: EnumTaskCheckReceiveStatus;
     /** 鏄惁鏀惰棌 */
     isCollected?: boolean;
+    applyStatus?: EnumTaskUserApplyStatus;
     pageModel?: PagedListQueryPageModel;
   }
 
@@ -6643,12 +6748,20 @@
     bankBranch?: string;
     /** 鏀舵璐︽埛 */
     receiveAccount?: string;
-    /** 绱宸ユ椂 */
-    totalWorkHours?: number;
+    /** 鏈嶅姟璐癸紙鍏冿級 */
+    serviceFee?: number;
+    /** 瓒呮椂锛堝皬鏃讹級 */
+    timeoutHours?: number;
+    /** 瓒呮椂璐圭敤锛堝厓锛� */
+    timeoutFee?: number;
+    /** 鍏朵粬璐圭敤锛堝厓锛� */
+    otherFee?: number;
     /** 缁撶畻閲戦 */
     settlementAmount?: number;
     /** 瀹炲彂閲戦 */
     actualSettlementAmount?: number;
+    /** 澶囨敞 */
+    remark?: string;
   }
 
   interface InviteElectronSignCommand {
@@ -6912,6 +7025,8 @@
     verifyCode: string;
   }
 
+  type RepairContractTemplateValuePointBy1202Command = Record<string, any>;
+
   interface ResendResourceCommand {
     /** 璧勬簮鏃ュ織Id */
     id?: string;
@@ -6995,6 +7110,12 @@
     bindProperty?: string;
     /** 鏄惁蹇呭～ */
     required?: boolean;
+    /** 鍧愭爣X */
+    x?: number;
+    /** 鍧愭爣Y */
+    y?: number;
+    /** 椤电爜 */
+    page?: number;
   }
 
   interface SaveDictionaryCategoryCommand {
@@ -7286,7 +7407,7 @@
     name: string;
     billingMethod: EnumBillingMethod;
     /** 鏈嶅姟璐� */
-    serviceFee: number;
+    serviceFee?: number;
     /** 鏍稿畾宸ユ椂 */
     verifyWorkHours?: number;
     /** 瓒呮椂鏈嶅姟璐� */
diff --git a/src/views/EmploymentManage/EmploymentManageArrange.vue b/src/views/EmploymentManage/EmploymentManageArrange.vue
index d33ed67..017f5c4 100644
--- a/src/views/EmploymentManage/EmploymentManageArrange.vue
+++ b/src/views/EmploymentManage/EmploymentManageArrange.vue
@@ -13,6 +13,15 @@
             />
           </QueryFilterItem>
           <QueryFilterItem>
+            <FieldRadio
+              v-model="extraParamState.applyStatus"
+              :value-enum="EnumGetArrangeTaskUsersQueryApplyStatusText"
+              buttonStyle
+              showAllBtn
+              @change="getList()"
+            />
+          </QueryFilterItem>
+          <QueryFilterItem>
             <SearchInput
               v-model="extraParamState.searchWord"
               style="width: 250px"
@@ -50,7 +59,10 @@
 import { EmploymentArrangeColumns } from './constants';
 import { Message } from '@bole-core/core';
 import * as taskUserServices from '@/services/api/taskUser';
-import { EnumTaskUserArrangeStatusText } from '@/constants';
+import {
+  EnumTaskUserArrangeStatusText,
+  EnumGetArrangeTaskUsersQueryApplyStatusText,
+} from '@/constants';
 
 defineOptions({
   name: 'EmploymentManageArrange',
@@ -105,6 +117,7 @@
         id: id,
         keywords: extraParamState.searchWord,
         arrangeStatus: extraParamState.arrangeStatus,
+        applyStatus: extraParamState.applyStatus,
       };
 
       let res = await taskUserServices.getArrangeTaskUsers(params, {
@@ -120,6 +133,7 @@
       searchWord: '',
       orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
       arrangeStatus: '' as any as EnumTaskUserArrangeStatus,
+      applyStatus: '' as any as EnumGetArrangeTaskUsersQueryApplyStatus,
     },
     queryKey: ['taskUserServices/getArrangeTaskUsers'],
     columnsRenderProps: {
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index bd8b274..440afdb 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -197,6 +197,8 @@
   isSettlement: isSettlement.value,
 
   auditStatus: '' as any as EnumTaskSettlementAuditStatus,
+
+  timeoutServiceFee: 0,
 });
 
 const BaseState = {
@@ -231,6 +233,7 @@
       form.code = res?.detail?.code;
       form.settlementAccess = res?.detail?.settlementAccess;
       form.auditStatus = res?.detail?.auditStatus;
+      form.timeoutServiceFee = res?.detail?.timeoutServiceFee ?? 0;
       // form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
       // form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
     }
@@ -301,6 +304,13 @@
       settlementAmount: { type: 'money' },
       actualSettlementAmount: { type: 'money' },
       settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
+      serviceFee: { type: 'money' },
+      timeoutHours: {
+        formatter: (row: API.GetSettlementTaskUsersQueryResultItem) =>
+          row.timeoutHours ? `${row.timeoutHours}灏忔椂` : '',
+      },
+      timeoutFee: { type: 'money' },
+      otherFee: { type: 'money' },
     },
   }
 );
@@ -313,9 +323,15 @@
     actualSettlementAmount: null as number,
     receiveAccount: '',
     bank: '',
-    totalWorkHours: null as number,
+    // totalWorkHours: null as number,
     settlementAccess: form.settlementAccess,
     // bankBranch: '',
+    timeoutServiceFee: 0,
+    serviceFee: null as number,
+    timeoutHours: null as number,
+    timeoutFee: null as number,
+    otherFee: null as number,
+    remark: '',
   },
 });
 
@@ -327,23 +343,36 @@
       actualSettlementAmount: row?.actualSettlementAmount ?? null,
       receiveAccount: row?.receiveAccount ?? '',
       bank: row?.bank ?? '',
-      totalWorkHours: row?.totalWorkHours ?? null,
+      // totalWorkHours: row?.totalWorkHours ?? null,
       settlementAccess: form.settlementAccess,
       // bankBranch: row?.bankBranch ?? '',
+      timeoutServiceFee: form.timeoutServiceFee,
+      serviceFee: row?.serviceFee ?? 0,
+      timeoutHours: row?.timeoutHours ?? null,
+      timeoutFee: row?.timeoutFee ?? null,
+      otherFee: row?.otherFee ?? null,
+      remark: row?.remark ?? '',
     });
   }
 }
 
 async function handleAddOrEdit() {
   try {
+    const settlementAmount =
+      (editForm.timeoutFee ?? 0) + (editForm.serviceFee ?? 0) + (editForm.otherFee ?? 0);
     let params: API.EditTaskSettlementOrderRosterCommand = {
       id: editForm.id,
-      settlementAmount: editForm.settlementAmount,
+      settlementAmount: settlementAmount,
       actualSettlementAmount: editForm.actualSettlementAmount,
       receiveAccount: editForm.receiveAccount,
       bank: editForm.bank,
-      totalWorkHours: editForm.totalWorkHours,
+      // totalWorkHours: editForm.totalWorkHours,
       // bankBranch: editForm.bankBranch,
+      serviceFee: editForm.serviceFee,
+      timeoutHours: editForm.timeoutHours,
+      timeoutFee: editForm.timeoutFee,
+      otherFee: editForm.otherFee,
+      remark: editForm.remark,
     };
     let res = await taskServices.editTaskSettlementOrderRoster(params);
     if (res) {
diff --git a/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue b/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
index 20fa244..46f73d7 100644
--- a/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
+++ b/src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
@@ -8,7 +8,7 @@
     :width="700"
   >
     <ProForm :model="form" ref="dialogForm" label-width="120px">
-      <template v-if="form.settlementAccess !== EnumEnterpriseWalletAccess.WeChatPay">
+      <template v-if="form.settlementAccess === EnumEnterpriseWalletAccess.PingAnPay">
         <ProFormItemV2
           label="鎵�灞為摱琛岋細"
           prop="bank"
@@ -35,15 +35,61 @@
         </ProFormItemV2>
       </template>
 
-      <ProFormItemV2 label="璋冩暣宸ユ椂锛�" prop="totalWorkHours">
+      <!-- <ProFormItemV2 label="璋冩暣宸ユ椂锛�" prop="totalWorkHours">
         <ProFormInputNumber
           placeholder="璇疯緭鍏ヨ皟鏁村伐鏃�"
           v-model.trim="form.totalWorkHours"
           :controls="false"
           :min="0"
         ></ProFormInputNumber>
+      </ProFormItemV2> -->
+      <ProFormItemV2 label="鏈嶅姟璐癸細" prop="serviceFee">
+        <ProFormInputNumber
+          placeholder="璇疯緭鍏ユ湇鍔¤垂锛�"
+          v-model.trim="form.serviceFee"
+          :controls="false"
+          :min="0"
+          disabled
+          unit="鍏�"
+        ></ProFormInputNumber>
       </ProFormItemV2>
-      <ProFormItemV2
+      <ProFormItemV2 label="瓒呮椂锛�" prop="timeoutHours">
+        <ProFormInputNumber
+          placeholder="璇疯緭鍏ヨ秴鏃讹細"
+          v-model.trim="form.timeoutHours"
+          :controls="false"
+          :min="0"
+          unit="灏忔椂"
+          @change="onTimeoutHoursChange"
+        ></ProFormInputNumber>
+      </ProFormItemV2>
+      <ProFormItemV2 label="瓒呮椂璐圭敤锛�" prop="timeoutFee">
+        <ProFormInputNumber
+          placeholder="璇疯緭鍏ヨ秴鏃惰垂鐢細"
+          v-model.trim="form.timeoutFee"
+          :controls="false"
+          :min="0"
+          unit="鍏�"
+        ></ProFormInputNumber>
+      </ProFormItemV2>
+      <ProFormItemV2 label="鍏朵粬璐圭敤锛�" prop="otherFee">
+        <ProFormInputNumber
+          placeholder="璇疯緭鍏ュ叾浠栬垂鐢細"
+          v-model.trim="form.otherFee"
+          :controls="false"
+          :min="0"
+          unit="鍏�"
+        ></ProFormInputNumber>
+      </ProFormItemV2>
+      <ProFormItemV2 label="缁撶畻閲戦锛�" prop="settlementAmount" mode="read">
+        <ProFormInputNumber
+          :modelValue="settlementAmount"
+          :controls="false"
+          :min="0"
+          unit="鍏�"
+        ></ProFormInputNumber>
+      </ProFormItemV2>
+      <!-- <ProFormItemV2
         label="缁撶畻閲戦锛�"
         prop="settlementAmount"
         :check-rules="[{ message: '璇疯緭鍏ョ粨绠楅噾棰�' }]"
@@ -54,7 +100,7 @@
           :controls="false"
           :min="0"
         ></ProFormInputNumber>
-      </ProFormItemV2>
+      </ProFormItemV2> -->
       <ProFormItemV2
         label="瀹炲彂閲戦锛�"
         prop="actualSettlementAmount"
@@ -65,7 +111,11 @@
           v-model.trim="form.actualSettlementAmount"
           :controls="false"
           :min="0"
+          unit="鍏�"
         ></ProFormInputNumber>
+      </ProFormItemV2>
+      <ProFormItemV2 label="澶囨敞锛�" prop="remark">
+        <ProFormTextArea placeholder="璇疯緭鍏ュ娉�" v-model="form.remark"></ProFormTextArea>
       </ProFormItemV2>
     </ProForm>
     <template #footer>
@@ -86,6 +136,7 @@
   ProFormItemV2,
   ProFormText,
   UploadUserFile,
+  ProFormTextArea,
 } from '@bole-core/components';
 import { EnumEnterpriseWalletAccess } from '@/constants';
 
@@ -97,12 +148,18 @@
   title?: string;
   id?: string;
   settlementAmount: number;
-  totalWorkHours: number;
+  // totalWorkHours: number;
   actualSettlementAmount: number;
   receiveAccount: string;
   bank: string;
   bankBranch?: string;
   settlementAccess: EnumEnterpriseWalletAccess;
+  timeoutServiceFee: number;
+  serviceFee: number;
+  timeoutHours: number;
+  timeoutFee: number;
+  otherFee: number;
+  remark: string;
 };
 
 const visible = defineModel({ type: Boolean });
@@ -114,6 +171,14 @@
   (e: 'onCancel'): void;
 }>();
 
+const settlementAmount = computed(
+  () => (form.value.timeoutFee ?? 0) + (form.value.serviceFee ?? 0) + (form.value.otherFee ?? 0)
+);
+
+function onTimeoutHoursChange(val: number) {
+  form.value.timeoutFee = form.value.timeoutServiceFee * val;
+}
+
 const dialogForm = ref<FormInstance>();
 
 function onDialogClose() {
diff --git a/src/views/ServiceChargeManage/constants/columns.ts b/src/views/ServiceChargeManage/constants/columns.ts
index b93b50c..11720b4 100644
--- a/src/views/ServiceChargeManage/constants/columns.ts
+++ b/src/views/ServiceChargeManage/constants/columns.ts
@@ -99,10 +99,30 @@
     enCode: 'receiveAccount',
     name: '鏀舵甯愭埛',
   },
+  // {
+  //   id: '7',
+  //   enCode: 'totalWorkHours',
+  //   name: '绱宸ユ椂锛堝皬鏃讹級',
+  // },
   {
-    id: '7',
-    enCode: 'totalWorkHours',
-    name: '绱宸ユ椂锛堝皬鏃讹級',
+    id: '7-1',
+    enCode: 'serviceFee',
+    name: '鏈嶅姟璐�',
+  },
+  {
+    id: '7-2',
+    enCode: 'timeoutHours',
+    name: '瓒呮椂',
+  },
+  {
+    id: '7-3',
+    enCode: 'timeoutFee',
+    name: '瓒呮椂璐圭敤',
+  },
+  {
+    id: '7-4',
+    enCode: 'otherFee',
+    name: '鍏朵粬璐圭敤',
   },
   {
     id: '8',
@@ -124,6 +144,11 @@
     enCode: 'settlementTime',
     name: '缁撶畻鏃堕棿',
   },
+  {
+    id: '12',
+    enCode: 'remark',
+    name: '澶囨敞',
+  },
 ]);
 
 export const BalanceManageColumns = defineColumns([

--
Gitblit v1.9.1