From 6a66caf3ec1c4a62e21902ea0c9869266adae468 Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Thu, 23 Feb 2023 17:00:02 +0800 Subject: [PATCH] fix: bug#10164, #10157 --- src/views/notice/Template/Debug/index.vue | 28 +++++++++++++++++-- .../Template/Detail/components/ToOrg.vue | 10 +++++-- .../Template/Detail/components/ToUser.vue | 9 +++++- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/src/views/notice/Template/Debug/index.vue b/src/views/notice/Template/Debug/index.vue index c1d50f77..bf226648 100644 --- a/src/views/notice/Template/Debug/index.vue +++ b/src/views/notice/Template/Debug/index.vue @@ -51,11 +51,30 @@ + + + @@ -78,6 +97,9 @@ import type { } from '@/views/notice/Template/types'; import { message } from 'ant-design-vue'; +import ToUser from '../Detail/components/ToUser.vue'; +import ToOrg from '../Detail/components/ToOrg.vue'; +import ToTag from '../Detail/components/ToTag.vue'; type Emits = { (e: 'update:visible', data: boolean): void; @@ -110,7 +132,8 @@ const getConfigList = async () => { }; const { result } = await TemplateApi.getConfig(params); configList.value = result; - formData.value.configId = result[0]?.id; + // 设置默认配置 + if (configList.value.length) formData.value.configId = props.data.configId; }; watch( @@ -131,6 +154,7 @@ const getTemplateDetail = async () => { formData.value.templateDetailTable = result.variableDefinitions.map( (m: any) => ({ ...m, + type: m.expands ? m.expands.businessType : m.type, value: undefined, }), ); diff --git a/src/views/notice/Template/Detail/components/ToOrg.vue b/src/views/notice/Template/Detail/components/ToOrg.vue index 30422c50..8bfe4491 100644 --- a/src/views/notice/Template/Detail/components/ToOrg.vue +++ b/src/views/notice/Template/Detail/components/ToOrg.vue @@ -27,11 +27,17 @@ const _value = computed({ get: () => props.toParty, set: (val: string) => emit('update:toParty', val), }); - +const typeObj = { + weixin: 'wechat', + dingTalk: 'dingtalk', +}; const options = ref([]); const queryData = async () => { if (!props.configId) return; - const { result } = await templateApi.getDept(props.type, props.configId); + const { result } = await templateApi.getDept( + typeObj[props.type], + props.configId, + ); options.value = result.map((item: any) => ({ label: item.name, value: item.id, diff --git a/src/views/notice/Template/Detail/components/ToUser.vue b/src/views/notice/Template/Detail/components/ToUser.vue index 3edabeac..4b3e81c9 100644 --- a/src/views/notice/Template/Detail/components/ToUser.vue +++ b/src/views/notice/Template/Detail/components/ToUser.vue @@ -28,10 +28,17 @@ const _value = computed({ set: (val: string) => emit('update:toUser', val), }); +const typeObj = { + weixin: 'wechat', + dingTalk: 'dingtalk', +}; const options = ref([]); const queryData = async () => { if (!props.configId) return; - const { result } = await templateApi.getUser(props.type, props.configId); + const { result } = await templateApi.getUser( + typeObj[props.type], + props.configId, + ); options.value = result.map((item: any) => ({ label: item.name, value: item.id,