From 410e48a5d3bb7f1bcf4e2ec77f1f1062a256fd1a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 4 Dec 2025 15:39:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=90=E5=B7=A5=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlog_detail.vue | 43 ++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 00475a9f..201fb76f 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -64,7 +64,6 @@
 					v-model="processLists"
 					:addTemplate="addTemplate"
 					placeholder="暂无数据"
-					@add="rowAdd"
 				>
 					<el-table-column label="工序">
 						<template #default="scope">
@@ -101,6 +100,27 @@
 							</div>
 						</template>
 					</el-table-column>
+					<el-table-column label="使用设备">
+						<template #default="scope">
+							<el-select
+								v-if="scope.row.isEdit"
+								v-model="scope.row.equipment"
+								placeholder="设备"
+								class="width-100"
+							>
+								<el-option
+									v-for="item in equipmentOtions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.id"
+								>
+								</el-option>
+							</el-select>
+							<div v-else>
+								<span v-if="scope.row.equipment!==null">{{ scope.row.equipment_name}}</span>
+							</div>
+						</template>
+					</el-table-column>
 					<el-table-column label="操作时间">
 						<template #default="scope">
 							<el-date-picker
@@ -116,23 +136,6 @@
 							</div>
 						</template>
 					</el-table-column>
-					<el-form-item v-if="route_code=='pengma'" label="使用设备" prop="equipment">
-						<template #default="scope">
-							<el-select
-								v-model="scope.row.equipment"
-								placeholder="设备"
-								class="width-100"
-							>
-								<el-option
-									v-for="item in equipmentOtions"
-									:key="item.id"
-									:label="item.name"
-									:value="item.id"
-								>
-								</el-option>
-							</el-select>
-						</template>
-					</el-form-item>
 					<el-table-column label="班次"></el-table-column>
 					<el-table-column label="创建时间"></el-table-column>
 					<el-table-column label="操作" fixed="right" align="center" width="150px">
@@ -514,9 +517,10 @@ export default {
 			addTemplate:{
 				mlog: "",
                 process: "",
+				equipment: "",
                 handle_user: "",
-				handle_user_name: "",
 				work_start_time: "",
+				handle_user_name: "",
                 isEdit: true,
             },
 			qct:null,
@@ -540,6 +544,7 @@ export default {
 		this.apiObj = this.$API.wpm.mlogb.list;
 		let userInfo = that.$TOOL.data.get("USER_INFO");
 		that.addTemplate.mlog = that.mlogItem.id;
+		that.addTemplate.equipment = "";
 		that.addTemplate.handle_user = userInfo.id;
 		that.addTemplate.handle_user_name = userInfo.name;
 		that.addTemplate.work_start_time = this.$TOOL.dateFormat(new Date());