From 24f60a356aaf6e81ea3f267c79244699439f516d Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 4 Jun 2024 18:09:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E6=A8=A1=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../return/apply/component/addReturn.vue      | 23 +++++++++++--------
 .../return/apply/component/home.vue           |  7 +++++-
 .../claimAndreturn/return/apply/index.vue     |  1 +
 .../claimAndreturn/return/auditing/index.vue  |  7 ++++--
 .../return/receive/component/handlePage.vue   |  3 ++-
 .../return/receive/component/home.vue         |  5 +++-
 .../claimAndreturn/return/receive/index.vue   |  1 +
 7 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
index fd12434f..c36a98c4 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
@@ -742,11 +742,13 @@ export default {
                         const res = await submitRefuseBackApply(params)
                         if (res.code == 200) {
                             this.$message({ type: 'success', message: res.msg })
-                            setTimeout(() => {
-                                this.$tab.closeOpenPage({
-                                    path: '/claimAndRefund/return/returnApply',
-                                })
-                            }, 1000)
+
+                            this.$emit('goBackPage')
+                            // setTimeout(() => {
+                            //     this.$tab.closeOpenPage({
+                            //         path: '/claimAndRefund/return/returnApply',
+                            //     })
+                            // }, 1000)
                         }
                     } else {
                         let params = {
@@ -760,11 +762,12 @@ export default {
                         const res = await submitBackApplyApi(params)
                         if (res.code == 200) {
                             this.$message({ type: 'success', message: res.msg })
-                            setTimeout(() => {
-                                this.$tab.closeOpenPage({
-                                    path: '/claimAndRefund/return/returnApply',
-                                })
-                            }, 1000)
+                            this.$emit('goBackPage')
+                            // setTimeout(() => {
+                            //     this.$tab.closeOpenPage({
+                            //         path: '/claimAndRefund/return/returnApply',
+                            //     })
+                            // }, 1000)
                         }
                     }
                 }
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
index 111b9969..a9657eff 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
@@ -124,7 +124,7 @@
                     plain
                     size="mini"
                     @click="handleAdd"
-                    v-hasPermi="['return:review']"
+                    v-hasPermi="['return:apply:apply']"
                     >退料申请</el-button
                 >
             </el-col>
@@ -145,6 +145,7 @@
                     icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
+                    v-hasPermi="['return:apply:export']"
                     >导出</el-button
                 >
             </el-col>
@@ -280,6 +281,7 @@
                         type="text"
                         icon="el-icon-zoom-in"
                         @click="handleSee(scope.row, 'see')"
+                        v-hasPermi="['return:apply:view']"
                         >查看</el-button
                     >
                     <!-- <el-button
@@ -296,6 +298,7 @@
                         type="text"
                         v-if="scope.row.taskStatus == '101'"
                         @click="handleUpdate(scope.row)"
+                        v-hasPermi="['return:apply:reject:submit']"
                         >驳回提交</el-button
                     >
                     <el-button
@@ -303,12 +306,14 @@
                         type="text"
                         icon="el-icon-delete"
                         @click="handleDelete(scope.row)"
+                        v-hasPermi="['return:apply:del']"
                         >删除</el-button
                     >
                     <el-button
                         size="mini"
                         type="text"
                         @click="handlePrint(scope.row)"
+                        v-hasPermi="['return:apply:list']"
                         >退料单</el-button
                     >
                 </template>
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
index ab956914..731e2439 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
@@ -11,6 +11,7 @@
             :rejectId="rejectId"
             @returnApply="returnApply"
             @rejectSubmit="rejectSubmit"
+            @goBackPage="goBack"
         />
     </div>
 </template>
diff --git a/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue b/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
index d576a277..82c436e3 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
@@ -121,7 +121,7 @@
                     size="mini"
                     @click="handleExam"
                     :disabled="multiple"
-                    v-hasPermi="['auditing:batch']"
+                    v-hasPermi="['return:auditing:auditing:batch']"
                     >批量审核</el-button
                 >
             </el-col>
@@ -141,6 +141,7 @@
                     icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
+                    v-hasPermi="['return:auditing:export']"
                     >导出</el-button
                 >
             </el-col>
@@ -277,6 +278,7 @@
                         type="text"
                         icon="el-icon-zoom-in"
                         @click="handleSee(scope.row, 'see')"
+                        v-hasPermi="['return:auditing:view']"
                         >查看</el-button
                     >
                     <el-button
@@ -284,7 +286,7 @@
                         type="text"
                         icon="el-icon-edit"
                         v-if="scope.row.applyStatus == '0'"
-                        v-hasPermi="['return:auditing']"
+                        v-hasPermi="['return:auditing:auditing']"
                         @click="handleUpdate(scope.row, 'update')"
                     >
                         审批
@@ -304,6 +306,7 @@
                         type="text"
                         icon="el-icon-tickets"
                         @click="handlePrint(scope.row)"
+                        v-hasPermi="['return:auditing:list']"
                         >退料单</el-button
                     >
                 </template>
diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
index 90b61d74..fe120ef5 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
@@ -804,7 +804,8 @@ export default {
                 endBack(param).then((response) => {
                     if (response.code == 200) {
                         this.$modal.msgSuccess('操作成功')
-                        this.back()
+                        // this.back()
+                        this.$$emit('goBackPage')
                     }
                 })
             }
diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
index 18f73821..d997e46f 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
@@ -133,6 +133,7 @@
                     icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
+                    v-hasPermi="['return:receive:export']"
                     >导出</el-button
                 >
             </el-col>
@@ -213,6 +214,7 @@
                         size="medium"
                         type="text"
                         icon="el-icon-zoom-in"
+                        v-hasPermi="['return:receive:view']"
                         @click="handleSee(scope.row, 'see')"
                         >查看</el-button
                     >
@@ -221,7 +223,7 @@
                         type="text"
                         @click="handleReturn(scope.row, 'see')"
                         icon="el-icon-d-arrow-right"
-                        v-hasPermi="['return:btn']"
+                        v-hasPermi="['return:receive:handler']"
                         v-if="scope.row.taskStatus != '40'"
                     >
                         退料
@@ -231,6 +233,7 @@
                         type="text"
                         icon="el-icon-tickets"
                         @click="handlePrint(scope.row)"
+                        v-hasPermi="['return:receive:list']"
                         >退料单</el-button
                     >
                 </template>
diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/index.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/index.vue
index e611b068..67bd4c68 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/index.vue
@@ -13,6 +13,7 @@
             :rejectTaskId="rejectTaskId"
             @receiveView="receiveView"
             @receiveReturn="receiveReturn"
+            @goBackPage="goBack"
         />
     </div>
 </template>