diff --git a/pages/analysis/sample/sample-work-detail.vue b/pages/analysis/sample/sample-work-detail.vue index 5b6171f..86a3edc 100644 --- a/pages/analysis/sample/sample-work-detail.vue +++ b/pages/analysis/sample/sample-work-detail.vue @@ -362,8 +362,7 @@ const customBack = () => { } const navRightClick = () => { - let url = '/pages/analysis/sample/sample-work-edit-task' - url += '?currentTaskId=' + taskId.value + let url = `/pages/analysis/sample/sample-work-edit-task?currentTaskId=${ taskId.value}&configReportTemplateKey=${configReportTemplateKey.value}` uni.navigateTo({ url: url }) diff --git a/pages/analysis/sample/sample-work-edit-task.vue b/pages/analysis/sample/sample-work-edit-task.vue index 78fa5d1..42886c2 100644 --- a/pages/analysis/sample/sample-work-edit-task.vue +++ b/pages/analysis/sample/sample-work-edit-task.vue @@ -89,6 +89,7 @@ const title = ref('') const scrollTop = ref(0) // 当前任务样品 const currentTaskId = ref('') +const configReportTemplateKey = ref('') // 字典选择器显示 // 当前日期(用于日期选择器) const curDate = ref(Number(new Date())) @@ -110,6 +111,8 @@ let dynamicFormSchema = [] onLoad(param => { if (param.currentTaskId) { currentTaskId.value = param.currentTaskId + configReportTemplateKey.value = param.configReportTemplateKey + } loadTaskDetail() }) @@ -292,7 +295,7 @@ async function handleSave(change) { } await nx.$api.assayTask.saveBatchSmpleAndQcAnalysis(params) uni.redirectTo({ - url: '/pages/analysis/sample/sample-work-detail?currentTaskId=' + currentTaskId.value + url: `/pages/analysis/sample/sample-work-detail?currentTaskId=${currentTaskId.value}&configReportTemplateKey=${configReportTemplateKey.value}` }) }