From cd4679b92c21b83df736f380fbcb75f8e445f091 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 11 Jun 2024 09:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E6=96=99=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndreturn/picking/outbound/index.vue | 26 ++++++++++---------
 .../return/apply/component/addReturn1.vue     | 14 +++++-----
 sgzb-ui/vue.config.js                         |  2 +-
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index c61fa291..f57bdfed 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -758,20 +758,22 @@ export default {
                 type: 'warning',
             })
                 .then(() => {
-                    outboundCompleted({
-                        id: this.dialogQuery.id,
-                        typeId: row.typeId,
-                    }).then((response) => {
-                        this.$modal.msgSuccess('完成出库成功')
-                        this.handleDialogQuery()
-                        this.handleQuery()
-                    })
+                    console.log('确定')
+                    // outboundCompleted({
+                    //     id: this.dialogQuery.id,
+                    //     typeId: row.typeId,
+                    // }).then((response) => {
+                    //     this.$modal.msgSuccess('完成出库成功')
+                    //     this.handleDialogQuery()
+                    //     this.handleQuery()
+                    // })
                 })
                 .catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消完成出库',
-                    })
+                    console.log('取消')
+                    // this.$message({
+                    //     type: 'info',
+                    //     message: '已取消完成出库',
+                    // })
                 })
         },
         handleOutQuery() {
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
index d4f2993d..1e5aaebb 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
@@ -744,9 +744,10 @@ export default {
                         if (res.code == 200) {
                             this.$message({ type: 'success', message: res.msg })
                             setTimeout(() => {
-                                this.$tab.closeOpenPage({
-                                    path: '/claimAndRefund/return/returnApplyByCq',
-                                })
+                                this.$emit('goBackPage')
+                                // this.$tab.closeOpenPage({
+                                //     path: '/claimAndRefund/return/returnApplyByCq',
+                                // })
                             }, 1000)
                         }
                     } else {
@@ -762,9 +763,10 @@ export default {
                         if (res.code == 200) {
                             this.$message({ type: 'success', message: res.msg })
                             setTimeout(() => {
-                                this.$tab.closeOpenPage({
-                                    path: '/claimAndRefund/return/returnApplyByCq',
-                                })
+                                this.$emit('goBackPage')
+                                // this.$tab.closeOpenPage({
+                                //     path: '/claimAndRefund/return/returnApplyByCq',
+                                // })
                             }, 1000)
                         }
                     }
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 4fe3705b..9206b370 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -42,7 +42,7 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://10.40.92.52:28080`, //超
+        target: `http://10.40.92.47:28080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.148:28080`, //帅