refactor(aireport): 调整测试报告数据字段类型和初始化值
- 将接口中 data 字段类型从 string 改为 Record<string, unknown> | unknown[]
- 初始化表单数据时将 data 默认值从空字符串改为 '{}'
- 在数据提交前通过 JSON.parse 处理 data 字段
- 统一了表单重置和编辑回填时的数据初始化逻辑
This commit is contained in:
@@ -53,7 +53,7 @@ export namespace ReportTask {
|
|||||||
createUnit: string
|
createUnit: string
|
||||||
contractNumber: string
|
contractNumber: string
|
||||||
standard: string[]
|
standard: string[]
|
||||||
data: string
|
data: Record<string, unknown> | unknown[]
|
||||||
batchId?: string
|
batchId?: string
|
||||||
phonenumber?: string
|
phonenumber?: string
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -288,7 +288,7 @@ const formModel = reactive({
|
|||||||
createUnit: '',
|
createUnit: '',
|
||||||
contractNumber: '',
|
contractNumber: '',
|
||||||
standardIds: [] as string[],
|
standardIds: [] as string[],
|
||||||
data: '',
|
data: '{}',
|
||||||
phonenumber: ''
|
phonenumber: ''
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -388,7 +388,7 @@ const resetForm = () => {
|
|||||||
formModel.createUnit = ''
|
formModel.createUnit = ''
|
||||||
formModel.contractNumber = ''
|
formModel.contractNumber = ''
|
||||||
formModel.standardIds = []
|
formModel.standardIds = []
|
||||||
formModel.data = ''
|
formModel.data = '{}'
|
||||||
formModel.phonenumber = ''
|
formModel.phonenumber = ''
|
||||||
activeDraftId.value = ''
|
activeDraftId.value = ''
|
||||||
currentStep.value = 'import'
|
currentStep.value = 'import'
|
||||||
@@ -435,7 +435,7 @@ const fillForm = async () => {
|
|||||||
formModel.createUnit = record?.createUnit || ''
|
formModel.createUnit = record?.createUnit || ''
|
||||||
formModel.contractNumber = record?.contractNumber || ''
|
formModel.contractNumber = record?.contractNumber || ''
|
||||||
formModel.standardIds = parseReportTaskStandardIds(record?.standard)
|
formModel.standardIds = parseReportTaskStandardIds(record?.standard)
|
||||||
formModel.data = record?.data || ''
|
formModel.data = record?.data || '{}'
|
||||||
formModel.phonenumber = record?.phonenumber || ''
|
formModel.phonenumber = record?.phonenumber || ''
|
||||||
|
|
||||||
activeDraftId.value = buildDraftId()
|
activeDraftId.value = buildDraftId()
|
||||||
@@ -557,7 +557,7 @@ const submitForm = async () => {
|
|||||||
createUnit: formModel.createUnit,
|
createUnit: formModel.createUnit,
|
||||||
contractNumber: formModel.contractNumber.trim(),
|
contractNumber: formModel.contractNumber.trim(),
|
||||||
standard: stringifyReportTaskStandardIds(formModel.standardIds),
|
standard: stringifyReportTaskStandardIds(formModel.standardIds),
|
||||||
data: formModel.data.trim(),
|
data: JSON.parse(formModel.data.trim() || '{}'),
|
||||||
batchId: ledgerPreparedState.value.batchId || undefined,
|
batchId: ledgerPreparedState.value.batchId || undefined,
|
||||||
phonenumber: formModel.phonenumber.trim() || undefined
|
phonenumber: formModel.phonenumber.trim() || undefined
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ export const createDefaultReportTaskFormModel = (): ReportTaskFormModel => ({
|
|||||||
createUnit: '',
|
createUnit: '',
|
||||||
contractNumber: '',
|
contractNumber: '',
|
||||||
standardIds: [],
|
standardIds: [],
|
||||||
data: '',
|
data: '{}',
|
||||||
phonenumber: ''
|
phonenumber: ''
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -45,7 +45,7 @@ export const buildReportTaskFormContext = (mode: 'create' | 'edit', record: Repo
|
|||||||
formModel.createUnit = record?.createUnit || ''
|
formModel.createUnit = record?.createUnit || ''
|
||||||
formModel.contractNumber = record?.contractNumber || ''
|
formModel.contractNumber = record?.contractNumber || ''
|
||||||
formModel.standardIds = parseReportTaskStandardIds(record?.standard)
|
formModel.standardIds = parseReportTaskStandardIds(record?.standard)
|
||||||
formModel.data = record?.data || ''
|
formModel.data = record?.data || '{}'
|
||||||
formModel.phonenumber = record?.phonenumber || ''
|
formModel.phonenumber = record?.phonenumber || ''
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -67,6 +67,6 @@ export const buildReportTaskSavePayload = (
|
|||||||
createUnit: formModel.createUnit,
|
createUnit: formModel.createUnit,
|
||||||
contractNumber: formModel.contractNumber.trim(),
|
contractNumber: formModel.contractNumber.trim(),
|
||||||
standard: stringifyReportTaskStandardIds(formModel.standardIds),
|
standard: stringifyReportTaskStandardIds(formModel.standardIds),
|
||||||
data: formModel.data.trim(),
|
data: JSON.parse(formModel.data.trim() || '{}'),
|
||||||
phonenumber: formModel.phonenumber.trim() || undefined
|
phonenumber: formModel.phonenumber.trim() || undefined
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user