diff --git a/src/views/oa/base/printTemplate/template.vue b/src/views/oa/base/printTemplate/template.vue index b46e2ac..27092aa 100644 --- a/src/views/oa/base/printTemplate/template.vue +++ b/src/views/oa/base/printTemplate/template.vue @@ -104,10 +104,14 @@ const options = ref({ ] }, page: { - showBreakMarks: false + showBreakMarks: false, + defaultMargin: { left: 3.18, right: 3.18, top: 2.54, bottom: 2.54 } }, onSave: async (e) => { template.value.templateData = JSON.stringify(e.json); + template.value.pageConfig = JSON.stringify({ + pageMargin: editorRef.value.getPage()?.margin || { left: 3.18, right: 3.18, top: 2.54, bottom: 2.54 } + }); const res = await updatePrintTemplate(template.value); ElMessage.success(res.msg); if (res.code === 200) { @@ -130,11 +134,19 @@ const insertText = (e) => { ); }; onMounted(async () => { - console.log(UmoEditor); getPrintTemplate(route.query.templateId).then((e) => { template.value = e.data; const editor = editorRef.value; editor.setContent(JSON.parse(e.data.templateData || '{}')); + let margin = JSON.parse(e.data.pageConfig || '{}').pageMargin || { + left: 3.18, + right: 3.18, + top: 2.54, + bottom: 2.54 + }; + delete margin.layout; + options.value.page.defaultMargin =margin + }); const select = { templateType: route.query.templateType diff --git a/src/views/oa/erp/contractInfo/contract.vue b/src/views/oa/erp/contractInfo/contract.vue index 964c6f2..d9beaca 100644 --- a/src/views/oa/erp/contractInfo/contract.vue +++ b/src/views/oa/erp/contractInfo/contract.vue @@ -210,10 +210,18 @@ onMounted(async () => { getPrintTemplate(route.query.templateId).then((e) => { template.value = e.data; const editor = editorRef.value; + let margin = JSON.parse(e.data.pageConfig || '{}').pageMargin || { + left: 3.18, + right: 3.18, + top: 2.54, + bottom: 2.54 + }; + delete margin.layout; + options.value.page.defaultMargin =margin const docData = JSON.parse(e.data.templateData || '{}'); const data = fillData(docData); editor.setContent(data); - }); + }); }); @@ -229,7 +237,8 @@ onMounted(async () => { /deep/ .umo-status-bar-left .umo-button:nth-child(5) { display: none; } -/deep/ .t-button--theme-warning{ + +/deep/ .t-button--theme-warning { border-color: var(--td-warning-color-hover); background-color: var(--td-warning-color-hover); } @@ -239,5 +248,4 @@ onMounted(async () => { position: sticky; bottom: 0px; } -