From d17f336a891e00bceec9ff647e851950a3eec0f9 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 5 Sep 2024 19:26:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=89=B9=E9=87=8F=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=8F=AF=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue      | 39 ++++++++++++++++++++++++++++++
 src/views/wpm_gx/handover_form.vue |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index df4244e3..af745394 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -67,12 +67,36 @@
 					type="index"
 					width="50"
 				></el-table-column>
+				<el-table-column type="expand">
+						<template #default="props">
+							<div style="padding-left: 50px">
+								<el-descriptions :column="2">
+									<template v-for="item in props.row.handoverb" :key="item.id">
+										<el-descriptions :column="3">
+											<el-descriptions-item label="批次">
+												{{props.row.batch}}
+											</el-descriptions-item>
+											<el-descriptions-item label="数量">
+												{{props.row.count}}
+											</el-descriptions-item>
+											<el-descriptions-item label="不合格标记" v-if="props.row.notok_sign_name!==null">
+												{{props.row.notok_sign_name}}
+											</el-descriptions-item>
+										</el-descriptions>
+									</template>
+								</el-descriptions>
+							</div>
+						</template>
+					</el-table-column>
 				<el-table-column
 					label="物料"
 					prop="material_name"
 					min-width="140"
 				></el-table-column>
 				<el-table-column label="批次" prop="batch" min-width="140">
+					<template #default="scope">
+						<el-text v-if="scope.row.handoverb.length>0" type="primary">{{scope.row.handoverb.length}}批</el-text>
+					</template>
 				</el-table-column>
 				<el-table-column label="数量" prop="count" width="80"></el-table-column>
 				<el-table-column label="交接类型" prop="type" width="100">
@@ -144,6 +168,14 @@
 							"
 							>接收</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
 							link
 							size="small"
@@ -324,6 +356,13 @@ export default {
 				this.$refs.saveDialog.open("edit").setData(row);
 			});
 		},
+		table_show(row){
+			this.type=row.type;
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("show").setData(row);
+			});
+		},
 		//删除
 		async table_del(row) {
 			var id = row.id;
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index cc3ee589..169f96e0 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -167,7 +167,7 @@
 					</el-col>
 				</el-row>
 		</el-form>
-		<el-footer>
+		<el-footer v-if="mode!=='show'">
 			<el-button type="primary" v-loading="isSaveing" @click="submit"
 				>确定</el-button
 			>