From d41ebfed1314171a74231550fb6ab7ffff8fb677 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 14 Feb 2025 15:52:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:6=E8=BD=A6=E9=97=B4=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B7=BB=E5=8A=A0=E4=B8=AD=E9=97=B4=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_dept6.vue | 49 ++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue
index adb4fd13..6e6f8f96 100644
--- a/src/views/wpm/mlog_dept6.vue
+++ b/src/views/wpm/mlog_dept6.vue
@@ -223,9 +223,7 @@
 									prop="submit_time"
 								>
 									<template #default="scope">
-										<span v-if="scope.row.submit_time"
-											>是</span
-										>
+										<span v-if="scope.row.submit_time">是</span>
 										<span v-else>否</span>
 									</template>
 								</el-table-column>
@@ -233,14 +231,13 @@
 									label="操作"
 									fixed="right"
 									align="left"
+									width="60"
 								>
 									<template #default="scope">
 										<el-button
 											link
 											type="primary"
-											@click.stop="
-												handover_submit(scope.row)
-											"
+											@click.stop="handover_submit(scope.row)"
 											v-auth="'handover.submit'"
 											v-if="scope.row.submit_time == null"
 										>
@@ -298,7 +295,6 @@
 								:params="paramsWm"
 								:query="queryWm"
 								stripe
-								hidePagination
 							>
 								<el-table-column label="物料名" prop="material">
 									<template #default="scope">
@@ -315,21 +311,19 @@
 										{{ scope.row.material_.model }}
 									</template>
 								</el-table-column>
-								<el-table-column
-									label="已到工序"
-									prop="material"
-								>
-									<template #default="scope">{{
-										scope.row.material_.process_name
-									}}</template>
+								<el-table-column label="已到工序" prop="material">
+									<template #default="scope">
+										{{scope.row.material_.process_name}}
+									</template>
 								</el-table-column>
-								<el-table-column label="批次" prop="batch">
+								<el-table-column label="批次" prop="batch" show-overflow-tooltip>
 								</el-table-column>
-								<el-table-column
-									label="数量"
-									prop="count"
-									width="80"
-								>
+								<el-table-column label="数量" prop="count" width="80">
+								</el-table-column>
+								<el-table-column label="操作" fixed="right" align="right" width="55">
+									<template #default="scope">
+										<el-link link type="primary" @click.stop="inm_test(scope.row)">检验</el-link>
+									</template>
 								</el-table-column>
 							</scTable>
 						</el-main>
@@ -338,6 +332,11 @@
 			</el-container>
 		</el-main>
 	</el-container>
+	<middle-dialog
+		ref="inmTestDialog"
+		v-if="dialogInmTest"
+		@closed="dialogInmTest = false">
+	</middle-dialog>
 	<showDrawer
 		ref="showDrawer"
 		v-if="visibleDrawer"
@@ -363,6 +362,7 @@
 </template>
 
 <script>
+import middleDialog from "./middle_test.vue";
 import handoverDialog from "./handover_form.vue";
 import showDrawer from "./mlog_dept6_detail.vue";
 import materials from "./../mtm/materials.vue";
@@ -370,6 +370,7 @@ export default {
 	components: {
 		showDrawer,
 		materials,
+		middleDialog,
 		handoverDialog
 	},
 	data() {
@@ -406,7 +407,6 @@ export default {
 			paramsWm: {
 				belong_dept__name: "6车间",
 				count__gte: 1,
-				page: 0,
 			},
 			queryWm: {
 				search: "",
@@ -427,6 +427,7 @@ export default {
 			materialType: "wm",
 			visibleDrawer: false,
 			dialogHandover:false,
+			dialogInmTest:false,
 		};
 	},
 	mounted() {
@@ -536,6 +537,12 @@ export default {
 				this.$refs.handoverDialog.open('add');
 			})
 		},
+		inm_test(row){
+			this.dialogInmTest = true;
+			this.$nextTick(() => {
+				this.$refs.inmTestDialog.open().setData(row);
+			})
+		},
 	},
 };
 </script>