From 744f78b6217e8143c38f36a85ef6901c918b97db Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 11 Sep 2024 15:28:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E6=AE=B5=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E5=BA=93=E5=AD=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue | 77 ++++++++++++++++++++---------------
 src/views/wpm_gx/inm.vue      | 21 +++++++---
 2 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 66749295..58af3668 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -75,21 +75,19 @@
 				<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>
+								<template v-for="item in props.row.handoverb" :key="item.id">
+									<el-descriptions :column="3">
+										<el-descriptions-item label="批次">
+											{{item.batch}}
+										</el-descriptions-item>
+										<el-descriptions-item label="数量">
+											{{item.count}}
+										</el-descriptions-item>
+										<el-descriptions-item label="不合格标记" v-if="item.notok_sign_name!==null">
+											{{item.notok_sign_name}}
+										</el-descriptions-item>
+									</el-descriptions>
+								</template>
 							</div>
 						</template>
 					</el-table-column>
@@ -105,18 +103,13 @@
 				</el-table-column>
 				<el-table-column label="数量" prop="count" width="80"></el-table-column>
 				<el-table-column label="交接类型" prop="type" width="100">
-					<template #default="scope">
-						<el-text
-							v-if="scope.row.send_mgroup == mgroupId"
-							type="primary"
-							>交送</el-text
-						>
-						<span style="width: 4px;"></span>
-						<el-text
-							v-if="scope.row.recive_mgroup == mgroupId"
-							type="success"
-							>接收</el-text
-						>
+					<template #default="scope" v-if="mgroupName=='size'||mgroupName=='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>
+					</template>
+					<template #default="scope" v-else>
+						<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>
 				</el-table-column>
 				<el-table-column label="交接类别" prop="type" width="80">
@@ -127,9 +120,12 @@
 						<el-tag v-if="scope.row.type == 20" type="warning"
 							>返工</el-tag
 						>
-						<el-tag v-if="scope.row.type == 30" type="warning"
+						<el-tag v-if="scope.row.type == 30" type="primary"
 							>检验</el-tag
 						>
+						<el-tag v-if="scope.row.type == 40" type="danger"
+							>报废</el-tag
+						>
 					</template>
 				</el-table-column>
 				<el-table-column
@@ -275,8 +271,10 @@ export default {
 			selection: [],
 			handoverItem: {},
 			values: "交送",
+			deptId:'',
 			mtask: "",
 			mlogId: "",
+			mgroupId: "",
 			processId: "",
 			processCate: "",
 			printer_name: "",
@@ -285,12 +283,27 @@ export default {
 	},
 	mounted() {
 		let that = this;
+		console.log('that.mgroupName',that.mgroupName);
 		if(that.mgroupName=="size"){//尺寸检验
-			that.params.material__process__name="一次超洗";
-			that.apiObj = that.$API.wpm.handover.list;
+			// that.params.material__process__name="一次超洗";
+			that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
+			    if(res.length>0){
+					that.deptId = res[0].id;
+					that.params.dept=res[0].id;
+					console.log('that.deptId',that.deptId);
+				}
+				that.apiObj = that.$API.wpm.handover.list;
+			})
 		}else if(that.mgroupName=="facade"){//外观检验
-			that.params.material__process__name="二次超洗";
-			that.apiObj = that.$API.wpm.handover.list;
+			// that.params.material__process__name="二次超洗";
+			that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
+			    if(res.length>0){
+					that.deptId = res[0].id;
+					that.params.dept=res[0].id;
+					console.log('that.deptId',that.deptId);
+				}
+				that.apiObj = that.$API.wpm.handover.list;
+			})
 		}else{//工段交接
 			that.printer_name = localStorage.getItem("printer_name");
 			that.$API.mtm.mgroup.list
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 13ef1dfb..dc5f440f 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -34,7 +34,6 @@
 				ref="table"
 				:apiObj="apiObj"
 				row-key="id"
-				hidePagination
 				:params="params"
 				:query="query"
 			>
@@ -182,6 +181,7 @@ export default {
 			apiObj: null,
 			params: {
 				mgroupx: "",
+				belong_dept:''
 			},
 			query: {},
 			dialog: {
@@ -202,11 +202,21 @@ export default {
 	mounted() {
 		let that = this;
 		if(that.mgroupName=="size"){
-			that.params.material__process__name = "一次超洗";
-			that.apiObj = that.$API.wpm.wmaterial.list;
+			// that.params.material__process__name = "一次超洗";
+			that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
+				if(res.length>0){
+					that.params.belong_dept=res[0].id;
+				}
+				that.apiObj = that.$API.wpm.wmaterial.list;
+			})
 		}else if(that.mgroupName=="facade"){
-			that.params.material__process__name = "二次超洗";
-			that.apiObj = that.$API.wpm.wmaterial.list;
+			// that.params.material__process__name = "二次超洗";
+			that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
+				if(res.length>0){
+					that.params.belong_dept=res[0].id;
+				}
+				that.apiObj = that.$API.wpm.wmaterial.list;
+			})
 		}else{
 			that.$API.mtm.mgroup.list
 			.req({ page: 0, search: that.mgroupName })
@@ -218,6 +228,7 @@ export default {
 				that.mgroupId = res[0].id;
 				that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
 				that.params.mgroupx = res[0].id;
+				that.params.belong_dept = res[0].belong_dept;
 				that.apiObj = that.$API.wpm.wmaterial.list;
 			});
 		}