From 68e3ef3c7e93de361e04dd2fc5dc261ba436b652 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期四, 11 九月 2025 15:57:58 +0800 Subject: [PATCH] fix: bug --- src/views/EnterpriseManage/components/ConfigureDialog.vue | 4 +++- src/services/api/typings.d.ts | 5 +++++ src/views/ProtocolManage/components/AddOrEditTemplateDialog.vue | 1 + auto-imports.d.ts | 2 +- src/hooks/electronSign.ts | 15 ++++++++++----- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 96e0f36..409b0f4 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -546,4 +546,4 @@ readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']> readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']> } -} \ No newline at end of file +} diff --git a/src/hooks/electronSign.ts b/src/hooks/electronSign.ts index 8c737b3..832b3d9 100644 --- a/src/hooks/electronSign.ts +++ b/src/hooks/electronSign.ts @@ -3,28 +3,33 @@ type UseEnabledElectronSignSettingsOptions = { enterpriseId?: MaybeRef<string>; + all?: MaybeRef<boolean>; }; export function useEnabledElectronSignSettings( options: UseEnabledElectronSignSettingsOptions = {} ) { - const { enterpriseId } = options; + const { enterpriseId, all } = options; const queryClient = useQueryClient(); const { data } = useQuery({ - queryKey: ['electronSignServices/getEnabledElectronSignSettings', enterpriseId], + queryKey: ['electronSignServices/getEnabledElectronSignSettings', enterpriseId, all], queryFn: async () => { let res = await electronSignServices.getEnabledElectronSignSettings( - { enterpriseId: unref(enterpriseId) }, + { enterpriseId: unref(enterpriseId), all: unref(all) }, { showLoading: false } ); return res; }, select(data) { + const showDisabledName = !!unref(enterpriseId) && unref(all); return data.map((x) => ({ ...x, - accessName: EnumElectronSignAccessText[x.access], + accessName: + showDisabledName && x.isDisabled + ? '璇ラ�氶亾鏃犳硶浣跨敤' + : EnumElectronSignAccessText[x.access], })); }, placeholderData: () => [] as API.GetEnabledElectronSignSettingsQueryResultItem[], @@ -32,7 +37,7 @@ function invalidateQueries() { return queryClient.invalidateQueries({ - queryKey: ['electronSignServices/getEnabledElectronSignSettings', enterpriseId], + queryKey: ['electronSignServices/getEnabledElectronSignSettings'], }); } diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts index daeb4ad..5ededb6 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -76,6 +76,8 @@ interface APIgetEnabledElectronSignSettingsParams { /** 浼佷笟Id */ enterpriseId?: string; + /** 鏄惁鏌ヨ鍏ㄩ儴 */ + all?: boolean; } interface APIgetEnterpriseContractTemplateSelectParams { @@ -2689,6 +2691,7 @@ date?: string; /** 鎻愪氦鏃堕棿 */ createdTime?: string; + checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus; /** 楠屾敹鐓х墖 */ files?: string[]; } @@ -2993,6 +2996,8 @@ interface GetEnabledElectronSignSettingsQueryResultItem { access?: EnumElectronSignAccess; + /** 鏄惁绂佺敤 */ + isDisabled?: boolean; /** 瀹炲悕璐圭敤 */ realVerifyCost?: number; /** 绛剧害璐圭敤 */ diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue index ac7195d..4a8e7f9 100644 --- a/src/views/EnterpriseManage/components/ConfigureDialog.vue +++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue @@ -242,7 +242,9 @@ const dialogForm = ref<FormInstance>(); -const { enabledElectronSignSettings } = useEnabledElectronSignSettings(); +const { enabledElectronSignSettings } = useEnabledElectronSignSettings({ + all: true, +}); async function handleCheckBankAccount() { try { diff --git a/src/views/ProtocolManage/components/AddOrEditTemplateDialog.vue b/src/views/ProtocolManage/components/AddOrEditTemplateDialog.vue index 612664c..279778b 100644 --- a/src/views/ProtocolManage/components/AddOrEditTemplateDialog.vue +++ b/src/views/ProtocolManage/components/AddOrEditTemplateDialog.vue @@ -105,6 +105,7 @@ const { enabledElectronSignSettings } = useEnabledElectronSignSettings({ enterpriseId: computed(() => form.value.enterpriseId), + all: true, }); const dialogForm = ref<FormInstance>(); -- Gitblit v1.9.1