From b6c80f3ba91d20ba0db06feee1702ee9307d0a85 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 11 Jul 2025 16:42:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AFmlog->mlogb=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=BC=A0=E5=8F=82=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlog_detail.vue | 17 +++++++++++++----
 src/views/wpm_bx/mlogs.vue       |  7 +++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 64b7557b..fa44a19b 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -402,7 +402,9 @@
 				:isfix = "mlogItem.is_fix"
 				:routeId ="routeId"
 				:tracking="tracking"
-				:materialIn="materialIn"
+				:material_in="materialIn"
+				:hasRoute = "hasRoute"
+				:process="process"
 				@success="handleSaveSuccess"
 				@closed="saveMlogbInClose"
 			>
@@ -474,6 +476,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		mgroup:{
+			type: String,
+			default: "",
+		},
 	},
 	components: {
 		editDialog,
@@ -521,7 +527,6 @@ export default {
 			},
 			tracking:10,
 			mlogb:"",
-			mgroup: "",
 			mlogItem: {},
 			saveInForm: {
 				count_use: 0,
@@ -569,6 +574,7 @@ export default {
 			qct:null,
 			defectlist:[],
 			batchNumber:'',
+			hasRoute:false,
 			isSubmit:false,
 			fileVisible:false,
 		};
@@ -594,6 +600,9 @@ export default {
 			let that = this;
 			that.$API.wpm.mlog.item.req(that.mlogId).then((res) => {
 				that.mlogItem = res;
+				if(res.route!==null){
+					that.hasRoute = true;
+				}
 				that.oinfo_json = [];
 				if(res.oinfo_json_){
 					for(let key in res.oinfo_json_){
@@ -604,12 +613,12 @@ export default {
 					}
 				}
 				that.routeId = res.route;
-				that.tracking = res.material_in_.tracking;
+				that.tracking = res.material_in_!==null?res.material_in_.tracking:null;
 				if(res.test_file!==null){
 					that.fileList = [{name:res.test_file,url:res.test_file}];
 					that.form.test_file = res.test_file;
 				}
-				that.mgroup = res.mgroup;
+				// that.mgroup = res.mgroup;
 				// that.paramsWm.mgroup = res.mgroup;
 				// that.paramsWm.search = that.batchContains;
 				that.materialIn = res.material_in;
diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue
index edaf02e1..63352d2c 100644
--- a/src/views/wpm_bx/mlogs.vue
+++ b/src/views/wpm_bx/mlogs.vue
@@ -201,6 +201,7 @@
 			:process="process"
 			:mtask="mtask"
 			:dept = "deptId"
+			:mgroup="mgroupId"
 			@closed="detailClose"
 		>
 		</detail-drawer>
@@ -241,8 +242,8 @@ export default {
 			default: "",
 		},
 		mgroupMtype: {
-		    type: String,
-			default: "",
+		    type: Number,
+			default: 10,
 		}
 	},
 	name: "mlog",
@@ -267,6 +268,7 @@ export default {
 			selection: [],
 			mtask: "",
 			mlogId: "",
+			mgroup_name: "",
 			route_code: "",
 			equipmentId: "",
 			showHidden:false,
@@ -276,6 +278,7 @@ export default {
 		mgroupName: {
 			handler: function (newval,odlval) {
 				let that = this;
+				that.mgroup_name = newval;
 				that.params.mgroup = "";
 				that.apiObj = null;
 				that.getMgroupInfo();