From 7fa518e989f019f70582f866a758cafc2e56c930 Mon Sep 17 00:00:00 2001
From: wxr <wxr@wangxingrong.com>
Date: Sat, 31 Jan 2026 15:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E9=85=8D=E6=96=99=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=E5=8F=8A=E6=98=BE=E7=A4=BA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nx/api/assayTask.js                          | 26 +++++++++++---------
 pages/analysis/sample/sample-work-detail.vue |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

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 @@
             <u-button class="btn-operation mr10" type="primary" @click="handleIngredients()">自动配料</u-button>
             <u-button class="btn-operation ml10" type="primary" @click="handleManualIngredients()">人工配料</u-button>
           </template>
-          <template v-else-if="taskIngredientsWay == 'automatic'">
+          <template v-else>
             <u-button
               v-if="taskIngredientsStatus === 'allow_submit'"
               class="btn-operation"