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 })