diff --git a/nx/api/assayTask.js b/nx/api/assayTask.js index f620290..9957857 100644 --- a/nx/api/assayTask.js +++ b/nx/api/assayTask.js @@ -208,6 +208,7 @@ const submitTask = params => { }) } +//自动配料(下发配料) const taskIngredients = params => { return request({ url: '/qms/bus/sample/analysis/issuedIngredients', @@ -218,6 +219,17 @@ const taskIngredients = params => { } }) } +// 手动配料 post 参数与自动配料一致 +const manualIngredients = params => { + return request({ + url: '/qms/bus/sample/analysis/manualIngredients', + method: 'POST', + params, + custom: { + showSuccess: true + } + }) +} // 撤销提交任务明细 const redoAssayTaskDetail = params => { @@ -264,16 +276,6 @@ const rollbackAssayTask = data => { data }) } -// 手动配料 post 参数与自动下发配料一致 -const manualIngredients = data => { - return request({ - url: '/qms/bus/sample/analysis/manualIngredients', - method: 'POST', - data: { - ...data - } - }) -} /* * 查询回收率配置*/ const queryConRecoveryRateList = param => { @@ -320,6 +322,6 @@ export default { rollbackAssayTask, submitTask, taskIngredients, - queryQmsDicSampleProcessCodeList, - manualIngredients + manualIngredients, + queryQmsDicSampleProcessCodeList } diff --git a/pages/analysis/sample/sample-work-detail.vue b/pages/analysis/sample/sample-work-detail.vue index be54888..9f2f187 100644 --- a/pages/analysis/sample/sample-work-detail.vue +++ b/pages/analysis/sample/sample-work-detail.vue @@ -71,7 +71,7 @@ 自动配料 人工配料 -