From 98bfcf2e6e1b99c80bcb54c7123ed7daed0cddfa Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 20 May 2025 09:18:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=9A=E4=BA=BA=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=B6=E8=A1=A8=E5=8D=95=E5=92=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BB=A5=E5=8F=8A=E8=AF=A6=E6=83=85=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/f_mlogs_form.vue |  2 ++
 src/views/wpm_gx/fmlog_detail.vue | 12 +++++++++++-
 src/views/wpm_gx/mlog_detail.vue  |  9 ++++++---
 src/views/wpm_gx/mlog_form.vue    |  1 +
 src/views/wpm_gx/mlogs.vue        | 16 +++++++++++-----
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index 3ee22b4f..5f562f71 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -312,6 +312,7 @@ const defaultForm = {
 	shift: null,
 	wm_in: null,
 	fmlog:null,
+	handle_user:null,
 	handle_users:null,
 	material_out:'',
 	count_pn_jgqbl:0,
@@ -615,6 +616,7 @@ export default {
 			Object.assign(this.form, data);
 		},
 		handleUsersChange(){
+			this.form.handle_user = this.form.handle_users.length>0?this.form.handle_users[0]:null;
 			console.log('handleUsersChange',this.form.handle_users)
 		},
 		countUseChange(){
diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue
index 3825bd0a..bbcf81d5 100644
--- a/src/views/wpm_gx/fmlog_detail.vue
+++ b/src/views/wpm_gx/fmlog_detail.vue
@@ -52,7 +52,14 @@
 				>
 					<el-table-column  type="index" width="50"></el-table-column>
 					<el-table-column label="批次号" prop="batch" min-width="80"></el-table-column>
-					<el-table-column label="操作员" prop="handle_user_name" min-width="80"></el-table-column>
+					<el-table-column label="操作员"  min-width="80">
+						<template #default="scope">
+							<div v-if="scope.row.handle_users_&&scope.row.handle_users_.length>0">
+								<span v-for="item in scope.row.handle_users_" :key="item">{{ item.name }}、</span>
+							</div>
+							<span v-else>{{ scope.row.handle_user_name }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="设备" prop="equipment_name" min-width="150"></el-table-column>
 					<el-table-column label="领料数" prop="count_use"></el-table-column>
 					<el-table-column label="加工数" prop="count_real"></el-table-column>
@@ -212,6 +219,7 @@ export default {
 			batchContains:[],
 			test_file:'',
 			deptId: "",
+			route_code: "",
 			is_fix:false,
 			visible: false,
 			isSaveing: false,
@@ -232,6 +240,8 @@ export default {
 		};
 	},
 	mounted() {
+		let that = this;
+		that.route_code = that.$route.path.split("/")[2];
 		this.getfmlogItem();
 		this.params.fmlog = this.fmlogId;
 		this.paramsWm.mgroup = this.mgroup;
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index 8dcd0061..673f4fe2 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -31,9 +31,12 @@
 					<el-descriptions-item label="部门/车间">{{
 						mlogItem.belong_dept_name
 					}}</el-descriptions-item>
-					<el-descriptions-item label="处理人">{{
-						mlogItem.handle_user_name
-					}}</el-descriptions-item>
+					<el-descriptions-item label="处理人">
+						<div v-if="mlogItem.handle_users_&&mlogItem.handle_users_.length>0">
+							<span v-for="item in mlogItem.handle_users_" :key="item.id">{{ item.name }}</span>
+						</div>
+						<span v-else>{{mlogItem.handle_user_name}}</span>
+					</el-descriptions-item>
 					<el-descriptions-item label="创建时间">{{
 						mlogItem.create_time
 					}}</el-descriptions-item>
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 85d2c4d1..2ec3c8bc 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -529,6 +529,7 @@ export default {
 			this.test_file = res.path;
 		},
 		handleUsersChange(){
+			this.form.handle_user = this.form.handle_users.length>0?this.form.handle_users[0]:null;
 			console.log('handleUsersChange',this.form.handle_users)
 		},
 		//表单提交方法
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 023943e2..1b28b688 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -93,11 +93,15 @@
 						{{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
 					</template>
 				</el-table-column>
-				<el-table-column
-					label="处理人"
-					prop="handle_user_name"
-					width="80"
-				></el-table-column>
+				<el-table-column label="处理人" prop="handle_user_name" width="80">
+					<template #default="scope">
+							<div v-if="scope.row.handle_users_&&scope.row.handle_users_.length>0">
+								<span v-for="item in scope.row.handle_users_" :key="item">{{ item.name }}、</span>
+							</div>
+							<span v-else>{{ scope.row.handle_user_name }}</span>
+						</template>
+				</el-table-column>
+				<!-- <el-table-column label="处理人" prop="handle_user_name" width="80" v-else></el-table-column> -->
 				<el-table-column label="保温剩余时间" v-if="mgroupName=='黑化'||mgroupName=='退火'">
 					<template #default="scope">
 						{{ getRemaTime(scope.row) }}
@@ -245,11 +249,13 @@ export default {
 			mtask: "",
 			mlogId: "",
 			codeText: "",
+			route_code: "",
 			showHidden:false,
 		};
 	},
 	mounted() {
 		let that = this;
+		that.route_code = that.$route.path.split("/")[2];
 		that.params.mgroup = that.mgroupId;
 		that.apiObj = that.$API.wpm.mlog.list;
 	},