From ecaa5e0af0a087f256d497f7b7656f2900342226 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期五, 22 八月 2025 15:10:53 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin --- src/views/EnterpriseManage/EnterpriseManageList.vue | 76 +++++++++++++++++++++++++++---------- 1 files changed, 55 insertions(+), 21 deletions(-) diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue index 1ef6e37..4bbf424 100644 --- a/src/views/EnterpriseManage/EnterpriseManageList.vue +++ b/src/views/EnterpriseManage/EnterpriseManageList.vue @@ -6,16 +6,7 @@ <QueryFilterItem tip-content="閰嶇疆鐘舵��"> <FieldRadio v-model="extraParamState.isConfigured" - :value-enum="[ - { - value: true, - label: '宸查厤缃�', - }, - { - value: false, - label: '鏈厤缃�', - }, - ]" + :value-enum="IsConfiguredText" buttonStyle showAllBtn @change="getList()" @@ -24,7 +15,7 @@ <QueryFilterItem> <SearchInput v-model="extraParamState.keywords" - style="width: 200px" + style="width: 300px" placeholder="浼佷笟鍚嶇О/娉曚汉/鑱旂郴浜�" @on-click-search="getList" @keyup.enter="getList()" @@ -45,7 +36,7 @@ <ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns"> </ProTableV2> </AppContainer> - <!-- <ConfigureDialog v-bind="dialogProps" /> --> + <ConfigureDialog v-bind="dialogProps" /> </LoadingLayout> </template> @@ -63,7 +54,7 @@ FieldRadio, } from '@bole-core/components'; import { useAccess, useGlobalEventContext } from '@/hooks'; -import { EnterpriseConfigureType } from '@/constants'; +import { EnterpriseConfigureType, IsConfiguredText } from '@/constants'; import ConfigureDialog from './components/ConfigureDialog.vue'; import { Message } from '@bole-core/core'; import * as enterpriseServices from '@/services/api/enterprise'; @@ -99,6 +90,8 @@ }; const state = reactive({ ...BaseState }); + +const { invalidateQueries } = useEnabledElectronSignSettings(); onMounted(async () => { await getList(); @@ -138,18 +131,49 @@ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }], isConfigured: '' as any as boolean, }, - queryKey: ['flexEnterpriseServices/getFlexEnterpriseList'], - columnsRenderProps: {}, + queryKey: ['enterpriseServices/getEnterprises'], + columnsRenderProps: { + isReal: { type: 'enum', valueEnum: IsRealText }, + isConfigured: { type: 'enum', valueEnum: IsConfiguredText }, + }, } ); -function openDialog(row?: API.GetEnterprisesQueryResultItem) { +async function getEnterpriseElectronSignSetting(id: string) { + try { + return await enterpriseServices.getEnterpriseElectronSignSetting({ id: id }); + } catch (error) {} +} + +async function getEnterpriseSmsSetting(id: string) { + try { + return await enterpriseServices.getEnterpriseSmsSetting({ id: id }); + } catch (error) {} +} + +const EnumElectronSignAccessList = computed(() => + Object.values(EnumElectronSignAccess) + .filter(Number) + .map((x) => Number(x)) +); + +async function openDialog(row?: API.GetEnterprisesQueryResultItem) { if (row) { + let electronSignSetting = await getEnterpriseElectronSignSetting(row.id); + let smsSetting = await getEnterpriseSmsSetting(row.id); handleEdit({ id: row.id, + enterpriseConfigureType: EnterpriseConfigureType.Electronic, + electronSignAccesses: EnumElectronSignAccessList.value.map((value) => + electronSignSetting.electronSignAccesses.includes(value) ? value : null + ), + smsAccess: smsSetting.smsAccess, + smsCost: smsSetting.smsCost, }); } else { - handleAdd(); + handleAdd({ + enterpriseConfigureType: EnterpriseConfigureType.Electronic, + }); } } @@ -157,19 +181,23 @@ onConfirm: handleAddOrEdit, defaultFormParams: { id: '', + enterpriseConfigureType: EnterpriseConfigureType.Electronic, + electronSignAccesses: [] as EnumElectronSignAccess[], + smsAccess: '' as any as EnumSmsAccess, + smsCost: 0, }, }); -async function handleAddOrEdit(type: EnterpriseConfigureType) { +async function handleAddOrEdit() { try { let res; // if (type === EnterpriseConfigureType.Bank) { // res = await createOrEditFlexEnterpriseBankSetting(); // } - if (type === EnterpriseConfigureType.Electronic) { + if (editForm.enterpriseConfigureType === EnterpriseConfigureType.Electronic) { res = await createOrEditFlexEnterpriseSignSetting(); } - if (type === EnterpriseConfigureType.ShortMessage) { + if (editForm.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage) { res = await createOrEditFlexEnterpriseMessageSetting(); } if (res) { @@ -193,18 +221,24 @@ // return await flexEnterpriseServices.createOrEditFlexEnterpriseBankSetting(params); // } catch (error) {} // } + async function createOrEditFlexEnterpriseSignSetting() { try { let params: API.SetEnterpriseElectronSignSettingCommand = { id: editForm.id, + electronSignAccesses: editForm.electronSignAccesses.filter(Boolean), }; - return await enterpriseServices.setEnterpriseElectronSignSetting(params); + let res = await enterpriseServices.setEnterpriseElectronSignSetting(params); + invalidateQueries(); + return res; } catch (error) {} } async function createOrEditFlexEnterpriseMessageSetting() { try { let params: API.SetEnterpriseSmsSettingCommand = { id: editForm.id, + smsAccess: editForm.smsAccess, + smsCost: editForm.smsCost, }; return await enterpriseServices.setEnterpriseSmsSetting(params); } catch (error) {} -- Gitblit v1.9.1