From 76476069d5b3f2a22c2d126188e31966e32a5a31 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 4 Jun 2024 16:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=9D=83=E9=99=90=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/AddPicking.vue    |  8 +++--
 .../picking/apply/component/home.vue          |  7 ++++-
 .../claimAndreturn/picking/apply/index.vue    |  1 +
 .../auditing/component/auditingPage.vue       | 30 ++++++++++---------
 .../picking/auditing/component/home1.vue      | 15 ++++++----
 .../claimAndreturn/picking/auditing/index.vue |  1 +
 .../claimAndreturn/picking/outbound/index.vue |  8 +++--
 .../claimAndreturn/picking/protocol/index.vue |  4 +++
 8 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
index fd870bfe..1cef75dc 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
@@ -717,9 +717,11 @@ export default {
                             type: 'success',
                             message: res.msg,
                         })
-                        this.$tab.closeOpenPage({
-                            path: '/claimAndRefund/receive/receiveApply',
-                        })
+                        // this.$tab.closeOpenPage({
+                        //     path: '/claimAndRefund/receive/receiveApply',
+                        // })
+
+                        this.$emit('goBackPage')
                     }
                 }
             })
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
index 08ee1075..e2800a0a 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -94,7 +94,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd"
-                    v-hasPermi="['picking:auditing']"
+                    v-hasPermi="['picking:apply:apply']"
                     >新建</el-button
                 >
             </el-col>
@@ -105,6 +105,7 @@
                     icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
+                    v-hasPermi="['picking:apply:export']"
                     >导出</el-button
                 >
             </el-col>
@@ -256,6 +257,7 @@
                         type="text"
                         icon="el-icon-zoom-in"
                         @click="handleView(scope.row)"
+                        v-hasPermi="['picking:apply:view']"
                         >查看</el-button
                     >
                     <el-button
@@ -264,6 +266,7 @@
                         icon="el-icon-edit"
                         v-if="scope.row.taskStatus == 30"
                         @click="handleUpdate(scope.row)"
+                        v-hasPermi="['picking:apply:edit']"
                         >编辑</el-button
                     >
                     <el-button
@@ -275,6 +278,7 @@
                             scope.row.taskStatus == 100
                         "
                         @click="handleUpdate2(scope.row)"
+                        v-hasPermi="['picking:apply:reject:submit']"
                         >驳回提交</el-button
                     >
                     <el-button
@@ -283,6 +287,7 @@
                         icon="el-icon-delete"
                         v-if="scope.row.taskStatus == 30"
                         @click="handleDelete(scope.row)"
+                        v-hasPermi="['picking:apply:del']"
                         >删除</el-button
                     >
                 </template>
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
index 7590a5e4..1fe63317 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
@@ -14,6 +14,7 @@
             @addPicking="addPicking"
             @viewPicking="viewPicking"
             @editPicking="editPicking"
+            @goBackPage="goBack"
         />
     </div>
 </template>
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 230a6e17..1967bded 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue
@@ -216,14 +216,14 @@
                     type="primary"
                     @click="subAuditLeaseByCompany(9)"
                     v-if="queryParams.taskStatus == 30"
-                    v-hasPermi="['receive:examine:fgs']"
+                    v-hasPermi="['picking:auditing:fgs']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="subAuditLeaseByCompany(5)"
                     v-if="queryParams.taskStatus == 31"
-                    v-hasPermi="['receive:examine:sgb']"
+                    v-hasPermi="['picking:auditing:sgb']"
                     >确 定</el-button
                 >
                 <el-button
@@ -237,14 +237,14 @@
                     type="primary"
                     @click="subAuditLeaseByCompany(1)"
                     v-if="queryParams.taskStatus == 32"
-                    v-hasPermi="['receive:examine:nbry-jjfgs']"
+                    v-hasPermi="['picking:auditing:jjnb']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="subAuditLeaseByCompany(3)"
                     v-if="queryParams.taskStatus == 32"
-                    v-hasPermi="['receive:examine:nbry-sbfgs']"
+                    v-hasPermi="['picking:auditing:tsnb']"
                     >确 定</el-button
                 >
             </div>
@@ -269,14 +269,14 @@
                     type="primary"
                     @click="refuseAuditLeaseByCompany(10)"
                     v-if="queryParams.taskStatus == 30"
-                    v-hasPermi="['receive:examine:fgs']"
+                    v-hasPermi="['picking:auditing:fgs']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="refuseAuditLeaseByCompany(6)"
                     v-if="queryParams.taskStatus == 31"
-                    v-hasPermi="['receive:examine:sgb']"
+                    v-hasPermi="['picking:auditing:sgb']"
                     >确 定</el-button
                 >
                 <el-button
@@ -290,14 +290,14 @@
                     type="primary"
                     @click="refuseAuditLeaseByCompany(2)"
                     v-if="queryParams.taskStatus == 32"
-                    v-hasPermi="['receive:examine:nbry-jjfgs']"
+                    v-hasPermi="['picking:auditing:jjnb']"
                     >确 定</el-button
                 >
                 <el-button
                     type="primary"
                     @click="refuseAuditLeaseByCompany(4)"
                     v-if="queryParams.taskStatus == 32"
-                    v-hasPermi="['receive:examine:nbry-sbfgs']"
+                    v-hasPermi="['picking:auditing:tsnb']"
                     >确 定</el-button
                 >
             </div>
