diff --git a/pages/analysis/sample/sample-work-detail.vue b/pages/analysis/sample/sample-work-detail.vue index b868ada..441970f 100644 --- a/pages/analysis/sample/sample-work-detail.vue +++ b/pages/analysis/sample/sample-work-detail.vue @@ -2,7 +2,7 @@ - 填写指派单 + 填写任务单 @@ -64,7 +64,7 @@ - 提交指派单 + 提交任务单 @@ -760,7 +760,7 @@ function setValueToSample() { }) } -//提交任务指派单 +//提交任务单 const submitTask = () => { const params = { businessAssayTaskId: taskId.value @@ -938,11 +938,11 @@ function handleAssayTypeChange({ index, value }) { curParameterTitle.value = '选择字段分类' collapseRef.value.init() } -// 获取任务指派单数据 +// 获取任务数据 async function getSampleAnalysisByTaskId() { const { assayTaskAnalysisDataList, configAssayMethodProjectRangeList, businessAssayTasNo, formValue } = await nx.$api.assayTask.batchSampleAndQcAnalysisByTaskId(taskId.value) - title.value = '样品分析-任务指派单:' + businessAssayTasNo + title.value = '样品分析-任务单编号:' + businessAssayTasNo // 处理分析数据 assayGroups.value = assayTaskAnalysisDataList.map(group => { diff --git a/pages/analysis/sample/sample-work-edit-task.vue b/pages/analysis/sample/sample-work-edit-task.vue index 46ed7bc..d0c15d2 100644 --- a/pages/analysis/sample/sample-work-edit-task.vue +++ b/pages/analysis/sample/sample-work-edit-task.vue @@ -84,7 +84,7 @@ import tools from '@/nx/utils/tools' const pageLoading = ref(false) // 标题 -const title = ref('编辑指派单') +const title = ref('') // tab标题的滚动条位置 const scrollTop = ref(0) // 当前任务样品 @@ -100,8 +100,7 @@ const formFields = ref([]) const staticFormSchema = [ { label: '指派单号', fieldKey: 'businessAssayTaskId', hidden: true }, - { type: 'title', value: '分析原始记录单' }, - { label: '检测方法', type: 'Input', fieldKey: 'configAssayMethodName' }, + { label: '检测方法', type: 'Input', fieldKey: 'assayMethodName' }, { label: '分析人', type: 'Input', fieldKey: 'assayOperator', disabled: true }, { label: '检测时间', type: 'date', fieldKey: 'assayTime' } ] @@ -131,7 +130,6 @@ async function loadTaskDetail() { } = await nx.$api.assayTask.batchSampleAndQcAnalysisByTaskId(currentTaskId.value) formData.value = { businessAssayTaskId: currentTaskId.value, - configAssayMethodName: configAssayMethodName, assayOperator: assayOperator, assayTime: assayTime } @@ -139,7 +137,10 @@ async function loadTaskDetail() { formData.value = { ...formData.value, ...JSON.parse(formValue) } dynamicFormData.value = JSON.parse(formValue) } - title.value = '样品分析-任务指派单:' + businessAssayTasNo + if (!dynamicFormData.value.assayMethodName) { + formData.value.assayMethodName = configAssayMethodName + } + title.value = '样品分析-任务单编号:' + businessAssayTasNo // 查询动态字段 const dataCollectionParams = {} if (dataCollectionId) { @@ -270,7 +271,7 @@ async function handleSave(change) { updateTableDataByConfigFields() params = { ...realFormData.value, - formValue: JSON.stringify(getDynamicFormSchemaFormData(realFormData.value)), + formValue: JSON.stringify(realFormData.value), assayTaskAnalysisDataList: tabs.value.map(item => ({ datas: item.tableData, analysisType: item.name @@ -279,7 +280,7 @@ async function handleSave(change) { } else { params = { ...realFormData.value, - formValue: JSON.stringify(getDynamicFormSchemaFormData(realFormData.value)) + formValue: JSON.stringify(realFormData.value) } } await nx.$api.assayTask.saveBatchSmpleAndQcAnalysis(params)