From 75e5a4d3f12d5655b8bfd2a180e2c2d3e1f0ee40 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 5 Jun 2024 16:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86-=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=BC=B9=E6=A1=86-=E6=93=8D=E4=BD=9C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/claimAndreturn/picking/outbound/index.vue   | 8 ++++----
 .../views/warehouseManage/warehousing/newTools/index.vue  | 5 +++--
 .../views/warehouseManage/warehousing/repair/index.vue    | 5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index 271fb738..250b795e 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -309,7 +309,7 @@
                             v-if="scope.row.status != 2"
                             @click="manualOperation(scope.row)"
                         >
-                            出库结单
+                            完成出库
                         </el-button>
                     </template>
                 </el-table-column>
@@ -752,14 +752,14 @@ export default {
         // 手动操作
         manualOperation(row) {
             // 弹框确认
-            this.$confirm('是否确认出库结单？', '提示', {
+            this.$confirm('是否确认完成出库？', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning',
             })
                 .then(() => {
                     outboundCompleted({ id: this.dialogQuery.id, typeId: row.typeId }).then((response) => {
-                        this.$modal.msgSuccess('出库结单成功')
+                        this.$modal.msgSuccess('完成出库成功')
                         this.handleDialogQuery()
                         this.handleQuery()
                     })
@@ -767,7 +767,7 @@ export default {
                 .catch(() => {
                     this.$message({
                         type: 'info',
-                        message: '已取消出库结单',
+                        message: '已取消完成出库',
                     })
                 })
         },
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
index 755eb309..19279311 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
@@ -363,14 +363,14 @@
                         <el-button
                             size="mini"
                             type="text"
-                            v-if="scope.row.status == '0'"
+                            v-if="scope.row.status == '0' && scope.row.userIds.includes(userId)"
                             @click="pass(scope.row)"
                             >通过</el-button
                         >
                         <el-button
                             size="mini"
                             type="text"
-                            v-if="scope.row.status == '0'"
+                            v-if="scope.row.status == '0' && scope.row.userIds.includes(userId)"
                             @click="refused(scope.row)"
                             >不通过</el-button
                         >
@@ -605,6 +605,7 @@ export default {
                     },
                 ],
             },
+            userId: sessionStorage.getItem('userId'),
         }
     },
     created() {
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
index c84c023b..c54d7dea 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
@@ -410,13 +410,13 @@
                             size="mini"
                             type="text"
                             @click="pass(scope.row)"
-                            v-if="scope.row.status == '进行中'"
+                            v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)"
                             >通过</el-button
                         >
                         <el-button
                             size="mini"
                             type="text"
-                            v-if="scope.row.status == '进行中'"
+                            v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)"
                             @click="refused(scope.row)"
                             >不通过</el-button
                         >
@@ -534,6 +534,7 @@ export default {
                 ],
             },
             equipmentTypeList: [],
+            userId: sessionStorage.getItem('userId'),
         }
     },
     created() {