From 10ee4471dee655b1766ceceeef14f3f923bcc4e2 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 27 Jun 2025 11:02:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E4=BA=A4=E6=8E=A5=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/handover.vue | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/views/wpm_bx/handover.vue b/src/views/wpm_bx/handover.vue
index 029ce7c7..6ff836db 100644
--- a/src/views/wpm_bx/handover.vue
+++ b/src/views/wpm_bx/handover.vue
@@ -98,12 +98,24 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="数量" prop="count" min-width="80"></el-table-column>
-				<el-table-column label="交接类型" prop="type" min-width="80">
-					<template #default="scope" v-if="mgroup_name=='size'||mgroup_name=='facade'">
-						<el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text>
-						<el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text>
+				<!-- <el-table-column label="交接类别" prop="type" width="80">
+					<template #default="scope">
+						<el-tag v-if="scope.row.type == 10" type="success">正常</el-tag>
+						<el-tag v-if="scope.row.type == 20" type="warning">返工</el-tag>
+						<el-tag v-if="scope.row.type == 30" type="primary">检验</el-tag>
+						<el-tag v-if="scope.row.type == 40" type="danger">报废</el-tag>
+						<el-tag v-if="scope.row.type == 60" type="warning">退料</el-tag>
 					</template>
-					<template #default="scope" v-else>
+				</el-table-column> -->
+				<el-table-column label="交接类型" prop="type" min-width="80">
+					<template #default="scope">
+						<el-tag v-if="scope.row.type == 10&&scope.row.mtype == 10" type="success">正常</el-tag>
+						<el-tag v-if="scope.row.type == 10&&scope.row.mtype == 20" type="warning">分批</el-tag>
+						<el-tag v-if="scope.row.type == 10&&scope.row.mtype == 30" type="warning">合批</el-tag>
+						<el-tag v-if="scope.row.type == 20" type="warning">返工</el-tag>
+						<el-tag v-if="scope.row.type == 30" type="primary">检验</el-tag>
+						<el-tag v-if="scope.row.type == 40" type="danger">报废</el-tag>
+						<el-tag v-if="scope.row.type == 60" type="warning">退料</el-tag>
 						<el-text v-if="scope.row.send_mgroup == mgroupId" type="primary">交送</el-text>
 						<el-text v-if="scope.row.recive_mgroup == mgroupId" type="success">接收</el-text>
 					</template>
@@ -114,15 +126,6 @@
 						<el-text v-if="scope.row.recive_mgroup == mgroupId">{{scope.row.recive_mgroup_name}}</el-text>
 					</template>
 				</el-table-column>
-				<el-table-column label="交接类别" prop="type" width="80">
-					<template #default="scope">
-						<el-tag v-if="scope.row.type == 10" type="success">正常</el-tag>
-						<el-tag v-if="scope.row.type == 20" type="warning">返工</el-tag>
-						<el-tag v-if="scope.row.type == 30" type="primary">检验</el-tag>
-						<el-tag v-if="scope.row.type == 40" type="danger">报废</el-tag>
-						<el-tag v-if="scope.row.type == 60" type="warning">退料</el-tag>
-					</template>
-				</el-table-column>
 				<el-table-column
 					label="交送人"
 					prop="send_user_name"