From 286e40543a9e27b0fca489e08802e54619817e30 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Wed, 23 Apr 2025 15:35:38 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E8=BE=85=E6=9D=90=E5=87=BA=E5=BA=93-?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=A1=AE=E8=AE=A4=E5=A4=87=E8=B4=A7=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/index.ts                       |  2 +-
 .../auxiliaryManage/auxiliaryOut/index.vue    | 51 ++++++++++---------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/api/common/index.ts b/src/api/common/index.ts
index 51b90e0..9a03b1b 100644
--- a/src/api/common/index.ts
+++ b/src/api/common/index.ts
@@ -71,7 +71,7 @@ export function AuxiliaryReserve(ChangeParams: any) {
 
 export function AuxiliaryDessign(ChangeParams: any) {
   return request({
-    url: '/api/Auxiliary/AuxiliaryDessign',
+    url: '/api/api/Auxiliary/auxiliaryDessign',
     method: 'post',
     data: ChangeParams,
   });
diff --git a/src/views/auxiliaryManage/auxiliaryOut/index.vue b/src/views/auxiliaryManage/auxiliaryOut/index.vue
index f231e35..6c5b889 100644
--- a/src/views/auxiliaryManage/auxiliaryOut/index.vue
+++ b/src/views/auxiliaryManage/auxiliaryOut/index.vue
@@ -460,10 +460,6 @@ function confimStockUp () {
   }
   state.loading = true
   state.button_state = true
- /* state.ReserveParams.SITENAME = localStorage.getItem("siteName") == null ? "SDK" : localStorage.getItem("siteName");
-  state.ReserveParams.SHIPREQUESTNAME = state.queryParams.params.SHIPREQUESTNAME //单据
-  state.ReserveParams.user = localStorage.getItem('userId')
-  state.ReserveParams.boxList = state.ShipList*/
   AuxiliaryReserve({
     commitDate : state.commitDate,
     USER : localStorage.get("userId"),
@@ -472,23 +468,24 @@ function confimStockUp () {
     BOXLIST: state.ShipList
   }).then((res: any) => {
     if (res.success){
-      state.button_state = false;
-      state.loading = false;
       handleQuery();
+      ElMessageBox.alert('备货完成', '提示框', {
+        confirmButtonText: 'OK',
+      })
     } else {
-      state.button_state = false;
-      state.loading = false;
-      ElMessageBox.alert(res.message, '', {
+      ElMessageBox.alert('备货失败，' + res.message, '', {
         confirmButtonText: 'OK',
       })
     }
   }).catch((error: any) => {
-    ElMessageBox.alert(error, '提示框', {
+    ElMessageBox.alert('备货失败，' + error, '提示框', {
       confirmButtonText: 'OK',
     })
-    state.loading = false
-    state.button_state = true
+    state.button_state = false;
+    state.loading = false;
   });
+  state.button_state = false;
+  state.loading = false;
 }
 
 
@@ -502,29 +499,33 @@ function cancelHandleFn() {
   }
   state.loading = true
   state.button_state = true
-  state.ReserveParams.SITENAME = localStorage.get("siteName") == null ? "SDK" : localStorage.get("siteName");
-  state.ReserveParams.SHIPREQUESTNAME = state.queryParams.params.SHIPREQUESTNAME //单据
-  state.ReserveParams.user = localStorage.getItem('userId')
-  state.ReserveParams.boxList = state.ShipList
-  AuxiliaryDessign(state.ReserveParams).then((res: any) => {
+  AuxiliaryDessign({
+    commitDate : state.commitDate,
+    USER : localStorage.get("userId"),
+    SITENAME: localStorage.get('siteName') || 'SDK',
+    SHIPREQUESTNAME: state.queryParams.params.SHIPREQUESTNAME,
+    BOXLIST: state.ShipList
+
+  }).then((res: any) => {
     if (res.success){
-      state.button_state = false;
-      state.loading = false;
       handleQuery();
+      ElMessageBox.alert('取消备货完成', '提示框', {
+        confirmButtonText: 'OK',
+      })
     } else {
-      state.button_state = false;
-      state.loading = false;
-      ElMessageBox.alert(res.message, '', {
+      ElMessageBox.alert('取消备货失败，' + res.message, '', {
         confirmButtonText: 'OK',
       })
     }
   }).catch((error: any) => {
-    ElMessageBox.alert(error, '提示框', {
+    ElMessageBox.alert('取消备货失败，' + error, '提示框', {
       confirmButtonText: 'OK',
     })
-    state.loading = false
-    state.button_state = true
+    state.button_state = false;
+    state.loading = false;
   });
+  state.button_state = false;
+  state.loading = false;
 }
 
 function resetQuery() {