@@ -509,9 +509,10 @@ export default {
             const res = await auditLeaseByCompany(params)
             if (res.code == 200) {
                 this.examineVisible = false
-                this.$tab.closeOpenPage({
-                    path: '/claimAndRefund/receive/receiveManage',
-                })
+                // this.$tab.closeOpenPage({
+                //     path: '/claimAndRefund/receive/receiveManage',
+                // })
+                this.$emit('goBackPage')
             }
             // console.log('subAuditLeaseByCompany ==================', res)
         },
@@ -560,9 +561,10 @@ export default {
             const res = await rejectLeaseByCompany(params)
             if (res.code == 200) {
                 this.examineVisible = false
-                this.$tab.closeOpenPage({
-                    path: '/claimAndRefund/receive/receiveManage',
-                })
+                // this.$tab.closeOpenPage({
+                //     path: '/claimAndRefund/receive/receiveManage',
+                // })
+                this.$emit('goBackPage')
             }
             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 be7b6b34..ceee89bb 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -102,6 +102,7 @@
                     icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
+                    v-hasPermi="['picking:auditing:export']"
                     >导出</el-button
                 >
             </el-col>
@@ -203,14 +204,17 @@
             </el-table-column>
             <el-table-column label="操作" width="250" align="center">
                 <template slot-scope="scope">
-                    <el-button size="mini" @click="handleView(scope.row)"
+                    <el-button
+                        size="mini"
+                        @click="handleView(scope.row)"
+                        v-hasPermi="['picking:auditing:view']"
                         >查看</el-button
                     >
                     <el-button
                         size="mini"
                         type="primary"
                         @click="handleExamine(scope.row)"
-                        v-hasPermi="['receive:examine:fgs']"
+                        v-hasPermi="['picking:auditing:fgs']"
                         v-if="
                             Number(scope.row.examineStatusId) == 30 &&
                             scope.row.deptId == currentDeptId
@@ -221,7 +225,7 @@
                         size="mini"
                         type="primary"
                         @click="handleExamine(scope.row)"
-                        v-hasPermi="['receive:examine:sgb']"
+                        v-hasPermi="['picking:auditing:sgb']"
                         v-if="
                             Number(scope.row.examineStatusId) == 31 &&
                             (scope.row.leaseApplyInfoList[0].status == '0' ||
@@ -249,7 +253,7 @@
                         size="mini"
                         type="primary"
                         @click="handleExamine(scope.row, 'jjfgs')"
-                        v-hasPermi="['receive:examine:nbry-jjfgs']"
+                        v-hasPermi="['picking:auditing:jjnb']"
                         v-if="
                             Number(scope.row.examineStatusId) == 32 &&
                             (scope.row.leaseApplyInfoList[0].status == '5' ||
@@ -263,7 +267,7 @@
                         size="mini"
                         type="primary"
                         @click="handleExamine(scope.row, 'sbfgs')"
-                        v-hasPermi="['receive:examine:nbry-sbfgs']"
+                        v-hasPermi="['picking:auditing:tsnb']"
                         v-if="
                             Number(scope.row.examineStatusId) == 32 &&
                             (scope.row.leaseApplyInfoList[0].status == '5' ||
@@ -278,6 +282,7 @@
                         size="mini"
                         type="info"
                         @click="openLld(scope.row)"
+                        v-hasPermi="['picking:auditing:list']"
                         >领料单</el-button
                     >
                 </template>
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
index f2abe9ab..e01682c3 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
@@ -12,6 +12,7 @@
             :auditingTaskId="auditingTaskId"
             @pickingView="pickingView"
             @pickingAuditing="pickingAuditing"
+            @goBackPage="goBack"
         />
     </div>
 </template>
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index dad4822d..0e333e53 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -89,6 +89,7 @@
                     icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
+                    v-hasPermi="['picking:outbound:export']"
                     >导出</el-button
                 >
             </el-col>
@@ -157,7 +158,10 @@
                 class-name="small-padding fixed-width"
             >
                 <template slot-scope="scope">
-                    <el-button size="mini" @click="handleView(scope.row)"
+                    <el-button
+                        size="mini"
+                        @click="handleView(scope.row)"
+                        v-hasPermi="['picking:outbound:view']"
                         >查看</el-button
                     >
                     <el-button
@@ -165,7 +169,7 @@
                         type="primary"
                         v-if="scope.row.taskStatus != 35"
                         @click="handleOut(scope.row)"
-                        v-hasPermi="['picking:outbound']"
+                        v-hasPermi="['picking:outbound:out']"
                     >
                         出库
                     </el-button>
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
index fc315d69..f72af180 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
@@ -84,6 +84,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd"
+                    v-hasPermi="['picking:protocol:add']"
                     >新建</el-button
                 >
             </el-col>
@@ -117,6 +118,7 @@
                     icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
+                    v-hasPermi="['picking:protocol:export']"
                     >导出</el-button
                 >
             </el-col>
@@ -239,6 +241,7 @@
                         type="primary"
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
+                        v-hasPermi="['picking:protocol:edit']"
                         >编辑</el-button
                     >
                     <el-button
@@ -246,6 +249,7 @@
                         type="danger"
                         icon="el-icon-delete"
                         @click="handleDelete(scope.row)"
+                        v-hasPermi="['picking:protocol:del']"
                         >删除</el-button
                     >
                 </template>