From e74287b43a159e6f0188e6fee4d0b4cbb494c42d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 28 十一月 2025 10:38:44 +0800
Subject: [PATCH] fix: s
---
src/views/AgreementManage/AgreementManageList.vue | 4
src/views/CustomerManage/CustomerManage.vue | 12 ++
src/views/CustomerManage/components/AddOrEditCustomerView.vue | 61 ++++++++++++
src/views/FlexJobManage/components/StaffInfoDialog.vue | 2
.eslintrc-auto-import.json | 5 +
src/services/api/typings.d.ts | 63 +++++++++++-
src/constants/customer.ts | 5 +
src/constants/enum.ts | 5 +
pnpm-lock.yaml | 28 ++--
package.json | 2
auto-imports.d.ts | 12 ++
src/constants/electronSign.ts | 2
src/views/AgreementManage/components/TemplateAddDialog.vue | 34 ++++++
src/constants/apiEnum.ts | 28 +++++
src/services/api/syncDatabase.ts | 15 +++
15 files changed, 254 insertions(+), 24 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index ecb4828..fcc3f08 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -3,6 +3,8 @@
"AppLocalConfig": true,
"AppType": true,
"AreaType": true,
+ "AutoSignPowerAttorneyTempUrl": true,
+ "BooleanOptions": true,
"CategoryCode": true,
"CertificateTypeCodeEnum": true,
"CommonAnnexTableColumns": true,
@@ -30,6 +32,8 @@
"EnumDbAuditOperate": true,
"EnumElectronSignAccess": true,
"EnumElectronSignVerifyType": true,
+ "EnumEnterpriseCooperationServiceFeeCollectType": true,
+ "EnumEnterpriseCooperationServiceFeeCollectTypeText": true,
"EnumEnterpriseCooperationSignStatus": true,
"EnumEnterpriseCooperationSignStatusText": true,
"EnumEnterpriseCooperationStatus": true,
@@ -141,6 +145,7 @@
"EnumWeChatPayApplymentSubjectType": true,
"EnumWeChatPaySettlementModifyVerifyResult": true,
"EnumWeChatPaySettlementVerifyResult": true,
+ "EnumWxmpSubscribMessageTemplate": true,
"ExtractDefaultPropTypes": true,
"ExtractPropTypes": true,
"ExtractPublicPropTypes": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 07575b4..d0d8d4d 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -9,6 +9,8 @@
const AppLocalConfig: typeof import('./src/constants/app')['AppLocalConfig']
const AppType: typeof import('./src/constants/app')['AppType']
const AreaType: typeof import('./src/constants/enum')['AreaType']
+ const AutoSignPowerAttorneyTempUrl: typeof import('./src/constants/electronSign')['AutoSignPowerAttorneyTempUrl']
+ const BooleanOptions: typeof import('./src/constants/enum')['BooleanOptions']
const CategoryCode: typeof import('./src/constants/dic')['CategoryCode']
const CertificateTypeCodeEnum: typeof import('./src/constants/dic')['CertificateTypeCodeEnum']
const CommonAnnexTableColumns: typeof import('./src/constants/common')['CommonAnnexTableColumns']
@@ -33,6 +35,8 @@
const EnumDbAuditOperate: typeof import('./src/constants/apiEnum')['EnumDbAuditOperate']
const EnumElectronSignAccess: typeof import('./src/constants/apiEnum')['EnumElectronSignAccess']
const EnumElectronSignVerifyType: typeof import('./src/constants/apiEnum')['EnumElectronSignVerifyType']
+ const EnumEnterpriseCooperationServiceFeeCollectType: typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationServiceFeeCollectType']
+ const EnumEnterpriseCooperationServiceFeeCollectTypeText: typeof import('./src/constants/customer')['EnumEnterpriseCooperationServiceFeeCollectTypeText']
const EnumEnterpriseCooperationSignStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationSignStatus']
const EnumEnterpriseCooperationSignStatusText: typeof import('./src/constants/customer')['EnumEnterpriseCooperationSignStatusText']
const EnumEnterpriseCooperationStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationStatus']
@@ -148,6 +152,7 @@
const EnumWeChatPayApplymentSubjectType: typeof import('./src/constants/apiEnum')['EnumWeChatPayApplymentSubjectType']
const EnumWeChatPaySettlementModifyVerifyResult: typeof import('./src/constants/apiEnum')['EnumWeChatPaySettlementModifyVerifyResult']
const EnumWeChatPaySettlementVerifyResult: typeof import('./src/constants/apiEnum')['EnumWeChatPaySettlementVerifyResult']
+ const EnumWxmpSubscribMessageTemplate: typeof import('./src/constants/apiEnum')['EnumWxmpSubscribMessageTemplate']
const FastButtonMap: typeof import('./src/constants/module')['FastButtonMap']
const FastColumnList: typeof import('./src/constants/module')['FastColumnList']
const FastDataButtonList: typeof import('./src/constants/module')['FastDataButtonList']
@@ -304,7 +309,7 @@
export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
import('vue')
// @ts-ignore
- export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCooperationSignStatus, EnumEnterpriseCooperationStatus, EnumEnterpriseCooperationWalletTransactionStatus, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseEmployeeSource, EnumEnterpriseRealMethod, EnumEnterpriseType, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetArrangeTaskUsersQueryApplyStatus, EnumGetCheckReceiveTaskCheckInUsersQueryStatus, EnumGetCheckReceiveTasksQueryResultItemCheckStatus, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskApplyStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserApplyStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetSettlementTasksQuerySupplierPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCooperationSignStatus, EnumEnterpriseCooperationStatus, EnumEnterpriseCooperationWalletTransactionStatus, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseEmployeeSource, EnumEnterpriseRealMethod, EnumEnterpriseType, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetArrangeTaskUsersQueryApplyStatus, EnumGetCheckReceiveTaskCheckInUsersQueryStatus, EnumGetCheckReceiveTasksQueryResultItemCheckStatus, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskApplyStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserApplyStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetSettlementTasksQuerySupplierPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
+ export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCooperationServiceFeeCollectType, EnumEnterpriseCooperationSignStatus, EnumEnterpriseCooperationStatus, EnumEnterpriseCooperationWalletTransactionStatus, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseEmployeeSource, EnumEnterpriseRealMethod, EnumEnterpriseType, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetArrangeTaskUsersQueryApplyStatus, EnumGetCheckReceiveTaskCheckInUsersQueryStatus, EnumGetCheckReceiveTasksQueryResultItemCheckStatus, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskApplyStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserApplyStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, EnumWxmpSubscribMessageTemplate, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetSettlementTasksQuerySupplierPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCooperationServiceFeeCollectType, EnumEnterpriseCooperationSignStatus, EnumEnterpriseCooperationStatus, EnumEnterpriseCooperationWalletTransactionStatus, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseEmployeeSource, EnumEnterpriseRealMethod, EnumEnterpriseType, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetArrangeTaskUsersQueryApplyStatus, EnumGetCheckReceiveTaskCheckInUsersQueryStatus, EnumGetCheckReceiveTasksQueryResultItemCheckStatus, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskApplyStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserApplyStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, EnumWxmpSubscribMessageTemplate, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetSettlementTasksQuerySupplierPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic'
@@ -343,6 +348,8 @@
readonly AppLocalConfig: UnwrapRef<typeof import('./src/constants/app')['AppLocalConfig']>
readonly AppType: UnwrapRef<typeof import('./src/constants/app')['AppType']>
readonly AreaType: UnwrapRef<typeof import('./src/constants/enum')['AreaType']>
+ readonly AutoSignPowerAttorneyTempUrl: UnwrapRef<typeof import('./src/constants/electronSign')['AutoSignPowerAttorneyTempUrl']>
+ readonly BooleanOptions: UnwrapRef<typeof import('./src/constants/enum')['BooleanOptions']>
readonly CategoryCode: UnwrapRef<typeof import('./src/constants/dic')['CategoryCode']>
readonly CertificateTypeCodeEnum: UnwrapRef<typeof import('./src/constants/dic')['CertificateTypeCodeEnum']>
readonly CommonAnnexTableColumns: UnwrapRef<typeof import('./src/constants/common')['CommonAnnexTableColumns']>
@@ -366,6 +373,8 @@
readonly EnumDbAuditOperate: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumDbAuditOperate']>
readonly EnumElectronSignAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumElectronSignAccess']>
readonly EnumElectronSignVerifyType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumElectronSignVerifyType']>
+ readonly EnumEnterpriseCooperationServiceFeeCollectType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationServiceFeeCollectType']>
+ readonly EnumEnterpriseCooperationServiceFeeCollectTypeText: UnwrapRef<typeof import('./src/constants/customer')['EnumEnterpriseCooperationServiceFeeCollectTypeText']>
readonly EnumEnterpriseCooperationSignStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationSignStatus']>
readonly EnumEnterpriseCooperationSignStatusText: UnwrapRef<typeof import('./src/constants/customer')['EnumEnterpriseCooperationSignStatusText']>
readonly EnumEnterpriseCooperationStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCooperationStatus']>
@@ -477,6 +486,7 @@
readonly EnumWeChatPayApplymentSubjectType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWeChatPayApplymentSubjectType']>
readonly EnumWeChatPaySettlementModifyVerifyResult: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWeChatPaySettlementModifyVerifyResult']>
readonly EnumWeChatPaySettlementVerifyResult: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWeChatPaySettlementVerifyResult']>
+ readonly EnumWxmpSubscribMessageTemplate: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWxmpSubscribMessageTemplate']>
readonly FastButtonMap: UnwrapRef<typeof import('./src/constants/module')['FastButtonMap']>
readonly FastColumnList: UnwrapRef<typeof import('./src/constants/module')['FastColumnList']>
readonly FastDataButtonList: UnwrapRef<typeof import('./src/constants/module')['FastDataButtonList']>
diff --git a/package.json b/package.json
index 33ea0e4..f4f12a3 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
"dependencies": {
"@bole-12333/chat-kit": "latest",
"@bole-12333/customer-chat": "latest",
- "@bole-core/components": "^1.3.17",
+ "@bole-core/components": "^1.3.26",
"@bole-core/core": "^1.0.8",
"@bole-core/pretty-layout": "latest",
"@bole-core/sass-utils": "latest",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8586993..5cc4603 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,8 +20,8 @@
specifier: latest
version: 1.0.3(@bole-12333/chat-kit@1.0.1)(@tiptap/core@2.1.13)(@tiptap/extension-document@2.1.13)(@tiptap/extension-image@2.1.13)(@tiptap/extension-mention@2.1.13)(@tiptap/extension-paragraph@2.1.13)(@tiptap/extension-placeholder@2.1.13)(@tiptap/extension-text@2.1.13)(@tiptap/pm@2.1.13)(@tiptap/suggestion@2.1.13)(dayjs@1.11.6)(vue@3.5.11)
'@bole-core/components':
- specifier: ^1.3.17
- version: 1.3.17(@bole-core/core@1.0.8)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.6)(element-plus@2.11.2)(lodash@4.17.21)(mitt@3.0.0)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.20.3)(vue-component-type-helpers@2.1.6)(vue@3.5.11)
+ specifier: ^1.3.26
+ version: 1.3.26(@bole-core/core@1.0.8)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.6)(element-plus@2.11.2)(lodash@4.17.21)(mitt@3.0.0)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.20.3)(vue-component-type-helpers@2.1.6)(vue@3.5.11)
'@bole-core/core':
specifier: ^1.0.8
version: 1.0.8(@ywwlmm/openapi@0.0.3)(ali-oss@6.21.0)(axios@1.7.7)(dayjs@1.11.6)(element-plus@2.11.2)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.10)(vue-router@4.4.5)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
@@ -1892,8 +1892,8 @@
vue: 3.5.11(typescript@4.8.4)
dev: false
- /@bole-core/components@1.3.17(@bole-core/core@1.0.8)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.6)(element-plus@2.11.2)(lodash@4.17.21)(mitt@3.0.0)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.20.3)(vue-component-type-helpers@2.1.6)(vue@3.5.11):
- resolution: {integrity: sha512-LNA8MDqa0hE6y4GG2YEn/F9Aj6kG2NfbE33/QJKrD+KhJULtt6v5bdsSTu10nUQFCqFwZtngYkMAcmDvU98bqw==}
+ /@bole-core/components@1.3.26(@bole-core/core@1.0.8)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.6)(element-plus@2.11.2)(lodash@4.17.21)(mitt@3.0.0)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.20.3)(vue-component-type-helpers@2.1.6)(vue@3.5.11):
+ resolution: {integrity: sha512-R9W/0i7QujnJwsqegigM3fqVghiviEHhH9EYmKdeir5OUQWoUHpEOZ5X81QRWS/TrtZonnPWHGG17q+S9gmkKA==}
peerDependencies:
'@bole-core/core': '*'
'@bole-core/sass-utils': '*'
@@ -3698,7 +3698,7 @@
/@tencentcloud/call-engine-js@3.3.0:
resolution: {integrity: sha512-li4i97RSMM0ZlkK+1x1veRp1sy1YLV/rUNQ1iG8TodHZ4kwA97NnLNBTfvXro3rpJtPVuKIZV6Gp4N+kXy4rOg==}
dependencies:
- '@tencentcloud/chat': 3.5.9
+ '@tencentcloud/chat': 3.6.1
core-js: 3.38.1
eventemitter3: 4.0.7
rtc-detect: 0.0.5
@@ -3710,7 +3710,7 @@
resolution: {integrity: sha512-2f7raW37qG762pS8PQ+bobAjDy0dh6dIMCuyXcVIGJMAEpw9JkYdYYN/1J+I/hHqXboELhYTYBvxU4XvD0H7kw==}
dependencies:
'@tencentcloud/call-engine-js': 3.3.0
- '@tencentcloud/chat': 3.5.9
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/tui-core': 2.5.1
'@vue/composition-api': 1.7.2(vue@3.5.11)
transitivePeerDependencies:
@@ -3721,7 +3721,7 @@
resolution: {integrity: sha512-AlYdkzKDk5QMEAhZUR4MBnkD91Xou82KO/EZfO0fr5c2jrUKI9N0D8VpvMWWtPCGWO2hNrbeLAhdUxwcax++1g==}
dependencies:
'@tencentcloud/call-engine-js': 3.3.0
- '@tencentcloud/chat': 3.5.9
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/tui-core': 2.5.1
dev: false
@@ -3736,14 +3736,14 @@
resolution: {integrity: sha512-SeUPs5Ow/Y+spAlhzu7HeQY9Zjg4BWMl64JbLGrFv6M389hLOhL5ZFmHb9eqkUIggIQoY5Rrkn2A23CxMWUT/w==}
dependencies:
'@tencentcloud/call-engine-js': 3.3.0
- '@tencentcloud/chat': 3.5.9
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/tui-core': 2.5.1
dev: false
/@tencentcloud/chat-uikit-engine@2.5.7:
resolution: {integrity: sha512-2C2x84k7D2cCvSQQlxo4Erw1EYrYf0BTz7IJuqkA99ac91ZwO8vNZEtQbd7wF1h7adNMXoxESCjaR24iDBTDhg==}
dependencies:
- '@tencentcloud/chat': 3.5.9
+ '@tencentcloud/chat': 3.6.1
tim-profanity-filter-plugin: 1.1.0
tim-upload-plugin: 1.4.3
dev: false
@@ -3785,14 +3785,14 @@
- vue
dev: false
- /@tencentcloud/chat@3.5.9:
- resolution: {integrity: sha512-DRCF5o1cZez1xjIFC8UmXE3NpWYfYWQ4+yjKtuOXk09N28dJSfdwYw2jyfJ2N0DWPB6icVCCxh2MDP+sp4HLpw==}
+ /@tencentcloud/chat@3.6.1:
+ resolution: {integrity: sha512-YKftPfO2Mzo/RhSmUq2806FrB2ZB9AiuVmhHupxXtG6g8RMHTJICQulp6z+3bBzU7qko9BancR8rtvfdpDTpmQ==}
dev: false
/@tencentcloud/tui-core@2.0.0:
resolution: {integrity: sha512-KBwDFWFV+IGtAZ82uCjRi891nMQcAen0wZHdPUUTSNHaWGjYiwOAHD7yw4gC1c5DYqVYMa3tVA7bSBd/hKVZKg==}
dependencies:
- '@tencentcloud/chat': 3.5.9
+ '@tencentcloud/chat': 3.6.1
tim-profanity-filter-plugin: 0.9.0
tim-upload-plugin: 1.3.0
dev: false
@@ -3800,7 +3800,7 @@
/@tencentcloud/tui-core@2.5.1:
resolution: {integrity: sha512-aXZG0INkV9WvFUHgmVQRibCs10r2u/oVb8qAEjW3maytBiLWOJQiK7dzshK9fnfadJAWQ027cpR8lCKz5r5Tlw==}
dependencies:
- '@tencentcloud/chat': 3.5.9
+ '@tencentcloud/chat': 3.6.1
tim-profanity-filter-plugin: 1.1.0
tim-upload-plugin: 1.4.3
dev: false
@@ -15031,7 +15031,7 @@
/tuicall-engine-webrtc@3.1.7:
resolution: {integrity: sha512-MRye9/x/8Gy5aRAfEACLtGhK5RcBLAev7cgCGi7OLNt0Uj28mEJkt1tHs4p7xTQiQj6vcB+7OVTdsxuSq7EmOA==}
dependencies:
- '@tencentcloud/chat': 3.5.9
+ '@tencentcloud/chat': 3.6.1
rtc-ai-denoiser: 1.1.7
trtc-cloud-js-sdk: 2.9.3
dev: false
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index c684e71..586337d 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -101,6 +101,14 @@
Face = 20,
}
+/** 鏈嶅姟璐规敹鍙栨柟寮� */
+export enum EnumEnterpriseCooperationServiceFeeCollectType {
+ /**鎸夋瘮渚� */
+ Rate = 10,
+ /**鍗曚汉鍗曟 */
+ SingleTime = 20,
+}
+
/** 绛剧害鐘舵�� */
export enum EnumEnterpriseCooperationSignStatus {
/**鏈绾� */
@@ -447,8 +455,10 @@
UserServerEnterpriseEmployee = 23,
/**鐢靛瓙绛� */
ElectronSignServerElectronSign = 24,
- /**鐢靛瓙绛� */
+ /**鐭俊 */
ToolServerSms = 25,
+ /**灏忕▼搴� */
+ ToolServerWxmp = 26,
}
/** 璧勬簮璇锋眰鏂瑰紡 */
@@ -887,6 +897,22 @@
VERIFYING = 2,
}
+/** 寰俊灏忕▼搴忚闃呮秷鎭ā鏉� */
+export enum EnumWxmpSubscribMessageTemplate {
+ /**鏀粯鎴愬姛鎻愰啋 缁撶畻瀹屾垚鍚庡悜鎵挎徑绔鐞嗗憳鎺ㄩ�� */
+ SettlementCompletedToSupplier = 0,
+ /**鎶ラ叕缁撶畻瀹℃牳缁撴灉閫氱煡 鐢叉柟缁撶畻纭鍚庡悜鎵挎徑绔鐞嗗憳鎺ㄩ�� */
+ SettlementAuditCompletedToSupplier = 1,
+ /**宸ヨ祫鍙戞斁閫氱煡 缁撶畻瀹屾垚鍚庡悜C绔汉鍛橀�氱煡 */
+ SettlementReceiveCompletedToUser = 2,
+ /**鎶ュ悕褰曠敤缁撴灉閫氱煡 琚綍鐢ㄥ悗鍚慍绔汉鍛橀�氱煡 */
+ HireCompletedToUser = 3,
+ /**鎺掔彮鎴愬姛閫氱煡 鎺掔彮鍚庡悜C绔汉鍛橀�氱煡 */
+ ArrangeCompletedToUser = 4,
+ /**娴嬭瘯 */
+ Test = 5,
+}
+
/** 鎴戠殑鎶ュ悕鍒嗛〉鍒楄〃-鐘舵�� */
export enum GetPersonalApplyTaskInfosQueryStatus {
/**寰呯‘璁� */
diff --git a/src/constants/customer.ts b/src/constants/customer.ts
index c346729..dca2228 100644
--- a/src/constants/customer.ts
+++ b/src/constants/customer.ts
@@ -7,3 +7,8 @@
[EnumEnterpriseCooperationSignStatus.None]: '鏈绾�',
[EnumEnterpriseCooperationSignStatus.Completed]: '宸茬绾�',
};
+
+export const EnumEnterpriseCooperationServiceFeeCollectTypeText = {
+ [EnumEnterpriseCooperationServiceFeeCollectType.Rate]: '鎸夋瘮渚�',
+ [EnumEnterpriseCooperationServiceFeeCollectType.SingleTime]: '鍗曚汉鍗曟',
+};
diff --git a/src/constants/electronSign.ts b/src/constants/electronSign.ts
index 4577c54..83363f5 100644
--- a/src/constants/electronSign.ts
+++ b/src/constants/electronSign.ts
@@ -8,3 +8,5 @@
width: number;
height: number;
};
+
+export const AutoSignPowerAttorneyTempUrl = `https://parkmanagement.oss-cn-hangzhou.aliyuncs.com/FlexJob/temp/%E3%80%90%E5%85%AC%E5%AF%B9%E5%85%AC%E3%80%91%E7%94%B5%E5%AD%90%E7%AD%BE%E5%90%8D%E6%8E%88%E6%9D%83%E4%B9%A6%EF%BC%88%E4%BB%A3%E4%B8%BA%E7%AD%BE%E7%BD%B2%26%E8%87%AA%E5%8A%A8%E7%AD%BE%EF%BC%89-V4-20220315.docx`;
diff --git a/src/constants/enum.ts b/src/constants/enum.ts
index c1ba104..7a9fcd1 100644
--- a/src/constants/enum.ts
+++ b/src/constants/enum.ts
@@ -19,3 +19,8 @@
*/
Town,
}
+
+export const BooleanOptions = [
+ { label: '鏄�', value: true },
+ { label: '鍚�', value: false },
+];
diff --git a/src/services/api/syncDatabase.ts b/src/services/api/syncDatabase.ts
index b40e50d..2d526e7 100644
--- a/src/services/api/syncDatabase.ts
+++ b/src/services/api/syncDatabase.ts
@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鍚屾鏁版嵁搴� POST /api/common/syncDatabase/sendWxmpSubscribMessage */
+export async function sendWxmpSubscribMessage(
+ body: API.SendWxmpSubscribMessageCommand,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/common/syncDatabase/sendWxmpSubscribMessage', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鍚屾鏁版嵁搴� POST /api/common/syncDatabase/syncDatabase */
export async function syncDatabase(body: API.SyncDatabaseCommand, options?: API.RequestConfig) {
return request<number>('/api/common/syncDatabase/syncDatabase', {
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index e9abad7..1dae424 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -875,6 +875,13 @@
Face = 20,
}
+ enum EnumEnterpriseCooperationServiceFeeCollectType {
+ /**鎸夋瘮渚� */
+ Rate = 10,
+ /**鍗曚汉鍗曟 */
+ SingleTime = 20,
+ }
+
enum EnumEnterpriseCooperationSignStatus {
/**鏈绾� */
None = 10,
@@ -1191,8 +1198,10 @@
UserServerEnterpriseEmployee = 23,
/**鐢靛瓙绛� */
ElectronSignServerElectronSign = 24,
- /**鐢靛瓙绛� */
+ /**鐭俊 */
ToolServerSms = 25,
+ /**灏忕▼搴� */
+ ToolServerWxmp = 26,
}
enum EnumResourceMethod {
@@ -1590,6 +1599,21 @@
VERIFY_FAIL = 1,
/**楠岃瘉涓紝鍟嗘埛鍙彂璧锋彁鐜板皾璇� */
VERIFYING = 2,
+ }
+
+ enum EnumWxmpSubscribMessageTemplate {
+ /**鏀粯鎴愬姛鎻愰啋 缁撶畻瀹屾垚鍚庡悜鎵挎徑绔鐞嗗憳鎺ㄩ�� */
+ SettlementCompletedToSupplier = 0,
+ /**鎶ラ叕缁撶畻瀹℃牳缁撴灉閫氱煡 鐢叉柟缁撶畻纭鍚庡悜鎵挎徑绔鐞嗗憳鎺ㄩ�� */
+ SettlementAuditCompletedToSupplier = 1,
+ /**宸ヨ祫鍙戞斁閫氱煡 缁撶畻瀹屾垚鍚庡悜C绔汉鍛橀�氱煡 */
+ SettlementReceiveCompletedToUser = 2,
+ /**鎶ュ悕褰曠敤缁撴灉閫氱煡 琚綍鐢ㄥ悗鍚慍绔汉鍛橀�氱煡 */
+ HireCompletedToUser = 3,
+ /**鎺掔彮鎴愬姛閫氱煡 鎺掔彮鍚庡悜C绔汉鍛橀�氱煡 */
+ ArrangeCompletedToUser = 4,
+ /**娴嬭瘯 */
+ Test = 5,
}
interface ExportEnterpriseBalanceDetailsCommand {
@@ -5761,6 +5785,11 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
/** 鍚堜綔鍗忚 */
cooperationAgreementUrl?: string;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
/** 鐢ㄦ埛Id */
userId?: string;
/** 璐﹀彿 */
@@ -5796,6 +5825,11 @@
cityContent?: string;
cooperationStatus?: EnumEnterpriseCooperationStatus;
signStatus?: EnumEnterpriseCooperationSignStatus;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
}
interface GetPersonalApplyTaskInfosQuery {
@@ -6650,6 +6684,8 @@
auditStatus?: EnumTaskSettlementAuditStatus;
/** 鎿嶄綔浜� */
operator?: string;
+ /** 鍒涘缓浜� */
+ createdUser?: string;
}
interface GetSettlementTasksQueryResultObjectData {
@@ -7661,6 +7697,10 @@
}
interface ImportEnterpriseEmployeesCommandResultError {
+ /** 鍗忚璧峰 */
+ contractBegin?: string;
+ /** 鍗忚缁堟 */
+ contractEnd?: string;
/** 閿欒淇℃伅 */
errorMessage?: string;
/** 濮撳悕 */
@@ -7669,10 +7709,6 @@
contactPhoneNumber?: string;
/** 韬唤璇佸彿 */
identity?: string;
- /** 鍗忚璧峰 */
- contractBegin?: string;
- /** 鍗忚缁堟 */
- contractEnd?: string;
}
interface ImportTaskSettlementOrderRostersCommand {
@@ -8397,6 +8433,11 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
/** 鍚堜綔鍗忚 */
cooperationAgreementUrl?: string;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
/** 璐﹀彿 */
userName?: string;
/** 瀵嗙爜锛堥�夊～ 濉簡灏辨敼涓嶅～灏变笉鏀癸級 */
@@ -8702,6 +8743,18 @@
phoneNumber: string;
}
+ interface SendWxmpSubscribMessageCommand {
+ /** 灏忕▼搴忕紪鍙� */
+ wxmpCode: string;
+ template: EnumWxmpSubscribMessageTemplate;
+ /** 鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆 */
+ page?: string;
+ /** 鎺ユ敹鑰咃紙鐢ㄦ埛锛夌殑 openid */
+ touser: string;
+ /** 妯℃澘鍐呭锛屾牸寮忓舰濡倇 "phrase3": { "value": "瀹℃牳閫氳繃" }, "name1": { "value": "璁㈤槄" }, "date2": { "value": "2019-12-25 09:42" } } */
+ data: any;
+ }
+
interface SetDictionaryDataIsDisabledCommand {
ids?: string[];
/** 鏄惁宸茬鐢� */
diff --git a/src/views/AgreementManage/AgreementManageList.vue b/src/views/AgreementManage/AgreementManageList.vue
index a56b189..1ed57ed 100644
--- a/src/views/AgreementManage/AgreementManageList.vue
+++ b/src/views/AgreementManage/AgreementManageList.vue
@@ -188,6 +188,8 @@
defaultFormParams: {
name: '',
url: [] as UploadUserFile[],
+ isAutoSign: true,
+ autoSignPowerAttorneyUrl: [] as UploadUserFile[],
},
});
@@ -207,6 +209,8 @@
} as TemplateEditDataItem)
)
),
+ autoSignPowerAttorneyUrl: editForm.autoSignPowerAttorneyUrl?.[0]?.path ?? '',
+ isAutoSign: editForm.isAutoSign,
};
let res = await electronSignServices.saveContractTemplate(params);
if (res) {
diff --git a/src/views/AgreementManage/components/TemplateAddDialog.vue b/src/views/AgreementManage/components/TemplateAddDialog.vue
index 07cf6b2..fb18950 100644
--- a/src/views/AgreementManage/components/TemplateAddDialog.vue
+++ b/src/views/AgreementManage/components/TemplateAddDialog.vue
@@ -2,7 +2,8 @@
<ProDialog title="鏂板妯℃澘" v-model="visible" @close="onDialogClose" destroy-on-close draggable>
<ProForm :model="form" ref="dialogForm" label-width="100px">
<ProFormItemV2 label="妯℃澘鍚嶇О:" prop="name" :check-rules="[{ message: '璇疯緭鍏ユā鏉垮悕绉�' }]">
- <ProFormText v-model.trim="form.name" placeholder="璇疯緭鍏ユā鏉垮悕绉�" :maxlength="32" > </ProFormText>
+ <ProFormText v-model.trim="form.name" placeholder="璇疯緭鍏ユā鏉垮悕绉�" :maxlength="32">
+ </ProFormText>
</ProFormItemV2>
<ProFormItemV2
label="涓婁紶妯℃澘:"
@@ -15,6 +16,27 @@
:limitFileSize="10"
accept="pdf"
></ProFormUpload>
+ </ProFormItemV2>
+ <ProFormItemV2 label="鑷姩绛�:" prop="isAutoSign" required>
+ <ProFormRadio v-model="form.isAutoSign" :value-enum="BooleanOptions"></ProFormRadio>
+ </ProFormItemV2>
+ <ProFormItemV2
+ label="涓婁紶鎺堟潈涔�:"
+ prop="autoSignPowerAttorneyUrl"
+ :check-rules="[{ message: '璇蜂笂浼犳巿鏉冧功', type: 'upload' }]"
+ v-if="form.isAutoSign"
+ >
+ <ProFormUpload
+ v-model:file-url="form.autoSignPowerAttorneyUrl"
+ :limit="1"
+ :limitFileSize="10"
+ accept="pdf,doc,docx,png,jpg,jpeg"
+ >
+ <div>
+ <el-button icon="Upload">涓婁紶鏂囦欢</el-button>
+ <el-button type="primary" link @click.stop="handleDownload">涓嬭浇鎺堟潈涔︽ā鏉�</el-button>
+ </div>
+ </ProFormUpload>
</ProFormItemV2>
</ProForm>
<template #footer>
@@ -34,9 +56,11 @@
ProFormUpload,
ProFormText,
UploadUserFile,
+ ProFormRadio,
} from '@bole-core/components';
import { FormInstance } from 'element-plus';
-import { max } from 'lodash';
+import { BooleanOptions } from '@/constants';
+import { downloadFileByUrl } from '@/utils';
defineOptions({
name: 'TemplateAddDialog',
@@ -46,6 +70,8 @@
title?: string;
name: string;
url: UploadUserFile[];
+ isAutoSign: boolean;
+ autoSignPowerAttorneyUrl: UploadUserFile[];
};
const visible = defineModel({ type: Boolean });
@@ -73,4 +99,8 @@
}
});
}
+
+function handleDownload() {
+ downloadFileByUrl(AutoSignPowerAttorneyTempUrl, '鑷姩绛炬巿鏉冧功妯℃澘');
+}
</script>
diff --git a/src/views/CustomerManage/CustomerManage.vue b/src/views/CustomerManage/CustomerManage.vue
index b73db10..43934cc 100644
--- a/src/views/CustomerManage/CustomerManage.vue
+++ b/src/views/CustomerManage/CustomerManage.vue
@@ -146,6 +146,18 @@
columnsRenderProps: {
cooperationStatus: { type: 'enum', valueEnum: EnumEnterpriseCooperationStatusText },
signStatus: { type: 'enum', valueEnum: EnumEnterpriseCooperationSignStatusText },
+ serviceFeeCollectType: {
+ type: 'enum',
+ valueEnum: EnumEnterpriseCooperationServiceFeeCollectTypeText,
+ },
+ invoiceTaxPointRate: {
+ formatter: (row: API.GetPartyAEnterprisesQueryResultItem) => {
+ if (row.invoiceTaxPointRate) {
+ return `${row.invoiceTaxPointRate}%`;
+ }
+ return '';
+ },
+ },
},
}
);
diff --git a/src/views/CustomerManage/components/AddOrEditCustomerView.vue b/src/views/CustomerManage/components/AddOrEditCustomerView.vue
index 1098f7d..58e048f 100644
--- a/src/views/CustomerManage/components/AddOrEditCustomerView.vue
+++ b/src/views/CustomerManage/components/AddOrEditCustomerView.vue
@@ -169,6 +169,51 @@
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="8">
+ <ProFormItemV2 label="鏈嶅姟璐规敹鍙栨柟寮�:" prop="serviceFeeCollectType">
+ <ProFormSelect
+ v-model="form.serviceFeeCollectType"
+ :valueEnum="EnumEnterpriseCooperationServiceFeeCollectTypeText"
+ placeholder="璇烽�夋嫨鏈嶅姟璐规敹鍙栨柟寮�"
+ >
+ </ProFormSelect>
+ </ProFormItemV2>
+ </ProFormColItem>
+ <ProFormColItem
+ :span="8"
+ v-if="
+ form.serviceFeeCollectType === EnumEnterpriseCooperationServiceFeeCollectType.Rate
+ "
+ >
+ <ProFormItemV2 label="鏈嶅姟璐�:" prop="serviceFeeRate">
+ <ProFormInputNumber
+ v-model="form.serviceFeeRate"
+ :controls="false"
+ :min="0"
+ :precision="2"
+ placeholder="璇疯緭鍏�"
+ unit="%"
+ :showReadContent="!!form.serviceFeeRate"
+ />
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="8">
+ <ProFormItemV2 label="鍙戠エ绋庣偣:" prop="invoiceTaxPointRate">
+ <ProFormInputNumber
+ v-model="form.invoiceTaxPointRate"
+ :controls="false"
+ :min="0"
+ :precision="2"
+ placeholder="璇疯緭鍏�"
+ unit="%"
+ :showReadContent="!!form.invoiceTaxPointRate"
+ />
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
</ProForm>
</ChunkCell>
<ChunkCell title="璐﹀彿淇℃伅">
@@ -272,6 +317,8 @@
ProFormRadio,
UploadUserFile,
useFormDialog,
+ ProFormSelect,
+ ProFormInputNumber,
} from '@bole-core/components';
import { FormInstance } from 'element-plus';
import * as enterpriseServices from '@/services/api/enterprise';
@@ -281,6 +328,8 @@
import {
EnumEnterpriseCooperationStatusText,
EnumEnterpriseCooperationSignStatusText,
+ EnumEnterpriseCooperationServiceFeeCollectTypeText,
+ EnumEnterpriseCooperationServiceFeeCollectType,
} from '@/constants';
import {
validateFormList,
@@ -335,6 +384,10 @@
operatorPassword: '',
userId: '',
+
+ serviceFeeCollectType: '' as any as EnumEnterpriseCooperationServiceFeeCollectType,
+ serviceFeeRate: null as any as number,
+ invoiceTaxPointRate: null as any as number,
});
const { isLoading, refetch } = useQuery({
@@ -368,6 +421,9 @@
form.userName = data.userName;
form.userId = data.userId;
+ form.serviceFeeCollectType = data.serviceFeeCollectType;
+ form.serviceFeeRate = data.serviceFeeRate;
+ form.invoiceTaxPointRate = data.invoiceTaxPointRate;
},
enabled: computed(() => !!id),
});
@@ -478,7 +534,12 @@
userName: form.userName,
password: form.password,
operatorPassword: form.operatorPassword,
+ serviceFeeCollectType: form.serviceFeeCollectType,
+ invoiceTaxPointRate: form.invoiceTaxPointRate,
};
+ if (form.serviceFeeCollectType === EnumEnterpriseCooperationServiceFeeCollectType.Rate) {
+ params.serviceFeeRate = form.serviceFeeRate;
+ }
if (isEdit) {
params.id = id;
}
diff --git a/src/views/FlexJobManage/components/StaffInfoDialog.vue b/src/views/FlexJobManage/components/StaffInfoDialog.vue
index 0dd52d5..41b8b0c 100644
--- a/src/views/FlexJobManage/components/StaffInfoDialog.vue
+++ b/src/views/FlexJobManage/components/StaffInfoDialog.vue
@@ -108,6 +108,7 @@
v-model:file-url="form.identityImg"
:limitFileSize="10"
:showTip="false"
+ imgBlur
>
</ProFormImageUpload>
</ProFormItemV2>
@@ -120,6 +121,7 @@
v-model:file-url="form.identityBackImg"
:limitFileSize="10"
:showTip="false"
+ imgBlur
>
</ProFormImageUpload>
</ProFormItemV2>
--
Gitblit v1.9.1