From 819e86bb37d0802d500fe6bc52343abda31c3315 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 31 十月 2025 09:19:09 +0800
Subject: [PATCH] feat: 1.3
---
src/hooks/supplier.ts | 21 +
src/views/ServiceChargeManage/constants/columns.ts | 45 +
src/views/SupplierManage/constants/columns.ts | 22
src/views/EmploymentManage/constants/columns.ts | 6
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 12
.eslintrc-auto-import.json | 7
src/services/api/typings.d.ts | 378 ++++++++++++++++++++++
src/store/modules/user.ts | 1
src/views/ServiceChargeManage/ServiceChargeManage.vue | 48 +-
src/views/FinanceManage/components/DistributionDetailView.vue | 1
src/hooks/index.ts | 1
src/services/api/enterprise.ts | 86 +++++
src/services/api/task.ts | 15
src/services/api/index.ts | 28
src/views/FinanceManage/constants/columns.ts | 42 +
src/views/SupplierManage/SupplierManageList.vue | 28 +
src/constants/supplier.ts | 9
auto-imports.d.ts | 16
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue | 31 +
src/router/index.ts | 164 ++++----
src/constants/apiEnum.ts | 36 ++
src/constants/index.ts | 1
src/constants/app.ts | 1
23 files changed, 817 insertions(+), 182 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 5a6af36..76284bd 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -30,9 +30,14 @@
"EnumDbAuditOperate": true,
"EnumElectronSignAccess": true,
"EnumElectronSignVerifyType": true,
+ "EnumEnterpriseCooperationSignStatus": true,
+ "EnumEnterpriseCooperationSignStatusText": true,
+ "EnumEnterpriseCooperationStatus": true,
+ "EnumEnterpriseCooperationStatusText": true,
"EnumEnterpriseCostStatus": true,
"EnumEnterpriseCostType": true,
"EnumEnterpriseRealMethod": true,
+ "EnumEnterpriseType": true,
"EnumEnterpriseWalletAccess": true,
"EnumEnterpriseWalletAccessText": true,
"EnumEnterpriseWalletAccessTextForSettle": true,
@@ -73,6 +78,7 @@
"EnumSettlementCycleText": true,
"EnumSmsAccess": true,
"EnumSmsStatus": true,
+ "EnumTaskApplyStatus": true,
"EnumTaskCheckReceiveMethod": true,
"EnumTaskCheckReceiveMethodText": true,
"EnumTaskCheckReceiveStatus": true,
@@ -260,6 +266,7 @@
"useEnterpriseContractTemplateSelect": true,
"useEnterpriseWalletAccessSelect": true,
"useGetDictionaryCategorySelect": true,
+ "useGetSupplierEnterpriseSelect": true,
"useGlobalEventContext": true,
"useGlobalEventProvide": true,
"useGroupColumns": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index e31e30b..88d6749 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -33,9 +33,14 @@
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 EnumEnterpriseCooperationSignStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationSignStatus']
+ const EnumEnterpriseCooperationSignStatusText: typeof import('./src/constants/supplier')['EnumEnterpriseCooperationSignStatusText']
+ const EnumEnterpriseCooperationStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationStatus']
+ const EnumEnterpriseCooperationStatusText: typeof import('./src/constants/supplier')['EnumEnterpriseCooperationStatusText']
const EnumEnterpriseCostStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseCostStatus']
const EnumEnterpriseCostType: typeof import('./src/constants/apiEnum')['EnumEnterpriseCostType']
const EnumEnterpriseRealMethod: typeof import('./src/constants/apiEnum')['EnumEnterpriseRealMethod']
+ const EnumEnterpriseType: typeof import('./src/constants/apiEnum')['EnumEnterpriseType']
const EnumEnterpriseWalletAccess: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']
const EnumEnterpriseWalletAccessText: typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletAccessText']
const EnumEnterpriseWalletAccessTextForSettle: typeof import('./src/constants/task')['EnumEnterpriseWalletAccessTextForSettle']
@@ -78,6 +83,7 @@
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 EnumTaskApplyStatus: typeof import('./src/constants/apiEnum')['EnumTaskApplyStatus']
const EnumTaskCheckReceiveMethod: typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveMethod']
const EnumTaskCheckReceiveMethodText: typeof import('./src/constants/task')['EnumTaskCheckReceiveMethodText']
const EnumTaskCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveStatus']
@@ -249,6 +255,7 @@
const useEnterpriseContractTemplateSelect: typeof import('./src/hooks/sign')['useEnterpriseContractTemplateSelect']
const useEnterpriseWalletAccessSelect: typeof import('./src/hooks/settlement')['useEnterpriseWalletAccessSelect']
const useGetDictionaryCategorySelect: typeof import('./src/hooks/dic')['useGetDictionaryCategorySelect']
+ const useGetSupplierEnterpriseSelect: typeof import('./src/hooks/supplier')['useGetSupplierEnterpriseSelect']
const useGlobalEventContext: typeof import('./src/hooks/useEvent')['useGlobalEventContext']
const useGlobalEventProvide: typeof import('./src/hooks/useEvent')['useGlobalEventProvide']
const useGroupColumns: typeof import('./src/hooks/useAccess')['useGroupColumns']
@@ -289,7 +296,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, EnumGetArrangeTaskUsersQueryApplyStatus, EnumGetCheckReceiveTaskCheckInUsersQueryStatus, EnumGetCheckReceiveTasksQueryResultItemCheckStatus, 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, EnumGetCheckReceiveTaskCheckInUsersQueryStatus, EnumGetCheckReceiveTasksQueryResultItemCheckStatus, 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'
+ export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCooperationSignStatus, EnumEnterpriseCooperationStatus, EnumEnterpriseCostStatus, EnumEnterpriseCostType, 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, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCooperationSignStatus, EnumEnterpriseCooperationStatus, EnumEnterpriseCostStatus, EnumEnterpriseCostType, 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, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic'
@@ -351,9 +358,14 @@
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 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']>
+ readonly EnumEnterpriseCooperationStatusText: UnwrapRef<typeof import('./src/constants/supplier')['EnumEnterpriseCooperationStatusText']>
readonly EnumEnterpriseCostStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCostStatus']>
readonly EnumEnterpriseCostType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCostType']>
readonly EnumEnterpriseRealMethod: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseRealMethod']>
+ readonly EnumEnterpriseType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseType']>
readonly EnumEnterpriseWalletAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']>
readonly EnumEnterpriseWalletAccessText: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletAccessText']>
readonly EnumEnterpriseWalletAccessTextForSettle: UnwrapRef<typeof import('./src/constants/task')['EnumEnterpriseWalletAccessTextForSettle']>
@@ -394,6 +406,7 @@
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 EnumTaskApplyStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskApplyStatus']>
readonly EnumTaskCheckReceiveMethod: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveMethod']>
readonly EnumTaskCheckReceiveMethodText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskCheckReceiveMethodText']>
readonly EnumTaskCheckReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveStatus']>
@@ -559,6 +572,7 @@
readonly useEnterpriseContractTemplateSelect: UnwrapRef<typeof import('./src/hooks/sign')['useEnterpriseContractTemplateSelect']>
readonly useEnterpriseWalletAccessSelect: UnwrapRef<typeof import('./src/hooks/settlement')['useEnterpriseWalletAccessSelect']>
readonly useGetDictionaryCategorySelect: UnwrapRef<typeof import('./src/hooks/dic')['useGetDictionaryCategorySelect']>
+ readonly useGetSupplierEnterpriseSelect: UnwrapRef<typeof import('./src/hooks/supplier')['useGetSupplierEnterpriseSelect']>
readonly useGlobalEventContext: UnwrapRef<typeof import('./src/hooks/useEvent')['useGlobalEventContext']>
readonly useGlobalEventProvide: UnwrapRef<typeof import('./src/hooks/useEvent')['useGlobalEventProvide']>
readonly useGroupColumns: UnwrapRef<typeof import('./src/hooks/useAccess')['useGroupColumns']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 1f65500..4a29a7f 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -101,6 +101,22 @@
Face = 20,
}
+/** 绛剧害鐘舵�� */
+export enum EnumEnterpriseCooperationSignStatus {
+ /**鏈绾� */
+ None = 10,
+ /**宸茬绾� */
+ Completed = 20,
+}
+
+/** 浼佷笟鍚堜綔鐘舵�� */
+export enum EnumEnterpriseCooperationStatus {
+ /**鏈悎浣� */
+ None = 10,
+ /**宸插悎浣� */
+ Completed = 20,
+}
+
/** 浼佷笟鐢ㄩ噺鎵h垂鐘舵�� */
export enum EnumEnterpriseCostStatus {
/**鎵h垂鎴愬姛 */
@@ -123,6 +139,14 @@
Identity3 = 10,
/**浼佷笟鍥涜绱� */
Identity4 = 20,
+}
+
+/** 浼佷笟绫诲瀷 */
+export enum EnumEnterpriseType {
+ /**渚涘簲鍟� */
+ Supplier = 0,
+ /**鐢叉柟浼佷笟 */
+ PartyA = 1,
}
/** 浼佷笟閽卞寘閫氶亾 */
@@ -465,6 +489,16 @@
Success = 20,
/**鍙戦�佸け璐� */
Fail = 30,
+}
+
+/** 浠诲姟鎶ュ悕鐘舵�� */
+export enum EnumTaskApplyStatus {
+ /**寰呭紑濮� */
+ Wait = 10,
+ /**杩涜涓� */
+ InProcess = 20,
+ /**宸茬粨鏉� */
+ End = 21,
}
/** 浠诲姟楠屾敹鏂瑰紡 */
@@ -837,6 +871,8 @@
WaitHire = 10,
/**寰呯绾� */
WaitSignContract = 20,
+ /**宸茶阿缁� */
+ HireRefuse = 30,
}
/** 鎴戠殑宸插綍鐢ㄥ垎椤靛垪琛�-鐘舵�� */
diff --git a/src/constants/app.ts b/src/constants/app.ts
index edcedd5..c3ab8d7 100644
--- a/src/constants/app.ts
+++ b/src/constants/app.ts
@@ -3,4 +3,5 @@
export const AppLocalConfig = {
userType: EnumUserType.Enterprise,
clientType: EnumClientType.PcWeb,
+ enterpriseType: EnumEnterpriseType.PartyA,
};
diff --git a/src/constants/index.ts b/src/constants/index.ts
index c391531..e9eac59 100644
--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -17,3 +17,4 @@
export * from './finance';
export * from './common';
export * from './user';
+export * from './supplier';
diff --git a/src/constants/supplier.ts b/src/constants/supplier.ts
new file mode 100644
index 0000000..c346729
--- /dev/null
+++ b/src/constants/supplier.ts
@@ -0,0 +1,9 @@
+export const EnumEnterpriseCooperationStatusText = {
+ [EnumEnterpriseCooperationStatus.None]: '鏈悎浣�',
+ [EnumEnterpriseCooperationStatus.Completed]: '宸插悎浣�',
+};
+
+export const EnumEnterpriseCooperationSignStatusText = {
+ [EnumEnterpriseCooperationSignStatus.None]: '鏈绾�',
+ [EnumEnterpriseCooperationSignStatus.Completed]: '宸茬绾�',
+};
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index 5460294..6caa866 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -11,3 +11,4 @@
export * from './sign';
export * from './settlement';
export * from './portraitTable';
+export * from './supplier';
diff --git a/src/hooks/supplier.ts b/src/hooks/supplier.ts
new file mode 100644
index 0000000..b5895c1
--- /dev/null
+++ b/src/hooks/supplier.ts
@@ -0,0 +1,21 @@
+import { useQuery, useQueryClient } from '@tanstack/vue-query';
+import * as enterpriseServices from '@/services/api/enterprise';
+
+export function useGetSupplierEnterpriseSelect() {
+ const queryClient = useQueryClient();
+
+ const { data: supplierEnterpriseSelect } = useQuery({
+ queryKey: ['enterpriseServices/getSupplierEnterpriseSelect'],
+ queryFn: () => {
+ return enterpriseServices.getSupplierEnterpriseSelect(
+ {},
+ {
+ showLoading: false,
+ }
+ );
+ },
+ placeholderData: () => [] as API.SelectOptionGuidGetSupplierEnterpriseSelectQueryOption[],
+ });
+
+ return { supplierEnterpriseSelect };
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 6ccf758..c5113de 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -123,34 +123,34 @@
},
],
},
- {
- path: '/FlexJobManage',
- redirect: 'noRedirect',
- component: Layout,
- hidden: false,
- alwaysShow: true,
- meta: {
- rank: 10010,
- title: '鐏靛伐绠$悊',
- rootMenu: true,
- icon: 'home',
- },
- children: [
- {
- path: '/FlexJobManageList',
- name: 'FlexJobManageList',
- hidden: false,
- alwaysShow: true,
- component: () => import('@/views/FlexJobManage/FlexJobManage.vue'),
- meta: {
- rank: 10011,
- title: '鐏靛伐绠$悊',
- // rootMenu: true,
- icon: 'home',
- },
- },
- ],
- },
+ // {
+ // path: '/FlexJobManage',
+ // redirect: 'noRedirect',
+ // component: Layout,
+ // hidden: false,
+ // alwaysShow: true,
+ // meta: {
+ // rank: 10010,
+ // title: '鐏靛伐绠$悊',
+ // rootMenu: true,
+ // icon: 'home',
+ // },
+ // children: [
+ // {
+ // path: '/FlexJobManageList',
+ // name: 'FlexJobManageList',
+ // hidden: false,
+ // alwaysShow: true,
+ // component: () => import('@/views/FlexJobManage/FlexJobManage.vue'),
+ // meta: {
+ // rank: 10011,
+ // title: '鐏靛伐绠$悊',
+ // // rootMenu: true,
+ // icon: 'home',
+ // },
+ // },
+ // ],
+ // },
{
path: '/EmploymentManage',
redirect: 'noRedirect',
@@ -312,34 +312,34 @@
},
],
},
- {
- path: '/AgreementManage',
- redirect: 'noRedirect',
- component: Layout,
- hidden: false,
- alwaysShow: true,
- meta: {
- rank: 10050,
- title: '鍗忚绠$悊',
- rootMenu: true,
- icon: 'home',
- },
- children: [
- {
- path: '/AgreementManageList',
- name: 'AgreementManageList',
- hidden: false,
- alwaysShow: true,
- component: () => import('@/views/AgreementManage/AgreementManageList.vue'),
- meta: {
- rank: 10051,
- title: '鍗忚绠$悊',
- // rootMenu: true,
- icon: 'home',
- },
- },
- ],
- },
+ // {
+ // path: '/AgreementManage',
+ // redirect: 'noRedirect',
+ // component: Layout,
+ // hidden: false,
+ // alwaysShow: true,
+ // meta: {
+ // rank: 10050,
+ // title: '鍗忚绠$悊',
+ // rootMenu: true,
+ // icon: 'home',
+ // },
+ // children: [
+ // {
+ // path: '/AgreementManageList',
+ // name: 'AgreementManageList',
+ // hidden: false,
+ // alwaysShow: true,
+ // component: () => import('@/views/AgreementManage/AgreementManageList.vue'),
+ // meta: {
+ // rank: 10051,
+ // title: '鍗忚绠$悊',
+ // // rootMenu: true,
+ // icon: 'home',
+ // },
+ // },
+ // ],
+ // },
// {
// path: '/WithdrawManage',
// redirect: 'noRedirect',
@@ -394,32 +394,32 @@
icon: 'home',
},
},
- {
- path: '/EnterpriseBalanceManage',
- name: 'EnterpriseBalanceManage',
- hidden: false,
- alwaysShow: true,
- component: () => import('@/views/FinanceManage/EnterpriseBalanceManage.vue'),
- meta: {
- rank: 10072,
- title: '浼佷笟浣欓绠$悊',
- // rootMenu: true,
- icon: 'home',
- },
- },
- {
- path: '/EnterpriseBalanceManageDetail/:id',
- name: 'EnterpriseBalanceManageDetail',
- hidden: true,
- alwaysShow: false,
- component: () => import('@/views/FinanceManage/EnterpriseBalanceManageDetail.vue'),
- meta: {
- rank: 10073,
- title: '璇︽儏',
- // rootMenu: true,
- icon: 'home',
- },
- },
+ // {
+ // path: '/EnterpriseBalanceManage',
+ // name: 'EnterpriseBalanceManage',
+ // hidden: false,
+ // alwaysShow: true,
+ // component: () => import('@/views/FinanceManage/EnterpriseBalanceManage.vue'),
+ // meta: {
+ // rank: 10072,
+ // title: '浼佷笟浣欓绠$悊',
+ // // rootMenu: true,
+ // icon: 'home',
+ // },
+ // },
+ // {
+ // path: '/EnterpriseBalanceManageDetail/:id',
+ // name: 'EnterpriseBalanceManageDetail',
+ // hidden: true,
+ // alwaysShow: false,
+ // component: () => import('@/views/FinanceManage/EnterpriseBalanceManageDetail.vue'),
+ // meta: {
+ // rank: 10073,
+ // title: '璇︽儏',
+ // // rootMenu: true,
+ // icon: 'home',
+ // },
+ // },
],
},
diff --git a/src/services/api/enterprise.ts b/src/services/api/enterprise.ts
index 868563d..1878577 100644
--- a/src/services/api/enterprise.ts
+++ b/src/services/api/enterprise.ts
@@ -68,6 +68,77 @@
);
}
+/** 鏌ヨ瀹㈡埛璇︽儏锛堢敳鏂逛紒涓氾級 GET /api/user/enterprise/getPartyAEnterprise */
+export async function getPartyAEnterprise(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetPartyAEnterpriseParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetPartyAEnterpriseQueryResult>('/api/user/enterprise/getPartyAEnterprise', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
+/** 鏌ヨ瀹㈡埛绠$悊锛堢敳鏂瑰鎴凤級 POST /api/user/enterprise/getPartyAEnterprises */
+export async function getPartyAEnterprises(
+ body: API.GetPartyAEnterprisesQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.PagedListQueryResultGetPartyAEnterprisesQueryResultItem>(
+ '/api/user/enterprise/getPartyAEnterprises',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ渚涘簲鍟嗙鐞� POST /api/user/enterprise/getSupplierEnterprises */
+export async function getSupplierEnterprises(
+ body: API.GetSupplierEnterprisesQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.PagedListQueryResultGetSupplierEnterprisesQueryResultItem>(
+ '/api/user/enterprise/getSupplierEnterprises',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ渚涘簲鍟嗛�夋嫨鍣ㄦ暟鎹� GET /api/user/enterprise/getSupplierEnterpriseSelect */
+export async function getSupplierEnterpriseSelect(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetSupplierEnterpriseSelectParams,
+ options?: API.RequestConfig
+) {
+ return request<API.SelectOptionGuidGetSupplierEnterpriseSelectQueryOption[]>(
+ '/api/user/enterprise/getSupplierEnterpriseSelect',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ request: undefined,
+ ...params['request'],
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 淇濆瓨浼佷笟 POST /api/user/enterprise/saveEnterprise */
export async function saveEnterprise(body: API.SaveEnterpriseCommand, options?: API.RequestConfig) {
return request<string>('/api/user/enterprise/saveEnterprise', {
@@ -95,6 +166,21 @@
});
}
+/** 娣诲姞瀹㈡埛浼佷笟锛堢敳鏂逛紒涓氾級 POST /api/user/enterprise/savePartyAEnterprise */
+export async function savePartyAEnterprise(
+ body: API.SavePartyAEnterpriseCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/enterprise/savePartyAEnterprise', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 璁剧疆浼佷笟鐢靛瓙绛鹃厤缃� PUT /api/user/enterprise/setEnterpriseElectronSignSetting */
export async function setEnterpriseElectronSignSetting(
body: API.SetEnterpriseElectronSignSettingCommand,
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index e99bcae..522d40c 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -5,46 +5,46 @@
import * as enterpriseEmployee from './enterpriseEmployee';
import * as user from './user';
import * as role from './role';
+import * as task from './task';
import * as enterpriseWallet from './enterpriseWallet';
import * as ocrUtils from './ocrUtils';
-import * as task from './task';
import * as enterprise from './enterprise';
-import * as logRecords from './logRecords';
import * as resource from './resource';
+import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
-import * as codeUrl from './codeUrl';
+import * as taskCheckReceive from './taskCheckReceive';
import * as electronSign from './electronSign';
import * as userResume from './userResume';
import * as auth from './auth';
-import * as taskCheckReceive from './taskCheckReceive';
import * as taskUser from './taskUser';
-import * as sms from './sms';
-import * as settings from './settings';
+import * as codeUrl from './codeUrl';
+import * as syncDatabase from './syncDatabase';
import * as menu from './menu';
+import * as sms from './sms';
import * as userWallet from './userWallet';
import * as fileUtils from './fileUtils';
-import * as syncDatabase from './syncDatabase';
+import * as settings from './settings';
export default {
enterpriseEmployee,
user,
role,
+ task,
enterpriseWallet,
ocrUtils,
- task,
enterprise,
- logRecords,
resource,
+ logRecords,
dictionary,
- codeUrl,
+ taskCheckReceive,
electronSign,
userResume,
auth,
- taskCheckReceive,
taskUser,
- sms,
- settings,
+ codeUrl,
+ syncDatabase,
menu,
+ sms,
userWallet,
fileUtils,
- syncDatabase,
+ settings,
};
diff --git a/src/services/api/task.ts b/src/services/api/task.ts
index 84167b8..ad58f4e 100644
--- a/src/services/api/task.ts
+++ b/src/services/api/task.ts
@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鍐嶆纭缁撶畻 POST /api/flexjob/task/againSureTaskSettlementOrderRoster */
+export async function againSureTaskSettlementOrderRoster(
+ body: API.AgainSureTaskSettlementOrderRosterCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/flexjob/task/againSureTaskSettlementOrderRoster', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 瀹℃牳浠诲姟缁撶畻 POST /api/flexjob/task/auditTaskSettlement */
export async function auditTaskSettlement(
body: API.AuditTaskSettlementCommand,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index beb6a74..ce28d1d 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -3,6 +3,11 @@
[key: string]: any;
}
+ interface AgainSureTaskSettlementOrderRosterCommand {
+ /** 鍚嶅崟Id */
+ id?: string;
+ }
+
interface APIcheckHealthParams {
/** 鍋ュ悍鏍¢獙 */
request?: CheckHealthQuery;
@@ -180,6 +185,11 @@
roleId?: string;
}
+ interface APIgetPartyAEnterpriseParams {
+ /** 鍚堜綔Id */
+ id?: string;
+ }
+
interface APIgetPersonalLoginInfoParams {
/** 鏌ヨ涓汉鐢ㄦ埛鐧诲綍淇℃伅 */
request?: GetPersonalLoginInfoQuery;
@@ -245,6 +255,11 @@
isImport?: boolean;
/** 鎿嶄綔浠ょ墝 */
operatorToken?: string;
+ }
+
+ interface APIgetSupplierEnterpriseSelectParams {
+ /** 鏌ヨ渚涘簲鍟嗛�夋嫨鍣ㄦ暟鎹� */
+ request?: GetSupplierEnterpriseSelectQuery;
}
interface APIgetTaskEnterpriseParams {
@@ -787,6 +802,20 @@
Face = 20,
}
+ enum EnumEnterpriseCooperationSignStatus {
+ /**鏈绾� */
+ None = 10,
+ /**宸茬绾� */
+ Completed = 20,
+ }
+
+ enum EnumEnterpriseCooperationStatus {
+ /**鏈悎浣� */
+ None = 10,
+ /**宸插悎浣� */
+ Completed = 20,
+ }
+
enum EnumEnterpriseCostStatus {
/**鎵h垂鎴愬姛 */
Success = 10,
@@ -806,6 +835,13 @@
Identity3 = 10,
/**浼佷笟鍥涜绱� */
Identity4 = 20,
+ }
+
+ enum EnumEnterpriseType {
+ /**渚涘簲鍟� */
+ Supplier = 0,
+ /**鐢叉柟浼佷笟 */
+ PartyA = 1,
}
enum EnumEnterpriseWalletAccess {
@@ -1121,6 +1157,15 @@
Success = 20,
/**鍙戦�佸け璐� */
Fail = 30,
+ }
+
+ enum EnumTaskApplyStatus {
+ /**寰呭紑濮� */
+ Wait = 10,
+ /**杩涜涓� */
+ InProcess = 20,
+ /**宸茬粨鏉� */
+ End = 21,
}
enum EnumTaskCheckReceiveMethod {
@@ -2212,6 +2257,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetPartyAEnterpriseQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetPartyAEnterpriseQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetPersonalApplyTaskInfosQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3200,6 +3263,25 @@
timestamp?: number;
}
+ interface FriendlyResultListSelectOptionGuidGetSupplierEnterpriseSelectQueryOption {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: SelectOptionGuidGetSupplierEnterpriseSelectQueryOption[];
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultListSelectOptionGuidGetTaskSelectQueryOption {
/** 璺熻釜Id */
traceId?: string;
@@ -3365,6 +3447,24 @@
timestamp?: number;
}
+ interface FriendlyResultPagedListQueryResultGetPartyAEnterprisesQueryResultItem {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: PagedListQueryResultGetPartyAEnterprisesQueryResultItem;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultPagedListQueryResultGetRolesQueryResultItem {
/** 璺熻釜Id */
traceId?: string;
@@ -3373,6 +3473,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: PagedListQueryResultGetRolesQueryResultItem;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultPagedListQueryResultGetSupplierEnterprisesQueryResultItem {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: PagedListQueryResultGetSupplierEnterprisesQueryResultItem;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -3690,6 +3808,10 @@
}
interface GetCheckReceiveTaskQueryResultObjectData {
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟鍗曞彿 */
@@ -3741,6 +3863,10 @@
interface GetCheckReceiveTasksQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟鍗曞彿 */
@@ -4491,6 +4617,7 @@
interface GetEnterprisesQueryResultItem {
/** Id */
id?: string;
+ type?: EnumEnterpriseType;
/** 浼佷笟鍏ㄧО */
enterpriseName?: string;
/** 娉曚汉濮撳悕 */
@@ -4547,6 +4674,10 @@
identity?: string;
/** 浣欓 */
balance?: number;
+ /** 鍙敤浣欓 */
+ availableBalance?: number;
+ /** 宸插喕缁� */
+ freezeBalance?: number;
}
interface GetEnterpriseWalletExpandindirectOrderQueryResult {
@@ -5132,6 +5263,84 @@
name?: string;
}
+ interface GetPartyAEnterpriseQueryResult {
+ /** 鍚堜綔Id */
+ id?: string;
+ /** 鐢叉柟浼佷笟Id */
+ partyAEnterpriseId?: string;
+ /** 浼佷笟鍚嶇О */
+ enterpriseName?: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 娉曚汉韬唤璇佸彿 */
+ legalIdentity?: string;
+ /** 缁熶竴绀句細淇$敤浠g爜 */
+ societyCreditCode?: string;
+ /** 娉ㄥ唽璧勬湰 */
+ registeredCapital?: string;
+ /** 浼佷笟绫诲瀷 */
+ enterpriseType?: string;
+ /** 鎴愮珛鏃ユ湡 */
+ establishmentDate?: string;
+ /** 鎵�鍦ㄧ渷浠界紪鍙� */
+ provinceCode?: string;
+ /** 鎵�鍦ㄧ渷浠� */
+ provinceContent?: string;
+ /** 鎵�鍦ㄥ煄甯傜紪鍙� */
+ cityCode?: string;
+ /** 鎵�鍦ㄥ煄甯� */
+ cityContent?: string;
+ /** 璇︾粏鍦板潃 */
+ address?: string;
+ /** 缁忚惀鑼冨洿 */
+ mainBusiness?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鑱旂郴閭 */
+ contactEmail?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ /** 鍚堜綔鍗忚 */
+ cooperationAgreementUrl?: string;
+ /** 鐢ㄦ埛Id */
+ userId?: string;
+ /** 璐﹀彿 */
+ userName?: string;
+ }
+
+ interface GetPartyAEnterprisesQuery {
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetPartyAEnterprisesQueryResultItem {
+ /** 鍚堜綔Id */
+ id?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 缁熶竴绀句細淇$敤浠g爜 */
+ societyCreditCode?: string;
+ /** 瀹㈡埛ID */
+ partyAEnterpriseId?: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鎵�鍦ㄧ渷浠� */
+ provinceContent?: string;
+ /** 鎵�鍦ㄥ煄甯� */
+ cityContent?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ }
+
interface GetPersonalApplyTaskInfosQuery {
status?: GetPersonalApplyTaskInfosQueryStatus;
pageModel?: PagedListQueryPageModel;
@@ -5146,6 +5355,10 @@
interface GetPersonalApplyTaskInfosQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟寮�濮嬫椂闂� */
@@ -5181,6 +5394,8 @@
WaitHire = 10,
/**寰呯绾� */
WaitSignContract = 20,
+ /**宸茶阿缁� */
+ HireRefuse = 30,
}
interface GetPersonalCancelTaskInfosQuery {
@@ -5196,6 +5411,10 @@
interface GetPersonalCancelTaskInfosQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟寮�濮嬫椂闂� */
@@ -5241,6 +5460,10 @@
interface GetPersonalHireTaskInfosQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟寮�濮嬫椂闂� */
@@ -5594,8 +5817,15 @@
balance?: number;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
+ /** 渚涘簲鍟� */
+ supplierEnterpriseName?: string;
/** 浠诲姟鍚嶇О */
taskName?: string;
+ /** 浠诲姟鍗曞彿 */
+ taskCode?: string;
+ /** 缁撶畻鍗曞彿 */
+ settlementCode?: string;
+ settlementAccess?: EnumEnterpriseWalletAccess;
/** 缁撶畻鍗曞悕绉� */
settlementOrderName?: string;
settlementStatus?: EnumTaskSettlementStatus;
@@ -5789,6 +6019,7 @@
/** 鍚嶇О */
name?: string;
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 鏈�浣庣骇鍒� */
minLevel?: number;
@@ -5809,6 +6040,7 @@
interface GetRolesQuery {
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 鍏抽敭瀛� */
keywords?: string;
@@ -5821,6 +6053,7 @@
/** 鍚嶇О */
name?: string;
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 鏈�浣庣骇鍒� */
minLevel?: number;
@@ -5906,6 +6139,8 @@
name?: string;
/** 浠诲姟鍗曞彿 */
code?: string;
+ /** 缁撶畻鍗曞彿 */
+ settlementCode?: string;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
/** 缁撶畻鍗曞悕绉� */
@@ -5925,7 +6160,10 @@
settlementRemark?: string;
/** 缁撶畻浜烘暟 */
settlementUserCount?: number;
+ settlementAccess?: EnumEnterpriseWalletAccess;
auditStatus?: EnumTaskSettlementAuditStatus;
+ /** 鎿嶄綔浜� */
+ operator?: string;
}
interface GetSettlementTasksQueryResultObjectData {
@@ -5946,6 +6184,10 @@
interface GetSettlementTaskUsersQueryResultDetail {
/** 缁撶畻璁㈠崟Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 鏍¢獙楠屾敹璧峰鏃ユ湡 */
checkReceiveBeginDate?: string;
/** 鏍¢獙楠屾敹鎴鏃ユ湡 */
@@ -6123,6 +6365,52 @@
signName?: string;
}
+ type GetSupplierEnterpriseSelectQuery = Record<string, any>;
+
+ interface GetSupplierEnterpriseSelectQueryOption {
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ supplierEnterprise?: GetSupplierEnterpriseSelectQueryOptionEnterprise;
+ }
+
+ interface GetSupplierEnterpriseSelectQueryOptionEnterprise {
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ }
+
+ interface GetSupplierEnterprisesQuery {
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetSupplierEnterprisesQueryResultItem {
+ /** 鍚堜綔Id */
+ id?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 缁熶竴绀句細淇$敤浠g爜 */
+ societyCreditCode?: string;
+ /** 渚涘簲鍟咺D */
+ supplierEnterpriseId?: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鎵�鍦ㄧ渷浠� */
+ provinceContent?: string;
+ /** 鎵�鍦ㄥ煄甯� */
+ cityContent?: string;
+ /** 鎵�灞炶涓� */
+ industryTypeContent?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ }
+
interface GetTaskEnterpriseQueryResult {
/** 浼佷笟鍏ㄧО */
enterpriseName?: string;
@@ -6147,6 +6435,12 @@
interface GetTaskInfoQueryResult {
/** Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 渚涘簲鍟� */
+ supplierEnterpriseName?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浼佷笟Id */
enterpriseId?: string;
/** 浼佷笟鍏ㄧО */
@@ -6293,11 +6587,21 @@
interface GetTaskInfosQueryResultItem {
/** Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 渚涘簲鍟� */
+ supplierEnterpriseName?: string;
+ /** 渚涘簲鍟嗚处鍙� */
+ supplierEnterpriseUserName?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name: string;
/** 浠诲姟鍗曞彿 */
code?: string;
- /** 浼佷笟鍏ㄧО */
+ /** 鎵�灞炲鎴稩d */
+ enterpriseId?: string;
+ /** 鎵�灞炲鎴� */
enterpriseName?: string;
/** 鐢ㄦ埛鍚� */
userName?: string;
@@ -6341,6 +6645,7 @@
applyBeginTime?: string;
/** 鎶ュ悕缁撴潫鏃堕棿 */
applyEndTime?: string;
+ applyStatus?: EnumTaskApplyStatus;
checkReceiveMethod?: EnumTaskCheckReceiveMethod;
paymentMethod?: EnumTaskPaymentMethod;
settlementAccess?: EnumEnterpriseWalletAccess;
@@ -7055,10 +7360,22 @@
data?: GetEnterprisesQueryResultItem[];
}
+ interface PagedListQueryResultGetPartyAEnterprisesQueryResultItem {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetPartyAEnterprisesQueryResultItem[];
+ }
+
interface PagedListQueryResultGetRolesQueryResultItem {
pageModel?: PagedListQueryResultPageModel;
/** 鏁版嵁 */
data?: GetRolesQueryResultItem[];
+ }
+
+ interface PagedListQueryResultGetSupplierEnterprisesQueryResultItem {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetSupplierEnterprisesQueryResultItem[];
}
interface PagedListQueryResultPageModel {
@@ -7081,6 +7398,7 @@
password: string;
type?: EnumUserType;
clientType?: EnumClientType;
+ enterpriseType?: EnumEnterpriseType;
}
interface PersonalUserElectronSignCommand {
@@ -7490,6 +7808,49 @@
id?: string;
}
+ interface SavePartyAEnterpriseCommand {
+ /** 浼佷笟鍚嶇О */
+ enterpriseName: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 娉曚汉韬唤璇佸彿 */
+ legalIdentity?: string;
+ /** 缁熶竴绀句細淇$敤浠g爜 */
+ societyCreditCode: string;
+ /** 娉ㄥ唽璧勬湰 */
+ registeredCapital?: string;
+ /** 浼佷笟绫诲瀷 */
+ enterpriseType?: string;
+ /** 鎴愮珛鏃ユ湡 */
+ establishmentDate?: string;
+ /** 鎵�鍦ㄧ渷浠界紪鍙� */
+ provinceCode?: string;
+ /** 鎵�鍦ㄥ煄甯傜紪鍙� */
+ cityCode?: string;
+ /** 璇︾粏鍦板潃 */
+ address?: string;
+ /** 缁忚惀鑼冨洿 */
+ mainBusiness?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鑱旂郴閭 */
+ contactEmail?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ /** 鍚堜綔鍗忚 */
+ cooperationAgreementUrl?: string;
+ /** 璐﹀彿 */
+ userName?: string;
+ /** 瀵嗙爜锛堥�夊~ 濉簡灏辨敼涓嶅~灏变笉鏀癸級 */
+ password?: string;
+ /** 鎿嶄綔瀵嗙爜锛堥�夊~ 濉簡灏辨敼涓嶅~灏变笉鏀癸級 */
+ operatorPassword?: string;
+ /** Id */
+ id?: string;
+ }
+
interface SavePersonalUserBankCardCommand {
/** 鐏靛伐Id */
enterpriseEmployeeId?: string;
@@ -7514,6 +7875,7 @@
/** 鍚嶇О */
name?: string;
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 鏈�浣庣骇鍒� */
minLevel?: number;
@@ -7552,6 +7914,10 @@
}
interface SaveTaskInfoCommand {
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name: string;
billingMethod: EnumBillingMethod;
@@ -7725,6 +8091,14 @@
/** 鏍囩 */
label?: string;
data?: GetEnterpriseWalletAccessSelectQueryOption;
+ }
+
+ interface SelectOptionGuidGetSupplierEnterpriseSelectQueryOption {
+ /** 鍊� */
+ value?: string;
+ /** 鏍囩 */
+ label?: string;
+ data?: GetSupplierEnterpriseSelectQueryOption;
}
interface SelectOptionGuidGetTaskSelectQueryOption {
@@ -7926,6 +8300,7 @@
verifyCode?: string;
type?: EnumUserType;
clientType?: EnumClientType;
+ enterpriseType?: EnumEnterpriseType;
}
interface StopElectronSignCommand {
@@ -8749,5 +9124,6 @@
/** 鐢ㄦ埛鐧诲綍鍑瘉 */
code: string;
type?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
}
}
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 91a830c..9358c34 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -77,6 +77,7 @@
// password: md5Encrypt(params.password),
type: AppLocalConfig.userType,
clientType: AppLocalConfig.clientType,
+ enterpriseType: AppLocalConfig.enterpriseType,
},
{
showLoading: false,
diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index 8c2f0c5..e21c637 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -5,12 +5,12 @@
<ProForm :model="form" ref="productFormRef" label-width="110px" :is-read="isDetail">
<ProFormItemV2
label="渚涘簲鍟�:"
- prop="settlementAccess"
+ prop="supplierEnterpriseId"
:check-rules="[{ message: '璇烽�夋嫨渚涘簲鍟�' }]"
>
<ProFormSelect
- v-model="form.settlementAccess"
- :value-enum="[]"
+ v-model="form.supplierEnterpriseId"
+ :value-enum="supplierEnterpriseSelect"
placeholder="璇烽�夋嫨渚涘簲鍟�"
></ProFormSelect>
</ProFormItemV2>
@@ -22,6 +22,24 @@
:check-rules="[{ message: '璇疯緭鍏ヤ换鍔″悕绉�' }]"
>
<ProFormText v-model.trim="form.name" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" />
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2
+ label="闇�姹備汉鏁�:"
+ prop="needPeopleNumber"
+ :check-rules="[{ message: '璇疯緭鍏ラ渶姹備汉鏁�' }]"
+ >
+ <ProFormInputNumber
+ :controls="false"
+ v-model="form.needPeopleNumber"
+ placeholder="璇疯緭鍏ラ渶姹備汉鏁�"
+ :min="0"
+ :max="999999999999"
+ unit="浜�"
+ ></ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -403,6 +421,7 @@
const isEdit = !!id;
const { settlementAccessList } = useEnterpriseWalletAccessSelect();
+const { supplierEnterpriseSelect } = useGetSupplierEnterpriseSelect();
function disabledDate(time: Date) {
return dayjs(time).isBefore(dayjs(), 'day');
@@ -445,7 +464,9 @@
});
const form = reactive({
+ supplierEnterpriseId: '',
name: '',
+ needPeopleNumber: null as number,
billingMethod: EnumBillingMethod.Day,
serviceFee: null,
settlementCycle: EnumSettlementCycle.Day,
@@ -478,7 +499,9 @@
},
placeholderData: () => ({} as API.GetTaskInfoQueryResult),
onSuccess(data) {
+ form.supplierEnterpriseId = data.supplierEnterpriseId;
form.name = data.name;
+ form.needPeopleNumber = data.needPeopleNumber;
form.billingMethod = data.billingMethod;
form.serviceFee = data.serviceFee;
form.settlementCycle = data.settlementCycle;
@@ -546,7 +569,9 @@
async function submit() {
try {
let params: API.SaveTaskInfoCommand = {
+ supplierEnterpriseId: form.supplierEnterpriseId,
name: form.name,
+ needPeopleNumber: form.needPeopleNumber,
billingMethod: form.billingMethod,
serviceFee: form.serviceFee,
settlementCycle: form.settlementCycle,
diff --git a/src/views/EmploymentManage/constants/columns.ts b/src/views/EmploymentManage/constants/columns.ts
index 2761a58..f12d246 100644
--- a/src/views/EmploymentManage/constants/columns.ts
+++ b/src/views/EmploymentManage/constants/columns.ts
@@ -13,12 +13,12 @@
},
{
id: '3',
- enCode: 'a',
+ enCode: 'supplierEnterpriseName',
name: '鎵�灞炲鎴�',
},
{
id: '4',
- enCode: 'a',
+ enCode: 'supplierEnterpriseId',
name: '瀹㈡埛ID',
},
{
@@ -43,7 +43,7 @@
},
{
id: '9',
- enCode: 'a',
+ enCode: 'needPeopleNumber',
name: '闇�姹備汉鏁�',
},
{
diff --git a/src/views/FinanceManage/components/DistributionDetailView.vue b/src/views/FinanceManage/components/DistributionDetailView.vue
index dfce1fa..1e7e395 100644
--- a/src/views/FinanceManage/components/DistributionDetailView.vue
+++ b/src/views/FinanceManage/components/DistributionDetailView.vue
@@ -63,6 +63,7 @@
columnsRenderProps: {
amount: { type: 'money' },
settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
+ settlementAccess: { type: 'enum', valueEnum: EnumEnterpriseWalletAccessText },
settlementTime: { type: 'date' },
},
}
diff --git a/src/views/FinanceManage/constants/columns.ts b/src/views/FinanceManage/constants/columns.ts
index 2ab4109..6141d38 100644
--- a/src/views/FinanceManage/constants/columns.ts
+++ b/src/views/FinanceManage/constants/columns.ts
@@ -3,8 +3,8 @@
export const DistributionDetailColumns = defineColumns([
{
id: '1',
- enCode: 'enterpriseName',
- name: '鎵�灞炲鎴�',
+ enCode: 'supplierEnterpriseName',
+ name: '渚涘簲鍟�',
},
{
id: '2',
@@ -13,31 +13,51 @@
},
{
id: '3',
- enCode: 'settlementOrderName',
- name: '缁撶畻鍗曞悕绉�',
+ enCode: 'taskCode',
+ name: '浠诲姟鍗曞彿',
},
{
id: '4',
+ enCode: 'settlementCode',
+ name: '缁撶畻鍗曞彿',
+ },
+ // {
+ // id: '3',
+ // enCode: 'settlementOrderName',
+ // name: '缁撶畻鍗曞悕绉�',
+ // },
+ {
+ id: '5',
enCode: 'receiveName',
name: '濮撳悕',
},
- {
- id: '5',
- enCode: 'receiveAccount',
- name: '鎵嬫満鍙�',
- },
+ // {
+ // id: '5',
+ // enCode: 'receiveAccount',
+ // name: '鎵嬫満鍙�',
+ // },
{
id: '6',
+ enCode: 'settlementAccess',
+ name: '缁撶畻鏂瑰紡',
+ },
+ {
+ id: '7',
+ enCode: 'receiveAccount',
+ name: '缁撶畻璐︽埛',
+ },
+ {
+ id: '8',
enCode: 'amount',
name: '缁撶畻閲戦',
},
{
- id: '7',
+ id: '9',
enCode: 'settlementStatus',
name: '缁撶畻鐘舵��',
},
{
- id: '8',
+ id: '10',
enCode: 'settlementTime',
name: '缁撶畻鏃ユ湡',
},
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 21a8b34..5b47d38 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -61,7 +61,7 @@
</QueryFilterItem>
</template>
<template #btn v-if="isSettlement">
- <BlFileUpload
+ <!-- <BlFileUpload
v-model:file-url="form.settlementUrl"
ref="uploadRef"
:showTip="false"
@@ -73,7 +73,7 @@
accept="xlsx,xls"
>
<el-button text type="primary" class="pro-table-operation-btn">瀵煎叆</el-button>
- </BlFileUpload>
+ </BlFileUpload> -->
<el-button type="primary" link @click="handleExport()">瀵煎嚭</el-button>
</template>
</ProTableQueryFilterBar>
@@ -90,7 +90,7 @@
</ProTableV2>
<div class="chuck-add-or-edit-actions">
<el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
- <el-button
+ <!-- <el-button
v-if="
isSettlement &&
(!form.auditStatus || form.auditStatus !== EnumTaskSettlementAuditStatus.Pass)
@@ -99,13 +99,13 @@
type="primary"
@click="handleSubmit()"
>缁撶畻鐢宠</el-button
- >
+ > -->
<el-button
- v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
+ v-if="isSettlement"
class="chuck-add-or-edit-actions"
type="primary"
@click="handleSubmit()"
- >鎻愪氦缁撶畻</el-button
+ >缁撶畻纭</el-button
>
</div>
</ChunkCell>
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index 2d3ee4c..1a80299 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -47,7 +47,7 @@
<template #btn>
<!-- <el-button type="primary" link @click="handleDownloadTemplate()">缁撶畻鍗曟ā鏉�</el-button> -->
<!-- <el-button type="primary" @click="handleAdd()">涓婁紶缁撶畻鍗�</el-button> -->
- <!-- <el-button type="primary" @click="handleDownloadTemplate()">瀵煎嚭</el-button> -->
+ <el-button type="primary" @click="handleExport()">瀵煎嚭</el-button>
</template>
</ProTableQueryFilterBar>
<ProTableV2
@@ -160,35 +160,32 @@
{
data: {
enCode: 'settleBtn',
- name: '缁撶畻',
+ name: '缁撶畻纭',
},
emits: {
onClick: (role: API.GetSettlementTasksQueryResultItem) => openSettleMethodDialog(role),
},
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
- !(
- role.settlementStatus === EnumTaskSettlementStatus.Wait &&
- role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
- ),
+ !(role.settlementStatus === EnumTaskSettlementStatus.Wait),
},
},
- {
- data: {
- enCode: 'recallBtn',
- name: '鎾ゅ洖',
- },
- emits: {
- onClick: (role) => handleRecall(role),
- },
- extraProps: {
- hide: (role: API.GetSettlementTasksQueryResultItem) =>
- !(
- role.settlementStatus === EnumTaskSettlementStatus.InProcess &&
- role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
- ),
- },
- },
+ // {
+ // data: {
+ // enCode: 'recallBtn',
+ // name: '鎾ゅ洖',
+ // },
+ // emits: {
+ // onClick: (role) => handleRecall(role),
+ // },
+ // extraProps: {
+ // hide: (role: API.GetSettlementTasksQueryResultItem) =>
+ // !(
+ // role.settlementStatus === EnumTaskSettlementStatus.InProcess &&
+ // role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
+ // ),
+ // },
+ // },
// {
// data: {
// enCode: 'settleAuditBtn',
@@ -223,7 +220,9 @@
onClick: (role) => handleExport(role),
},
extraProps: {
- hide: () => true,
+ hide: (role: API.GetSettlementTasksQueryResultItem) =>
+ role.settlementStatus === EnumTaskSettlementStatus.Wait ||
+ role.settlementStatus === EnumTaskSettlementStatus.InProcess,
},
},
]);
@@ -294,6 +293,7 @@
settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
auditStatus: { type: 'enum', valueEnum: EnumTaskSettlementAuditStatusText },
+ settlementAccess: { type: 'enum', valueEnum: EnumEnterpriseWalletAccessText },
actualSettlementAmount: { type: 'money' },
settlementAmount: { type: 'money' },
settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
@@ -456,7 +456,7 @@
});
}
-function handleExport(val) {
+function handleExport(val?) {
console.log('val: ', val);
}
diff --git a/src/views/ServiceChargeManage/constants/columns.ts b/src/views/ServiceChargeManage/constants/columns.ts
index 11720b4..65b69ca 100644
--- a/src/views/ServiceChargeManage/constants/columns.ts
+++ b/src/views/ServiceChargeManage/constants/columns.ts
@@ -22,15 +22,25 @@
// name: '缁撶畻鍗曠姸鎬�',
// },
{
- id: '5',
- enCode: 'settlementOrderName',
- name: '缁撶畻鍗曞悕绉�',
+ id: '4',
+ enCode: 'settlementCode',
+ name: '缁撶畻鍗曞彿',
},
{
- id: '6',
- enCode: 'settlementOrderTime',
- name: '涓婁紶鏃堕棿',
+ id: '5',
+ enCode: 'settlementAccess',
+ name: '缁撶畻鏂瑰紡',
},
+ // {
+ // id: '5',
+ // enCode: 'settlementOrderName',
+ // name: '缁撶畻鍗曞悕绉�',
+ // },
+ // {
+ // id: '6',
+ // enCode: 'settlementOrderTime',
+ // name: '涓婁紶鏃堕棿',
+ // },
{
id: '7',
enCode: 'actualSettlementAmount',
@@ -41,11 +51,11 @@
enCode: 'settlementAmount',
name: '缁撶畻閲戦',
},
- {
- id: '9',
- enCode: 'auditStatus',
- name: '瀹℃牳鐘舵��',
- },
+ // {
+ // id: '9',
+ // enCode: 'auditStatus',
+ // name: '瀹℃牳鐘舵��',
+ // },
{
id: '10',
enCode: 'settlementStatus',
@@ -63,6 +73,11 @@
},
{
id: '13',
+ enCode: 'operator',
+ name: '鎿嶄綔浜�',
+ },
+ {
+ id: '14',
enCode: 'settlementRemark',
name: '澶囨敞',
},
@@ -107,22 +122,22 @@
{
id: '7-1',
enCode: 'serviceFee',
- name: '鏈嶅姟璐�',
+ name: '鏈嶅姟璐�(鍏�)',
},
{
id: '7-2',
enCode: 'timeoutHours',
- name: '瓒呮椂',
+ name: '瓒呮椂(灏忔椂)',
},
{
id: '7-3',
enCode: 'timeoutFee',
- name: '瓒呮椂璐圭敤',
+ name: '瓒呮椂璐圭敤(鍏�)',
},
{
id: '7-4',
enCode: 'otherFee',
- name: '鍏朵粬璐圭敤',
+ name: '鍏朵粬璐圭敤(鍏�)',
},
{
id: '8',
diff --git a/src/views/SupplierManage/SupplierManageList.vue b/src/views/SupplierManage/SupplierManageList.vue
index 5fc8c22..25bbaba 100644
--- a/src/views/SupplierManage/SupplierManageList.vue
+++ b/src/views/SupplierManage/SupplierManageList.vue
@@ -5,8 +5,8 @@
<template #query>
<QueryFilterItem tip-content="鍚堜綔鐘舵��">
<FieldRadio
- v-model="extraParamState.status"
- :value-enum="[]"
+ v-model="extraParamState.cooperationStatus"
+ :value-enum="EnumEnterpriseCooperationStatusText"
buttonStyle
showAllBtn
@change="getList()"
@@ -14,8 +14,8 @@
</QueryFilterItem>
<QueryFilterItem tip-content="绛剧害鐘舵��">
<FieldRadio
- v-model="extraParamState.status"
- :value-enum="[]"
+ v-model="extraParamState.signStatus"
+ :value-enum="EnumEnterpriseCooperationSignStatusText"
buttonStyle
showAllBtn
@change="getList()"
@@ -53,9 +53,12 @@
useTable,
FieldRadio,
} from '@bole-core/components';
-import * as userServices from '@/services/api/user';
+import * as enterpriseServices from '@/services/api/enterprise';
import { SupplierManageColumns } from './constants';
-import { ModelValueType } from 'element-plus';
+import {
+ EnumEnterpriseCooperationStatusText,
+ EnumEnterpriseCooperationSignStatusText,
+} from '@/constants';
defineOptions({
name: 'SupplierManageList',
@@ -94,16 +97,18 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetPersonalUserWalletBalancesQuery = {
+ let params: API.GetSupplierEnterprisesQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
keywords: extraParamState.keywords,
+ cooperationStatus: extraParamState.cooperationStatus,
+ signStatus: extraParamState.signStatus,
};
- let res = await userServices.getPersonalUserWalletBalances(params, {
+ let res = await enterpriseServices.getSupplierEnterprises(params, {
showLoading: !state.loading,
});
return res;
@@ -112,12 +117,13 @@
{
defaultExtraParams: {
keywords: '',
- status: '',
- time: [] as unknown as ModelValueType,
+ cooperationStatus: '' as any as EnumEnterpriseCooperationStatus,
+ signStatus: '' as any as EnumEnterpriseCooperationSignStatus,
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
columnsRenderProps: {
- balance: { type: 'money' },
+ cooperationStatus: { type: 'enum', valueEnum: EnumEnterpriseCooperationStatusText },
+ signStatus: { type: 'enum', valueEnum: EnumEnterpriseCooperationSignStatusText },
},
}
);
diff --git a/src/views/SupplierManage/constants/columns.ts b/src/views/SupplierManage/constants/columns.ts
index b0fec19..dce4008 100644
--- a/src/views/SupplierManage/constants/columns.ts
+++ b/src/views/SupplierManage/constants/columns.ts
@@ -3,57 +3,57 @@
export const SupplierManageColumns = defineColumns([
{
id: '1',
- enCode: 'name',
+ enCode: 'enterpriseName',
name: '浼佷笟鍚嶇О',
},
{
id: '2',
- enCode: 'name',
+ enCode: 'societyCreditCode',
name: '缁熶竴淇$敤浠g爜',
},
{
id: '3',
- enCode: 'name',
+ enCode: 'supplierEnterpriseId',
name: '渚涘簲鍟咺D',
},
{
id: '4',
- enCode: 'name',
+ enCode: 'legalPerson',
name: '娉曚汉濮撳悕',
},
{
id: '5',
- enCode: 'name',
+ enCode: 'contacts',
name: '鑱旂郴浜哄悕绉�',
},
{
id: '6',
- enCode: 'name',
+ enCode: 'contactPhoneNumber',
name: '鑱旂郴鐢佃瘽',
},
{
id: '7',
- enCode: 'name',
+ enCode: 'provinceContent',
name: '鎵�鍦ㄧ渷浠�',
},
{
id: '8',
- enCode: 'name',
+ enCode: 'cityContent',
name: '鎵�鍦ㄥ煄甯�',
},
{
id: '9',
- enCode: 'name',
+ enCode: 'industryTypeContent',
name: '鎵�灞炶涓�',
},
{
id: '10',
- enCode: 'name',
+ enCode: 'cooperationStatus',
name: '鍚堜綔鐘舵��',
},
{
id: '11',
- enCode: 'name',
+ enCode: 'signStatus',
name: '绛剧害鐘舵��',
},
]);
--
Gitblit v1.9.1