From fd83d49e666a639f730de3d72929608a53177465 Mon Sep 17 00:00:00 2001 From: dk <1260500659@qq.com> Date: Tue, 14 Jul 2026 16:38:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor(aireport):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E5=92=8C=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=80=BC=20-=20=E5=B0=86=E6=8E=A5=E5=8F=A3=E4=B8=AD=20data=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BB=8E=20string=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20Record=20|=20unknown[]?= =?UTF-8?q?=20-=20=E5=88=9D=E5=A7=8B=E5=8C=96=E8=A1=A8=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=B6=E5=B0=86=20data=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E4=BB=8E=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20'{}'=20-=20=E5=9C=A8=E6=95=B0=E6=8D=AE=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=89=8D=E9=80=9A=E8=BF=87=20JSON.parse=20=E5=A4=84?= =?UTF-8?q?=E7=90=86=20data=20=E5=AD=97=E6=AE=B5=20-=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BA=86=E8=A1=A8=E5=8D=95=E9=87=8D=E7=BD=AE=E5=92=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=9B=9E=E5=A1=AB=E6=97=B6=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/aireport/testReport/interface/index.ts | 2 +- .../testReport/components/ReportTaskFormDialog.vue | 8 ++++---- .../src/views/aireport/testReport/utils/testReportForm.ts | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/src/api/aireport/testReport/interface/index.ts b/frontend/src/api/aireport/testReport/interface/index.ts index a777e03..3ce2e4f 100644 --- a/frontend/src/api/aireport/testReport/interface/index.ts +++ b/frontend/src/api/aireport/testReport/interface/index.ts @@ -53,7 +53,7 @@ export namespace ReportTask { createUnit: string contractNumber: string standard: string[] - data: string + data: Record | unknown[] batchId?: string phonenumber?: string } diff --git a/frontend/src/views/aireport/testReport/components/ReportTaskFormDialog.vue b/frontend/src/views/aireport/testReport/components/ReportTaskFormDialog.vue index d21afcc..9770328 100644 --- a/frontend/src/views/aireport/testReport/components/ReportTaskFormDialog.vue +++ b/frontend/src/views/aireport/testReport/components/ReportTaskFormDialog.vue @@ -288,7 +288,7 @@ const formModel = reactive({ createUnit: '', contractNumber: '', standardIds: [] as string[], - data: '', + data: '{}', phonenumber: '' }) @@ -388,7 +388,7 @@ const resetForm = () => { formModel.createUnit = '' formModel.contractNumber = '' formModel.standardIds = [] - formModel.data = '' + formModel.data = '{}' formModel.phonenumber = '' activeDraftId.value = '' currentStep.value = 'import' @@ -435,7 +435,7 @@ const fillForm = async () => { formModel.createUnit = record?.createUnit || '' formModel.contractNumber = record?.contractNumber || '' formModel.standardIds = parseReportTaskStandardIds(record?.standard) - formModel.data = record?.data || '' + formModel.data = record?.data || '{}' formModel.phonenumber = record?.phonenumber || '' activeDraftId.value = buildDraftId() @@ -557,7 +557,7 @@ const submitForm = async () => { createUnit: formModel.createUnit, contractNumber: formModel.contractNumber.trim(), standard: stringifyReportTaskStandardIds(formModel.standardIds), - data: formModel.data.trim(), + data: JSON.parse(formModel.data.trim() || '{}'), batchId: ledgerPreparedState.value.batchId || undefined, phonenumber: formModel.phonenumber.trim() || undefined }) diff --git a/frontend/src/views/aireport/testReport/utils/testReportForm.ts b/frontend/src/views/aireport/testReport/utils/testReportForm.ts index 03161d6..40b93dd 100644 --- a/frontend/src/views/aireport/testReport/utils/testReportForm.ts +++ b/frontend/src/views/aireport/testReport/utils/testReportForm.ts @@ -22,7 +22,7 @@ export const createDefaultReportTaskFormModel = (): ReportTaskFormModel => ({ createUnit: '', contractNumber: '', standardIds: [], - data: '', + data: '{}', phonenumber: '' }) @@ -45,7 +45,7 @@ export const buildReportTaskFormContext = (mode: 'create' | 'edit', record: Repo formModel.createUnit = record?.createUnit || '' formModel.contractNumber = record?.contractNumber || '' formModel.standardIds = parseReportTaskStandardIds(record?.standard) - formModel.data = record?.data || '' + formModel.data = record?.data || '{}' formModel.phonenumber = record?.phonenumber || '' return { @@ -67,6 +67,6 @@ export const buildReportTaskSavePayload = ( createUnit: formModel.createUnit, contractNumber: formModel.contractNumber.trim(), standard: stringifyReportTaskStandardIds(formModel.standardIds), - data: formModel.data.trim(), + data: JSON.parse(formModel.data.trim() || '{}'), phonenumber: formModel.phonenumber.trim() || undefined })