From 58bf615de3d025b2406dbb982938cf0e3f259576 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Sep 2024 15:28:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E7=89=A9=E6=96=99/?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue      | 12 +++---------
 src/views/wpm_gx/handover_form.vue |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index ae24d515..99f86c3c 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -163,20 +163,14 @@
 							size="small"
 							@click="table_receive(scope.row)"
 							type="success"
-							v-if="
-								scope.row.recive_mgroup == mgroupId &&
-								scope.row.submit_time == null
-							"
-							>接收</el-button
-						>
+							v-if="(scope.row.recive_mgroup == mgroupId||scope.row.recive_dept == deptId)&&scope.row.submit_time == null"
+						>接收</el-button>
 						<el-button
 							link
 							size="small"
 							@click="table_show(scope.row)"
 							type="success"
-							v-if="scope.row.recive_mgroup == mgroupId &&scope.row.submit_time == null"
-							>查看</el-button
-						>
+						>查看</el-button>
 						<el-button
 							link
 							size="small"
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 46a6e9d8..675e0371 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -291,7 +291,7 @@ export default {
 			that.deptID = that.$TOOL.data.get('gx_deptID');
 			that.getUserList();
 		}
-		if(that.type==40){
+		if(that.type==20||that.type==40){
 			that.getMaterialNotok();
 		}else{
 			that.getMaterial();