diff --git a/src/views/oa/base/printTemplate/template.vue b/src/views/oa/base/printTemplate/template.vue index f40f541..b46e2ac 100644 --- a/src/views/oa/base/printTemplate/template.vue +++ b/src/views/oa/base/printTemplate/template.vue @@ -136,7 +136,10 @@ onMounted(async () => { const editor = editorRef.value; editor.setContent(JSON.parse(e.data.templateData || '{}')); }); - getBaseTemplateVariableList().then((e) => { + const select = { + templateType: route.query.templateType + }; + getBaseTemplateVariableList(select).then((e) => { fieldList.value = e.data; }); }); diff --git a/src/views/oa/crm/customerInfo/ourIndex.vue b/src/views/oa/crm/customerInfo/ourIndex.vue index da70b79..6b060be 100644 --- a/src/views/oa/crm/customerInfo/ourIndex.vue +++ b/src/views/oa/crm/customerInfo/ourIndex.vue @@ -260,8 +260,39 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +