From 363c698ed4ccd57803f48a8fc7dcd156385e394e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 6 Aug 2026 10:36:07 +0800
Subject: [PATCH 1/2] fix(wpm): query inventory by effective defect grade

---
 src/views/wpm_bx/inmIn.vue  | 4 ++--
 src/views/wpm_bx/inmOut.vue | 4 ++--
 src/views/wpm_gx/inm.vue    | 4 ++--
 src/views/wpm_gx/inmOut.vue | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue
index 182aec19..e3b19410 100644
--- a/src/views/wpm_bx/inmIn.vue
+++ b/src/views/wpm_bx/inmIn.vue
@@ -46,7 +46,7 @@
 						:value="item.value"
 					/>
 				</el-select>
-				<el-select v-model="query.defect__okcate" placeholder="缺陷等级" clearable style="width: 130px" @change="handleQuery">
+				<el-select v-model="query.defect_grade" placeholder="缺陷等级" clearable style="width: 130px" @change="handleQuery">
 					<el-option v-for="item in defectGradeOptions" :key="item.value" :label="item.name" :value="item.value" />
 				</el-select>
 				<el-input
@@ -414,7 +414,7 @@ export default {
 			query: {
 				search: "",
 				state: 10,
-				defect__okcate: null,
+				defect_grade: null,
 				current_merged:null,
 			},
 			dialog: {
diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue
index 012ed50f..679b7273 100644
--- a/src/views/wpm_bx/inmOut.vue
+++ b/src/views/wpm_bx/inmOut.vue
@@ -31,7 +31,7 @@
 						:value="item.value"
 					/>
 				</el-select>
-				<el-select v-model="query.defect__okcate" placeholder="缺陷等级" clearable style="width: 130px" @change="handleQuery">
+				<el-select v-model="query.defect_grade" placeholder="缺陷等级" clearable style="width: 130px" @change="handleQuery">
 					<el-option v-for="item in defectGradeOptions" :key="item.value" :label="item.name" :value="item.value" />
 				</el-select>
 				<el-select
@@ -388,7 +388,7 @@ export default {
 				search: "",
 				defect: "",
 				state: null,
-				defect__okcate: null,
+				defect_grade: null,
 			},
 			dialog: {
 				save: false,
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index d6dcc72e..a8587adc 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -25,7 +25,7 @@
 						:value="item.value"
 					/>
 				</el-select>
-				<el-select v-model="query.defect__okcate" placeholder="缺陷等级" clearable style="width: 130px" @change="handleQuery">
+				<el-select v-model="query.defect_grade" placeholder="缺陷等级" clearable style="width: 130px" @change="handleQuery">
 					<el-option v-for="item in defectGradeOptions" :key="item.value" :label="item.name" :value="item.value" />
 				</el-select>
 				<el-input
@@ -284,7 +284,7 @@ export default {
 			query: {
 				search: "",
 				state: null,
-				defect__okcate: null,
+				defect_grade: null,
 			},
 			dialog: {
 				save: false,
diff --git a/src/views/wpm_gx/inmOut.vue b/src/views/wpm_gx/inmOut.vue
index 4b0e12d7..0be6a21f 100644
--- a/src/views/wpm_gx/inmOut.vue
+++ b/src/views/wpm_gx/inmOut.vue
@@ -42,7 +42,7 @@
 						:value="item.value"
 					/>
 				</el-select>
-				<el-select v-model="query.defect__okcate" placeholder="缺陷等级" clearable style="width: 130px" @change="handleQuery">
+				<el-select v-model="query.defect_grade" placeholder="缺陷等级" clearable style="width: 130px" @change="handleQuery">
 					<el-option v-for="item in defectGradeOptions" :key="item.value" :label="item.name" :value="item.value" />
 				</el-select>
 				<el-input
@@ -276,7 +276,7 @@ export default {
 			query: {
 				search: "",
 				state: null,
-				defect__okcate: null,
+				defect_grade: null,
 			},
 			dialog: {
 				save: false,

From 9fcf23f418c514c7e3ce7e30679ee1f9518633d7 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 7 Aug 2026 14:33:12 +0800
Subject: [PATCH 2/2] feat(wpm): improve sub-process record inputs

---
 src/components/xtSelect/index.vue |  2 +-
 src/views/wpm_bx/mlog_detail.vue  | 88 +++++++++++++++++--------------
 2 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/src/components/xtSelect/index.vue b/src/components/xtSelect/index.vue
index 8eef005f..99c6b7b2 100644
--- a/src/components/xtSelect/index.vue
+++ b/src/components/xtSelect/index.vue
@@ -89,7 +89,7 @@ const props = defineProps({
 	options: { type: Array, default: null },
 });
 
-const emit = defineEmits(["update:modelValue", "update:obj", "change", "update::label"]);
+const emit = defineEmits(["update:modelValue", "update:obj", "change", "update:label"]);
 const selectable = (row) => row.count_canhandover?row.count_canhandover>0:true;
 // 控制 popover 显示与隐藏的状态
 const showPopover = ref(false);
diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index ac267a9d..22855963 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -95,62 +95,82 @@
 					:addTemplate="addTemplate"
 					placeholder="暂无数据"
 				>
-					<el-table-column label="工序" width="150px">
+					<el-table-column label="工序" min-width="180px">
 						<template #default="scope">
-							<el-select
+							<xtSelect
 								v-if="scope.row.isEdit"
 								v-model="scope.row.process"
+								v-model:label="scope.row.process_name"
+								:apiObj="$API.mtm.process.list"
+								:params="{ parent: process }"
 								placeholder="请选择子工序"
+								:tableWidth="520"
 								class="width-100"
 							>
-								<el-option
-									v-for="item in processOptions"
-									:key="item.id"
-									:label="item.name"
-									:value="item.id"
-								></el-option>
-							</el-select>
+								<el-table-column prop="name" label="工序名称" min-width="240" />
+								<el-table-column prop="cate" label="大类" min-width="160" />
+							</xtSelect>
 							<div v-else>
 								<span v-if="scope.row.process!==null">{{ scope.row.process_name}}</span>
 							</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="操作人" width="150px">
+					<el-table-column label="操作人" min-width="180px">
 						<template #default="scope">
-							<ehsSelect
+							<xtSelect
 								v-if="scope.row.isEdit"
 								v-model="scope.row.handle_user"
-								:showName="scope.row.handle_user_name"
-								:apiObj="this.$API.system.user.list"
+								v-model:label="scope.row.handle_user_name"
+								:apiObj="$API.system.user.list"
 								:params="{ depts: dept }"
+								placeholder="请选择操作人"
+								:tableWidth="720"
 								class="width-100"
-							></ehsSelect>
+							>
+								<el-table-column prop="username" label="账号" width="160" />
+								<el-table-column prop="name" label="姓名" width="140" />
+								<el-table-column prop="belong_dept_name" label="部门" min-width="180" />
+								<el-table-column prop="post_name" label="岗位" min-width="150" />
+							</xtSelect>
 							<div v-else>
 								<span v-if="scope.row.handle_user_name!==null">{{ scope.row.handle_user_name}}</span>
 							</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="使用设备" width="120px">
+					<el-table-column label="使用设备" min-width="180px">
 						<template #default="scope">
-							<el-select
+							<xtSelect
 								v-if="scope.row.isEdit"
 								v-model="scope.row.equipment"
-								placeholder="设备"
+								v-model:label="scope.row.equipment_name"
+								:apiObj="$API.em.equipment.list"
+								:params="{ belong_dept: dept, exclude_cate_name: '工装' }"
+								labelField="name"
+								placeholder="请选择设备"
+								:tableWidth="720"
 								class="width-100"
 							>
-								<el-option
-									v-for="item in equipmentOtions"
-									:key="item.id"
-									:label="item.name"
-									:value="item.id"
-								>
-								</el-option>
-							</el-select>
+								<el-table-column prop="number" label="设备编号" width="160" />
+								<el-table-column prop="name" label="设备名称" min-width="180" />
+								<el-table-column prop="model" label="型号" min-width="150" />
+								<el-table-column prop="cate_name" label="分类" width="120" />
+							</xtSelect>
 							<div v-else>
 								<span v-if="scope.row.equipment!==null">{{ scope.row.equipment_name}}</span>
 							</div>
 						</template>
 					</el-table-column>
+					<el-table-column label="备注" min-width="180px">
+						<template #default="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								v-model="scope.row.note"
+								placeholder="请输入备注"
+								clearable
+							/>
+							<span v-else>{{ scope.row.note }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="操作时间" width="220px">
 						<template #default="scope">
 							<el-date-picker
@@ -552,7 +572,6 @@ export default {
 			// shiftOtions:[],
 			tableDataWm:[],
 			qct_defects:[],
-			equipmentOtions:[],
 			defectOptions:[],
 			qct_testitems:[],
 			processLists:[],
@@ -595,8 +614,11 @@ export default {
 				mlog: "",
 				shift:"",
                 process: "",
+				process_name: "",
 				equipment: "",
-                handle_user: "",
+				equipment_name: "",
+				note: "",
+				handle_user: "",
 				work_start_time: "",
 				handle_user_name: "",
                 isEdit: true,
@@ -631,7 +653,6 @@ export default {
 		that.getMlogItem();
 		that.getPreocess();
 		// that.getShift();
-		that.getEquipment();
 		that.getProcessList();
 	},
 	methods: {
@@ -714,17 +735,6 @@ export default {
 				})
 			})
 		},
-		getEquipment(){
-			let that = this;
-			that.equipmentOtions = [];
-			that.$API.em.equipment.list.req({page:0,belong_dept:that.dept}).then((res) => {
-				res.forEach((item) => {
-					if(item.cate_name!=="工装"||item.cate_name==null){
-						that.equipmentOtions.push(item);
-					}
-				})
-			})
-		},
 		//获取指定工序的切分数量
 		getcutCount(material_id){
 			let that = this;