From 3e124050c4703e23efb1657d81100fb46ce2f92c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 5 Aug 2025 15:54:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97mlogs=E6=98=BE=E7=A4=BAte?=
 =?UTF-8?q?am=5Fname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/inmOut.vue | 24 ++++++++++++++++++++++++
 src/views/wpm_gx/mlogs.vue  |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue
index b22c93bb..97bca4be 100644
--- a/src/views/wpm_bx/inmOut.vue
+++ b/src/views/wpm_bx/inmOut.vue
@@ -22,6 +22,20 @@
 						:value="item.value"
 					/>
 				</el-select>
+				<!-- <el-select
+					v-model="query.defect"
+					placeholder="不合格项"
+					clearable
+					@change="searchDefectChange"
+					style="width: 250px"
+				>
+					<el-option
+						v-for="item in defectOptions"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+					/>
+				</el-select> -->
 				<el-input
 					style="margin-right: 5px"
 					v-model="query.search"
@@ -320,6 +334,7 @@ export default {
 			wmtype:0,
 			query: {
 				search: "",
+				defect: "",
 				state: null,
 			},
 			dialog: {
@@ -334,6 +349,7 @@ export default {
 			wprList:[],
 			tableData: [],
 			selection: [],
+			defectOptions: [],
 			stateOptions:[
 				{ value: 10, name: "合格"},
 				{ value: 20, name: "不合格"},
@@ -375,8 +391,13 @@ export default {
 		that.params.mgroup = that.mgroupId;
 		that.$TOOL.data.set('bx_deptID',that.deptId);
 		that.apiObj = that.$API.wpm.wmaterial.list;
+		that.getDefectOptions();
 	},
 	methods: {
+		//获取缺陷项
+		getDefectOptions(){
+
+		},
 		handleWatch(row) {
 			let that = this;
 			that.$API.wpm.batchlog.dag.req({batch:row.batch}).then((res) => {
@@ -464,6 +485,9 @@ export default {
 			this.$nextTick(() => {
 				this.$refs.scrapDialog.open("add",handoverb,30);
 			});
+		},
+		searchDefectChange(){
+
 		},
 		handleScrapSuccess(){
 			this.dialog.scrap = false;
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 4cfd2043..a1505880 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -89,6 +89,8 @@
 						{{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
 					</template>
 				</el-table-column>
+				<el-table-column label="班组" prop="team_name">
+				</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">