From 3181ae6751d1d71f3626574d4e26bd9101bbe25d Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 17 Jun 2024 09:37:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=A0=B8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=BB=84=E4=BB=B6=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=20=E5=AE=9E=E7=8E=B0=E6=9F=A5=E8=AF=A2=E6=88=96=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=90=8E=E4=B8=BB=E5=88=97=E8=A1=A8=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E6=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/auditing/component/auditingPage.vue   |  4 ++--
 .../picking/auditing/component/home1.vue          |  5 +++++
 .../claimAndreturn/picking/auditing/index.vue     | 15 +++++++++++----
 sgzb-ui/vue.config.js                             |  4 ++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue
index 9ad3b6f9..2f3f49ba 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue
@@ -512,7 +512,7 @@ export default {
                 // this.$tab.closeOpenPage({
                 //     path: '/claimAndRefund/receive/receiveManage',
                 // })
-                this.$emit('goBackPage')
+                this.$emit('goBackPage', 1) // 传 1 表示需要刷新列表
             }
             // console.log('subAuditLeaseByCompany ==================', res)
         },
@@ -564,7 +564,7 @@ export default {
                 // this.$tab.closeOpenPage({
                 //     path: '/claimAndRefund/receive/receiveManage',
                 // })
-                this.$emit('goBackPage')
+                this.$emit('goBackPage', 1)
             }
             console.log('subAuditLeaseByCompany ==================', res)
         },
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
index 61979737..5fddb658 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -588,6 +588,11 @@ export default {
             // console.log(this.user)
             this.getList()
         },
+
+        /* 刷新列表 */
+        refreshList() {
+            this.getList()
+        },
         /** 查询列表 */
         async getList() {
             this.loading = true
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
index 049b8036..444bad96 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
@@ -6,8 +6,10 @@
             :pageContent="pageContent"
             @goBack="goBack"
         />
-        <keep-alive :include="includeCom">
+        <!-- 6.17 新增组件缓存 因客户需要查询或审核后返回列表时保留页面状态 -->
+        <keep-alive>
             <component
+                ref="componentRef"
                 :is="isShowComponent"
                 :isView="isView"
                 :auditingTaskId="auditingTaskId"
@@ -41,7 +43,6 @@ export default {
     methods: {
         /* 审核按钮 */
         pickingAuditing(taskId) {
-            this.includeCom = ''
             this.auditingTaskId = taskId
             this.isView = false
             this.pageContent = '领料任务审批'
@@ -49,14 +50,20 @@ export default {
         },
         /* 查看按钮 */
         pickingView(taskId) {
-            this.includeCom = 'Home'
             this.auditingTaskId = taskId
             this.isView = true
             this.pageContent = '领料审批详情'
             this.isShowComponent = 'AuditingPage'
         },
-        goBack() {
+        goBack(val) {
             this.isShowComponent = 'Home'
+
+            // 判断 val 为1时 表示领料单审核完毕 返回主列表时 需刷新列表 更新审批状态
+            if (val === 1) {
+                this.$nextTick(() => {
+                    this.$refs.componentRef.refreshList()
+                })
+            }
         },
     },
 }
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index e52e86cc..8506dc44 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -46,8 +46,8 @@ module.exports = {
         // target: `http://10.40.92.51:28080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
-        // target: `http://10.40.92.138:28080`, //帅
-        target: `http://10.40.92.253:28080`, //福
+        target: `http://10.40.92.140:28080`, //帅
+        // target: `http://10.40.92.253:28080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;