From ae6ef128ee37061163921558d98d9e07efc6dc2d Mon Sep 17 00:00:00 2001 From: hwj Date: Wed, 13 May 2026 15:40:59 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=A8=A1=E5=85=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/erp/mold/index.ts | 1 + src/views/erp/mold/components/MoldForm.vue | 29 +++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/api/erp/mold/index.ts b/src/api/erp/mold/index.ts index 6e850d2d..b712cb71 100644 --- a/src/api/erp/mold/index.ts +++ b/src/api/erp/mold/index.ts @@ -35,6 +35,7 @@ export interface MoldVO { status: number // 状态 images: string // 模具图片 qrcodeUrl?: string + templateJson?: string | any fileUrl?: string remark: string // 备注 isEnable: boolean // 是否启用 diff --git a/src/views/erp/mold/components/MoldForm.vue b/src/views/erp/mold/components/MoldForm.vue index 72c6d109..4fa4df6c 100644 --- a/src/views/erp/mold/components/MoldForm.vue +++ b/src/views/erp/mold/components/MoldForm.vue @@ -97,6 +97,8 @@ :refresh-url="getQrcodeRefreshUrl()" :refresh-disabled="!formData.id || !formData.code" refresh-confirm-text="确认刷新该模具二维码吗?" + :template-json="formData.templateJson" + :print-data="buildPrintData()" @refresh-success="handleQrcodeRefreshSuccess" /> @@ -159,6 +161,7 @@ const formData = ref({ status: undefined, images: undefined, qrcodeUrl: undefined, + templateJson: undefined, remark: undefined, isEnable: undefined, fileUrl: '', @@ -208,7 +211,15 @@ const open = async (type: string, id?: number, brandId: number) => { if (id) { formLoading.value = true try { - formData.value = await MoldBrandApi.getMold(id) + const moldData = await MoldBrandApi.getMold(id) + const templateJson = moldData?.templateJson + const parsedTemplateJson = typeof templateJson === 'string' + ? JSON.parse(templateJson) + : templateJson + formData.value = { + ...moldData, + templateJson: parsedTemplateJson + } } finally { formLoading.value = false } @@ -231,6 +242,21 @@ const getQrcodeRefreshUrl = () => { return `/erp/mold-brand/regenerate-code?id=${formData.value.id}&code=${encodeURIComponent(String(formData.value.code))}` } +const buildPrintData = () => { + return { + id: formData.value.id, + code: formData.value.code, + name: formData.value.name, + unitId: formData.value.unitId, + machineId: formData.value.machineId, + useTime: formData.value.useTime, + inTime: formData.value.inTime, + status: formData.value.status, + remark: formData.value.remark, + qrcodeUrl: formData.value.qrcodeUrl + } +} + const handleQrcodeRefreshSuccess = async (data: any) => { if (!formData.value.id) return if (data?.qrcodeUrl) { @@ -280,6 +306,7 @@ const resetForm = () => { status: 3, images: undefined, qrcodeUrl: undefined, + templateJson: undefined, remark: undefined, isEnable: true, fileUrl: '',