From 601f80076bb62e7b3213fda15cabe49eb4d60ccf Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 17 十月 2025 14:24:31 +0800
Subject: [PATCH] feat: 1.2.0.1
---
src/views/ServiceChargeManage/constants/columns.ts | 22 +
src/services/api/index.ts | 4
.eslintrc-auto-import.json | 2
src/services/api/typings.d.ts | 203 ++++++++++++++++++++++
src/views/UserManage/components/ResetPasswordDialog.vue | 71 +++++++
src/views/ServiceChargeManage/ServiceChargeManage.vue | 28 +++
auto-imports.d.ts | 6
src/constants/apiEnum.ts | 22 ++
src/views/ServiceChargeManage/components/EditSettleInfoDialog.vue | 97 ++++++++++
src/services/api/enterpriseWallet.ts | 18 ++
src/views/UserManage/UserManageList.vue | 54 +++++
src/views/UserManage/components/AddOrEditUserDialog.vue | 2
12 files changed, 512 insertions(+), 17 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 0a842b5..45dd5d6 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -68,9 +68,11 @@
"EnumSettlementCycleText": true,
"EnumSmsAccess": true,
"EnumSmsStatus": true,
+ "EnumTaskCheckReceiveMethod": true,
"EnumTaskCheckReceiveStatus": true,
"EnumTaskCheckReceiveStatusText": true,
"EnumTaskCheckReceiveStatusTextForFilter": true,
+ "EnumTaskPaymentMethod": true,
"EnumTaskRecommendStatus": true,
"EnumTaskRecommendStatusText": true,
"EnumTaskReleaseStatus": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index ddc517f..bd9c330 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -73,9 +73,11 @@
const EnumSmsAccess: typeof import('./src/constants/apiEnum')['EnumSmsAccess']
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 EnumTaskCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveStatus']
const EnumTaskCheckReceiveStatusText: typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusText']
const EnumTaskCheckReceiveStatusTextForFilter: typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusTextForFilter']
+ const EnumTaskPaymentMethod: typeof import('./src/constants/apiEnum')['EnumTaskPaymentMethod']
const EnumTaskRecommendStatus: typeof import('./src/constants/apiEnum')['EnumTaskRecommendStatus']
const EnumTaskRecommendStatusText: typeof import('./src/constants/task')['EnumTaskRecommendStatusText']
const EnumTaskReleaseStatus: typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']
@@ -276,7 +278,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, EnumTaskCheckReceiveStatus, 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, EnumTaskCheckReceiveStatus, 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, 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'
import('./src/constants/apiEnum')
// @ts-ignore
export type { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic'
@@ -376,9 +378,11 @@
readonly EnumSettlementCycleText: UnwrapRef<typeof import('./src/constants/task')['EnumSettlementCycleText']>
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 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']>
+ readonly EnumTaskPaymentMethod: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskPaymentMethod']>
readonly EnumTaskRecommendStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskRecommendStatus']>
readonly EnumTaskRecommendStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskRecommendStatusText']>
readonly EnumTaskReleaseStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index b3342dd..b901d56 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -11,6 +11,8 @@
Hour = 30,
/**璁′欢 */
Piece = 40,
+ /**闈㈣ */
+ Face = 50,
}
/** 瀹㈡埛绔被鍨� */
@@ -441,6 +443,14 @@
Fail = 30,
}
+/** 浠诲姟楠屾敹鏂瑰紡 */
+export enum EnumTaskCheckReceiveMethod {
+ /**浜哄伐绛惧埌 */
+ CheckIn = 10,
+ /**鑷富鎻愪氦 */
+ Submit = 20,
+}
+
/** 浠诲姟缁撶畻鐘舵�� */
export enum EnumTaskCheckReceiveStatus {
/**寰呮彁浜� */
@@ -449,6 +459,14 @@
WaitCheckReceive = 20,
/**宸查獙鏀� */
Completed = 30,
+}
+
+/** 浠诲姟鍙戞斁鏂瑰紡 */
+export enum EnumTaskPaymentMethod {
+ /**鐩存帴鍙戞斁 */
+ Direct = 10,
+ /**鎻愮幇鍙戞斁 */
+ Withdraw = 20,
}
/** 浠诲姟鎺ㄨ崘鐘舵�� */
@@ -531,9 +549,9 @@
export enum EnumTaskUserSubmitCheckReceiveStatus {
/**寰呮彁浜� */
WaitSubmit = 10,
- /**寰呴獙鏀� */
+ /**寰呴獙鏀�/鏈埌宀� */
WaitCheckReceive = 20,
- /**楠屾敹閫氳繃 */
+ /**楠屾敹閫氳繃/宸茬鍒� */
Success = 30,
/**楠屾敹鏈�氳繃 */
Fail = 40,
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
index 917fced..3ad6a31 100644
--- a/src/services/api/enterpriseWallet.ts
+++ b/src/services/api/enterpriseWallet.ts
@@ -259,6 +259,24 @@
);
}
+/** 鏌ヨ浼佷笟閽卞寘浣欓 POST /api/user/enterpriseWallet/getEnterpriseWalletBalances */
+export async function getEnterpriseWalletBalances(
+ body: API.GetEnterpriseWalletBalancesQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetEnterpriseWalletBalancesQueryResult>(
+ '/api/user/enterpriseWallet/getEnterpriseWalletBalances',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠ｈ繘浠跺崟璇︽儏 GET /api/user/enterpriseWallet/getEnterpriseWalletExpandindirectOrder */
export async function getEnterpriseWalletExpandindirectOrder(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 7c4bd7f..aa1fd08 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -11,7 +11,6 @@
import * as resource from './resource';
import * as enterpriseWallet from './enterpriseWallet';
import * as dictionary from './dictionary';
-import * as settings from './settings';
import * as codeUrl from './codeUrl';
import * as electronSign from './electronSign';
import * as userResume from './userResume';
@@ -23,6 +22,7 @@
import * as menu from './menu';
import * as fileUtils from './fileUtils';
import * as userWallet from './userWallet';
+import * as settings from './settings';
import * as syncDatabase from './syncDatabase';
export default {
enterpriseEmployee,
@@ -34,7 +34,6 @@
resource,
enterpriseWallet,
dictionary,
- settings,
codeUrl,
electronSign,
userResume,
@@ -46,5 +45,6 @@
menu,
fileUtils,
userWallet,
+ settings,
syncDatabase,
};
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index b56cf10..f903ae2 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -583,6 +583,8 @@
Hour = 30,
/**璁′欢 */
Piece = 40,
+ /**闈㈣ */
+ Face = 50,
}
enum EnumClientType {
@@ -976,6 +978,13 @@
Fail = 30,
}
+ enum EnumTaskCheckReceiveMethod {
+ /**浜哄伐绛惧埌 */
+ CheckIn = 10,
+ /**鑷富鎻愪氦 */
+ Submit = 20,
+ }
+
enum EnumTaskCheckReceiveStatus {
/**寰呮彁浜� */
WaitSubmit = 10,
@@ -983,6 +992,13 @@
WaitCheckReceive = 20,
/**宸查獙鏀� */
Completed = 30,
+ }
+
+ enum EnumTaskPaymentMethod {
+ /**鐩存帴鍙戞斁 */
+ Direct = 10,
+ /**鎻愮幇鍙戞斁 */
+ Withdraw = 20,
}
enum EnumTaskRecommendStatus {
@@ -1056,9 +1072,9 @@
enum EnumTaskUserSubmitCheckReceiveStatus {
/**寰呮彁浜� */
WaitSubmit = 10,
- /**寰呴獙鏀� */
+ /**寰呴獙鏀�/鏈埌宀� */
WaitCheckReceive = 20,
- /**楠屾敹閫氳繃 */
+ /**楠屾敹閫氳繃/宸茬鍒� */
Success = 30,
/**楠屾敹鏈�氳繃 */
Fail = 40,
@@ -1665,6 +1681,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetEnterpriseSmsSettingQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetEnterpriseWalletBalancesQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetEnterpriseWalletBalancesQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -3352,11 +3386,23 @@
billingMethod?: EnumBillingMethod;
/** 鏈嶅姟璐� */
serviceFee?: number;
+ /** 鏍稿畾宸ユ椂 */
+ verifyWorkHours?: number;
+ /** 瓒呮椂鏈嶅姟璐� */
+ timeoutServiceFee?: number;
settlementCycle?: EnumSettlementCycle;
/** 浠诲姟寮�濮嬫椂闂� */
beginTime?: string;
/** 浠诲姟缁撴潫鏃堕棿 */
endTime?: string;
+ /** 鎶ュ悕寮�濮嬫椂闂� */
+ applyBeginTime?: string;
+ /** 鎶ュ悕缁撴潫鏃堕棿 */
+ applyEndTime?: string;
+ checkReceiveMethod?: EnumTaskCheckReceiveMethod;
+ paymentMethod?: EnumTaskPaymentMethod;
+ /** 浠诲姟鎻忚堪 */
+ description?: string;
/** 浠诲姟鍦扮偣鍚嶇О */
addressName?: string;
}
@@ -3390,6 +3436,10 @@
billingMethod?: EnumBillingMethod;
/** 鏈嶅姟璐� */
serviceFee?: number;
+ /** 鏍稿畾宸ユ椂 */
+ verifyWorkHours?: number;
+ /** 瓒呮椂鏈嶅姟璐� */
+ timeoutServiceFee?: number;
settlementCycle?: EnumSettlementCycle;
/** 鍙戝竷鏃堕棿 */
createdTime?: string;
@@ -3397,6 +3447,14 @@
beginTime?: string;
/** 浠诲姟缁撴潫鏃堕棿 */
endTime?: string;
+ /** 鎶ュ悕寮�濮嬫椂闂� */
+ applyBeginTime?: string;
+ /** 鎶ュ悕缁撴潫鏃堕棿 */
+ applyEndTime?: string;
+ checkReceiveMethod?: EnumTaskCheckReceiveMethod;
+ paymentMethod?: EnumTaskPaymentMethod;
+ /** 浠诲姟鎻忚堪 */
+ description?: string;
/** 浠诲姟鍦扮偣鍚嶇О */
addressName?: string;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
@@ -4090,6 +4148,34 @@
access?: EnumEnterpriseWalletAccess;
}
+ interface GetEnterpriseWalletBalancesQuery {
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetEnterpriseWalletBalancesQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetEnterpriseWalletBalancesQueryResultItem[];
+ }
+
+ interface GetEnterpriseWalletBalancesQueryResultItem {
+ /** 閽卞寘Id */
+ id?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ access?: EnumEnterpriseWalletAccess;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 璐﹀彿 */
+ identity?: string;
+ /** 浣欓 */
+ balance?: number;
+ }
+
interface GetEnterpriseWalletExpandindirectOrderQueryResult {
/** 鍗曞彿 */
outBizNo?: string;
@@ -4692,9 +4778,21 @@
beginTime?: string;
/** 浠诲姟缁撴潫鏃堕棿 */
endTime?: string;
+ /** 鎶ュ悕寮�濮嬫椂闂� */
+ applyBeginTime?: string;
+ /** 鎶ュ悕缁撴潫鏃堕棿 */
+ applyEndTime?: string;
+ checkReceiveMethod?: EnumTaskCheckReceiveMethod;
+ paymentMethod?: EnumTaskPaymentMethod;
+ /** 浠诲姟鎻忚堪 */
+ description?: string;
billingMethod?: EnumBillingMethod;
/** 鏈嶅姟璐� */
serviceFee?: number;
+ /** 鏍稿畾宸ユ椂 */
+ verifyWorkHours?: number;
+ /** 瓒呮椂鏈嶅姟璐� */
+ timeoutServiceFee?: number;
settlementCycle?: EnumSettlementCycle;
/** 绂忓埄 */
benefits?: GetTaskInfoQueryResultBenefit[];
@@ -4729,9 +4827,21 @@
beginTime?: string;
/** 浠诲姟缁撴潫鏃堕棿 */
endTime?: string;
+ /** 鎶ュ悕寮�濮嬫椂闂� */
+ applyBeginTime?: string;
+ /** 鎶ュ悕缁撴潫鏃堕棿 */
+ applyEndTime?: string;
+ checkReceiveMethod?: EnumTaskCheckReceiveMethod;
+ paymentMethod?: EnumTaskPaymentMethod;
+ /** 浠诲姟鎻忚堪 */
+ description?: string;
billingMethod?: EnumBillingMethod;
/** 鏈嶅姟璐� */
serviceFee?: number;
+ /** 鏍稿畾宸ユ椂 */
+ verifyWorkHours?: number;
+ /** 瓒呮椂鏈嶅姟璐� */
+ timeoutServiceFee?: number;
settlementCycle?: EnumSettlementCycle;
/** 绂忓埄 */
benefits?: GetTaskInfoQueryResultBenefit[];
@@ -4759,9 +4869,21 @@
beginTime?: string;
/** 浠诲姟缁撴潫鏃堕棿 */
endTime?: string;
+ /** 鎶ュ悕寮�濮嬫椂闂� */
+ applyBeginTime?: string;
+ /** 鎶ュ悕缁撴潫鏃堕棿 */
+ applyEndTime?: string;
+ checkReceiveMethod?: EnumTaskCheckReceiveMethod;
+ paymentMethod?: EnumTaskPaymentMethod;
+ /** 浠诲姟鎻忚堪 */
+ description?: string;
billingMethod?: EnumBillingMethod;
/** 鏈嶅姟璐� */
serviceFee?: number;
+ /** 鏍稿畾宸ユ椂 */
+ verifyWorkHours?: number;
+ /** 瓒呮椂鏈嶅姟璐� */
+ timeoutServiceFee?: number;
settlementCycle?: EnumSettlementCycle;
/** 绂忓埄 */
benefits?: GetTaskInfoQueryResultBenefit[];
@@ -5047,6 +5169,9 @@
}
interface GetPersonalUserTransactionsQuery {
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ transactionStatus?: EnumWalletTransactionStatus;
/** 鍒涘缓鏃堕棿-璧峰 */
createdTimeStart?: string;
/** 鍒涘缓鏃堕棿-鎴 */
@@ -5054,6 +5179,8 @@
type?: EnumUserWalletTransactionType;
/** 鐢ㄦ埛Id */
userId?: string;
+ /** 浼佷笟閽卞寘Id */
+ enterpriseWalletId?: string;
pageModel?: PagedListQueryPageModel;
}
@@ -5068,6 +5195,8 @@
/** 鏀舵敮Id */
id?: string;
type?: EnumUserWalletTransactionType;
+ /** 璁㈠崟鍙� */
+ code?: string;
/** 鏍囬 */
title?: string;
/** 閲戦 */
@@ -5097,13 +5226,20 @@
receiveAccount?: string;
/** 鏀舵浜哄悕绉� */
receiveName?: string;
+ /** 鎵嬫満鍙� */
+ receiveContactPhoneNumber?: string;
/** 鏀舵浜鸿韩浠借瘉鍙� */
receiveIdentity?: string;
+ transactionStatus?: EnumWalletTransactionStatus;
/** 鐢ㄩ�� */
purpose?: string;
- /** 鍒涘缓鏃堕棿 */
+ /** 鍒涘缓鏃堕棿/鎻愮幇 */
createdTime?: string;
- /** 浜ゆ槗鏃堕棿 */
+ /** 鍙戞斁鏃堕棿 */
+ sendTime?: string;
+ /** 鐢靛瓙鏀舵嵁涓嬭浇閾炬帴 */
+ ereceiptDownloadOssUrl?: string;
+ /** 浜ゆ槗鏃堕棿/鍒拌处鏃堕棿 */
transDate?: string;
}
@@ -5112,6 +5248,23 @@
sumIncome?: number;
/** 鎬绘彁鐜� */
sumWithdraw?: number;
+ enterpriseWallet?: GetPersonalUserTransactionsQueryResultObjectDataEnterpriseWallet;
+ }
+
+ interface GetPersonalUserTransactionsQueryResultObjectDataEnterpriseWallet {
+ /** 閽卞寘Id */
+ id?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ access?: EnumEnterpriseWalletAccess;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 璐﹀彿 */
+ identity?: string;
+ /** 浣欓 */
+ balance?: number;
}
interface GetPersonalUserWalletBalancesQuery {
@@ -5562,6 +5715,10 @@
billingMethod?: EnumBillingMethod;
/** 鏈嶅姟璐� */
serviceFee?: number;
+ /** 鏍稿畾宸ユ椂 */
+ verifyWorkHours?: number;
+ /** 瓒呮椂鏈嶅姟璐� */
+ timeoutServiceFee?: number;
settlementCycle?: EnumSettlementCycle;
/** 缁撶畻鏃ユ湡 */
settlementDate?: number;
@@ -5594,6 +5751,14 @@
beginTime?: string;
/** 浠诲姟缁撴潫鏃堕棿 */
endTime?: string;
+ /** 鎶ュ悕寮�濮嬫椂闂� */
+ applyBeginTime?: string;
+ /** 鎶ュ悕缁撴潫鏃堕棿 */
+ applyEndTime?: string;
+ checkReceiveMethod?: EnumTaskCheckReceiveMethod;
+ paymentMethod?: EnumTaskPaymentMethod;
+ /** 浠诲姟鎻忚堪 */
+ description?: string;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
/** 鏄惁宸叉敹钘� */
@@ -5686,6 +5851,10 @@
billingMethod?: EnumBillingMethod;
/** 鏈嶅姟璐� */
serviceFee?: number;
+ /** 鏍稿畾宸ユ椂 */
+ verifyWorkHours?: number;
+ /** 瓒呮椂鏈嶅姟璐� */
+ timeoutServiceFee?: number;
settlementCycle?: EnumSettlementCycle;
/** 绂忓埄 */
benefits?: GetTaskInfoQueryResultBenefit[];
@@ -5715,6 +5884,14 @@
beginTime?: string;
/** 浠诲姟缁撴潫鏃堕棿 */
endTime?: string;
+ /** 鎶ュ悕寮�濮嬫椂闂� */
+ applyBeginTime?: string;
+ /** 鎶ュ悕缁撴潫鏃堕棿 */
+ applyEndTime?: string;
+ checkReceiveMethod?: EnumTaskCheckReceiveMethod;
+ paymentMethod?: EnumTaskPaymentMethod;
+ /** 浠诲姟鎻忚堪 */
+ description?: string;
releaseStatus?: EnumTaskReleaseStatus;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
recommendStatus?: EnumTaskRecommendStatus;
@@ -5951,6 +6128,8 @@
weight?: number;
/** 鐢熸椿鐓� */
photos?: string[];
+ /** 鐢熸椿鐓� */
+ videos?: string[];
}
type GetUserResumeJobSeekingQuery = Record<string, any>;
@@ -6050,6 +6229,8 @@
weight?: number;
/** 鐢熸椿鐓� */
photos?: string[];
+ /** 鐢熸椿鐓� */
+ videos?: string[];
/** 缁忓巻 */
taskInfoUsers?: GetUserResumeQueryResultExperience[];
/** 鏄惁宸叉敹钘� */
@@ -6889,6 +7070,10 @@
billingMethod: EnumBillingMethod;
/** 鏈嶅姟璐� */
serviceFee: number;
+ /** 鏍稿畾宸ユ椂 */
+ verifyWorkHours?: number;
+ /** 瓒呮椂鏈嶅姟璐� */
+ timeoutServiceFee?: number;
settlementCycle: EnumSettlementCycle;
/** 缁撶畻鏃ユ湡 */
settlementDate: number;
@@ -6917,6 +7102,14 @@
beginTime: string;
/** 浠诲姟缁撴潫鏃堕棿 */
endTime: string;
+ /** 鎶ュ悕寮�濮嬫椂闂� */
+ applyBeginTime?: string;
+ /** 鎶ュ悕缁撴潫鏃堕棿 */
+ applyEndTime?: string;
+ checkReceiveMethod?: EnumTaskCheckReceiveMethod;
+ paymentMethod?: EnumTaskPaymentMethod;
+ /** 浠诲姟鎻忚堪 */
+ description?: string;
/** Id */
id?: string;
}
@@ -6967,6 +7160,8 @@
weight?: number;
/** 鐢熸椿鐓� */
photos?: string[];
+ /** 涓汉瑙嗛 */
+ videos?: string[];
}
interface SaveUserResumeJobSeekingCommand {
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index 4555ec4..b0f30e4 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -91,6 +91,7 @@
<!-- <SettleDetailDialog v-bind="dialogSettleProps" /> -->
<RechargeEnterpriseWalletDialog v-bind="dialogRechargeProps" />
<SettlMethodDialog v-bind="dialogSettlMethodProps" />
+ <EditSettleInfoDialog v-bind="dialogSettleInfoProps" />
</LoadingLayout>
</template>
@@ -188,6 +189,19 @@
role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
),
},
+ },
+ {
+ data: {
+ enCode: 'settleAuditBtn',
+ name: '缁撶畻瀹℃牳',
+ },
+ emits: {
+ onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
+ },
+ // extraProps: {
+ // hide: (role: API.GetSettlementTasksQueryResultItem) =>
+ // role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait,
+ // },
},
{
data: {
@@ -452,4 +466,18 @@
'缁撶畻鍗曟ā鏉�'
);
}
+
+const {
+ dialogProps: dialogSettleInfoProps,
+ handleEdit: handleSettleInfoEdit,
+ editForm: settleInfoEditForm,
+} = useFormDialog({
+ onConfirm: handleSettleInfo,
+ defaultFormParams: {
+ id: '',
+ actualSettlementAmount: 0,
+ },
+});
+
+async function handleSettleInfo() {}
</script>
diff --git a/src/views/ServiceChargeManage/components/EditSettleInfoDialog.vue b/src/views/ServiceChargeManage/components/EditSettleInfoDialog.vue
new file mode 100644
index 0000000..0d87fed
--- /dev/null
+++ b/src/views/ServiceChargeManage/components/EditSettleInfoDialog.vue
@@ -0,0 +1,97 @@
+<template>
+ <ProDialog
+ title="缂栬緫"
+ v-model="visible"
+ @close="onDialogClose"
+ destroy-on-close
+ draggable
+ :width="700"
+ >
+ <ProForm :model="form" ref="dialogForm" label-width="120px">
+ <ProFormItemV2
+ label="璋冩暣宸ユ椂锛�"
+ prop="actualSettlementAmount"
+ :check-rules="[{ message: '璇疯緭鍏ヨ皟鏁村伐鏃�' }]"
+ >
+ <ProFormInputNumber
+ placeholder="璇疯緭鍏ヨ皟鏁村伐鏃�"
+ v-model.trim="form.actualSettlementAmount"
+ :controls="false"
+ :min="0"
+ ></ProFormInputNumber>
+ </ProFormItemV2>
+ <ProFormItemV2
+ label="缁撶畻閲戦锛�"
+ prop="actualSettlementAmount"
+ :check-rules="[{ message: '璇疯緭鍏ョ粨绠楅噾棰�' }]"
+ >
+ <ProFormInputNumber
+ placeholder="璇疯緭鍏ョ粨绠楅噾棰�"
+ v-model.trim="form.actualSettlementAmount"
+ :controls="false"
+ :min="0"
+ ></ProFormInputNumber>
+ </ProFormItemV2>
+ <ProFormItemV2
+ label="瀹炲彂閲戦锛�"
+ prop="actualSettlementAmount"
+ :check-rules="[{ message: '璇疯緭鍏ュ疄鍙戦噾棰�' }]"
+ >
+ <ProFormInputNumber
+ placeholder="璇疯緭鍏ュ疄鍙戦噾棰�"
+ v-model.trim="form.actualSettlementAmount"
+ :controls="false"
+ :min="0"
+ ></ProFormInputNumber>
+ </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, ProFormInputNumber, ProFormItemV2 } from '@bole-core/components';
+
+defineOptions({
+ name: 'EditAccountInfoDialog',
+});
+
+type Form = {
+ title?: string;
+ id?: string;
+ actualSettlementAmount: number;
+};
+
+const visible = defineModel({ type: Boolean });
+
+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>
diff --git a/src/views/ServiceChargeManage/constants/columns.ts b/src/views/ServiceChargeManage/constants/columns.ts
index a7005c6..bda1da9 100644
--- a/src/views/ServiceChargeManage/constants/columns.ts
+++ b/src/views/ServiceChargeManage/constants/columns.ts
@@ -43,21 +43,26 @@
},
{
id: '9',
+ enCode: 'settlementAmount',
+ name: '瀹℃牳鐘舵��',
+ },
+ {
+ id: '10',
enCode: 'settlementStatus',
name: '缁撶畻鐘舵��',
},
{
- id: '10',
+ id: '11',
enCode: 'createdTime',
name: '鍒涘缓鏃堕棿',
},
{
- id: '11',
+ id: '12',
enCode: 'settlementTime',
name: '缁撶畻鏃堕棿',
},
{
- id: '12',
+ id: '13',
enCode: 'settlementRemark',
name: '澶囨敞',
},
@@ -96,21 +101,26 @@
},
{
id: '7',
+ enCode: 'receiveAccount',
+ name: '绱宸ワ紙灏忔椂锛�',
+ },
+ {
+ id: '8',
enCode: 'settlementAmount',
name: '缁撶畻閲戦',
},
{
- id: '8',
+ id: '9',
enCode: 'actualSettlementAmount',
name: '瀹炲彂閲戦',
},
{
- id: '9',
+ id: '10',
enCode: 'settlementReceiveStatus',
name: '鍒拌处鐘舵��',
},
{
- id: '10',
+ id: '11',
enCode: 'settlementTime',
name: '缁撶畻鏃堕棿',
},
diff --git a/src/views/UserManage/UserManageList.vue b/src/views/UserManage/UserManageList.vue
index 3ea919e..898903f 100644
--- a/src/views/UserManage/UserManageList.vue
+++ b/src/views/UserManage/UserManageList.vue
@@ -25,6 +25,7 @@
</ProTableV2>
</AppContainer>
<AddOrEditUserDialog v-bind="dialogProps" />
+ <ResetPasswordDialog v-bind="resetPasswordDialogProps"></ResetPasswordDialog>
</LoadingLayout>
</template>
@@ -46,6 +47,7 @@
import { ModelValueType } from 'element-plus';
import { Message } from '@bole-core/core';
import AddOrEditUserDialog from './components/AddOrEditUserDialog.vue';
+import ResetPasswordDialog from './components/ResetPasswordDialog.vue';
defineOptions({
name: 'UserManageList',
@@ -59,6 +61,18 @@
},
emits: {
onClick: (role) => openDialog(role),
+ },
+ },
+ {
+ data: {
+ enCode: 'resetPasswordBtn',
+ name: '閲嶇疆瀵嗙爜',
+ },
+ props: {
+ type: 'danger',
+ },
+ emits: {
+ onClick: (role) => openResetPasswordDialog(role),
},
},
]);
@@ -124,6 +138,7 @@
userName: '',
phoneNumber: '',
remark: '',
+ status: '' as any as EnumUserStatus,
roleIds: [] as string[],
password: '',
},
@@ -138,6 +153,7 @@
phoneNumber: row.phoneNumber,
remark: row.remark,
roleIds: row.roles?.map((x) => x.id) ?? [],
+ status: row.status,
password: '',
});
} else {
@@ -152,10 +168,13 @@
name: editForm.name,
userName: editForm.userName,
phoneNumber: editForm.phoneNumber,
- password: editForm.password,
roleIds: editForm.roleIds,
remark: editForm.remark,
+ status: editForm.status ? editForm.status : EnumUserStatus.Normal,
};
+ if (!editForm.id) {
+ params.password = editForm.password;
+ }
if (editForm.id) {
params.id = editForm.id;
}
@@ -167,4 +186,37 @@
}
} catch (error) {}
}
+
+const {
+ dialogProps: resetPasswordDialogProps,
+ handleAdd: handleResetPasswordAdd,
+ editForm: resetPasswordEditForm,
+} = useFormDialog({
+ onConfirm: resetPassword,
+ defaultFormParams: {
+ ids: '',
+ password: '',
+ },
+});
+
+function openResetPasswordDialog(row: API.GetOperationUserInfosQueryResultItem) {
+ handleResetPasswordAdd({
+ ids: row.id,
+ password: '',
+ });
+}
+
+async function resetPassword() {
+ try {
+ let params: API.ResetUserPasswordsCommand = {
+ ids: [resetPasswordEditForm.ids],
+ password: resetPasswordEditForm.password,
+ };
+ let res = await userServices.resetUserPasswords(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ getList(paginationState.pageIndex);
+ }
+ } catch (error) {}
+}
</script>
diff --git a/src/views/UserManage/components/AddOrEditUserDialog.vue b/src/views/UserManage/components/AddOrEditUserDialog.vue
index 47e23b2..4282771 100644
--- a/src/views/UserManage/components/AddOrEditUserDialog.vue
+++ b/src/views/UserManage/components/AddOrEditUserDialog.vue
@@ -82,7 +82,7 @@
phoneNumber: string;
remark: string;
roleIds: string[];
- password: string;
+ password?: string;
};
};
diff --git a/src/views/UserManage/components/ResetPasswordDialog.vue b/src/views/UserManage/components/ResetPasswordDialog.vue
new file mode 100644
index 0000000..f622c4f
--- /dev/null
+++ b/src/views/UserManage/components/ResetPasswordDialog.vue
@@ -0,0 +1,71 @@
+<template>
+ <ProDialog
+ :title="form.title"
+ v-model="visible"
+ @close="onDialogClose"
+ destroy-on-close
+ draggable
+ :width="800"
+ >
+ <ProForm :model="form" ref="dialogForm" label-width="120px">
+ <ProFormItemV2 label="瀵嗙爜:" prop="password" :check-rules="[{ message: '璇疯緭鍏ュ瘑鐮�' }]">
+ <ProFormText
+ placeholder="璇疯緭鍏ュ瘑鐮�"
+ v-model.trim="form.password"
+ :maxlength="30"
+ ></ProFormText>
+ </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 } from '@bole-core/components';
+
+defineOptions({
+ name: 'ResetPasswordDialog',
+});
+
+// type Props = {};
+
+// const props = withDefaults(defineProps<Props>(), {});
+
+const visible = defineModel({ type: Boolean });
+
+type Form = {
+ title?: string;
+ ids: string;
+ password: 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