From d46f3b348ab5f913cd15be977ce16137ee4343d0 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 17:40:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/finishedProductInspectionUp.vue |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/view/finishedProductInspectionUp.vue b/src/components/view/finishedProductInspectionUp.vue
index 0bb486e..7c421b3 100644
--- a/src/components/view/finishedProductInspectionUp.vue
+++ b/src/components/view/finishedProductInspectionUp.vue
@@ -322,13 +322,19 @@
             this.$axios.post(this.$api.url.finishedInspectUpdateFinishInspectsById, {
                 id: this.detailId
             }).then(res => {
-                console.log(res);
                 if (res.code == 200) {
+                    if(res.message==='椤圭洰鏈楠屽畬!'){
+                        this.$message({
+                        message: res.message,
+                        type: 'warning'
+                    });
+                    return
+                    }
                     this.$message({
                         message: '涓婃姤鎴愬姛',
                         type: 'success'
                     });
-                    this.$refs.comBackMain()
+                    this.$refs.comBackMain(true)
                 } else {
                     this.$message({
                         message: res.message,
@@ -336,6 +342,7 @@
                     });
                 }
             })
+
         },
         changeOptionsSamplename(){
             let id=this.processInspectVo.material.split("-")[0]

--
Gitblit v1.9.3