From 430ab98c6225a276bab44c5eebb304fc6206cb73 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 25 九月 2024 16:03:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
index 29772a8..fe0477e 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
@@ -286,10 +286,14 @@
               orderDetail: selectRecords
             })
             request.post("/FinishedGoodsInventory/addDeliveryDetail", orderDetailData.value).then((res) => {
-              if (res.code == 200 && res.data===true) {
+              if (res.code == 200 && res.data==="true") {
                 ElMessage.success(t('productStock.deliverySuccessful'))
                 router.push({path: '/main/productStock/FinishedProductOut', query: {random: Math.random()}})
-              } else {
+              }else if (res.data==="false1") {
+                ElMessage.warning("鍙戣揣鍗曞凡鍑哄簱璇峰埛鏂扮晫闈�")
+              }else if (res.data==="false2") {
+                ElMessage.warning("鍙戣揣鍗曞簱瀛樻暟涓嶅瓨鍦�")
+              }else {
                 ElMessage.warning(t('productStock.deliveryFailed'))
               }
             }).catch((err)=>{

--
Gitblit v1.8.0