From 07f369198a68f0ecc72c288ce5fee071b14a0eb5 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 7 Aug 2025 14:27:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=A6=85=E9=81=9337?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/wpm.js              |  6 ++++++
 src/views/wpm_bx/inmIn.vue        |  1 +
 src/views/wpm_bx/inmOut.vue       | 15 +++++++++------
 src/views/wpm_bx/mlogbw_check.vue |  1 +
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js
index 3283633d..e09752cf 100644
--- a/src/api/model/wpm.js
+++ b/src/api/model/wpm.js
@@ -485,6 +485,12 @@ export default {
 				);
 			},
 		},
+		defects:{
+			name: "获取物料的缺陷列表",
+			req: async function (data) {
+				return await http.get(`${config.API_URL}/wpm/wmaterial/defects/`, data);
+			},
+		}
 	},
 	otherlog: {
 		list: {
diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue
index 9c3f8583..c82498e1 100644
--- a/src/views/wpm_bx/inmIn.vue
+++ b/src/views/wpm_bx/inmIn.vue
@@ -217,6 +217,7 @@
 			<template #default>
 				<el-table ref="wprTable" id="wprTable" :height="wprTableHeight" hidePagination highlight-current-row border :data="wprList">
 					<el-table-column label="产品编号" prop="number" min-width="100px"></el-table-column>
+					<el-table-column label="对外编号" prop="number_out" min-width="100px"></el-table-column>
 					<el-table-column label="记录数据" prop="oinfo">
 						<template #default="scope">
 							<div v-for="(item,index) in scope.row.oinfo" :key="item.id">
diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue
index c32f3701..310822c6 100644
--- a/src/views/wpm_bx/inmOut.vue
+++ b/src/views/wpm_bx/inmOut.vue
@@ -13,7 +13,7 @@
 					placeholder="物料状态"
 					clearable
 					@change="searchStateChange"
-					style="width: 250px"
+					style="width: 100px"
 				>
 					<el-option
 						v-for="item in stateOptions"
@@ -22,12 +22,12 @@
 						:value="item.value"
 					/>
 				</el-select>
-				<!-- <el-select
+				<el-select
 					v-model="query.defect"
 					placeholder="不合格项"
 					clearable
 					@change="searchDefectChange"
-					style="width: 250px"
+					style="width: 150px"
 				>
 					<el-option
 						v-for="item in defectOptions"
@@ -35,9 +35,9 @@
 						:label="item.name"
 						:value="item.id"
 					/>
-				</el-select> -->
+				</el-select>
 				<el-input
-					style="margin-right: 5px"
+					style="width: 250px;margin-right: 5px"
 					v-model="query.search"
 					placeholder="名称"
 					clearable
@@ -409,7 +409,10 @@ export default {
 	methods: {
 		//获取缺陷项
 		getDefectOptions(){
-
+			let that = this;
+			that.$API.wpm.wmaterial.defects.req({tag:'done',mgroup:that.mgroupId}).then((res) => {
+			    that.defectOptions = res;
+			})
 		},
 		handleWatch(row) {
 			let that = this;
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index 8020b9b6..92a43335 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -45,6 +45,7 @@
 					<el-table-column prop="number" label="物料编号" fixed min-width="80px">
 						<template #default="scope">
 							<span v-if="mode == 'outs'">{{ scope.row.number }}</span>
+							<span v-if="mode == 'outs'&&scope.row.number_out!==null">——{{ scope.row.number_out }}</span>
 							<!-- <el-input v-if="scope.row.isEdit&&mode == 'outs'" v-model="scope.row.number" placeholder="物料编号"></el-input> -->
 							<el-select
 								v-if="scope.row.isEdit&&mode == 'ins'&&route_code!=='niuzhuan'"