From ecdade16670af74d3d97662781b49b4f16ca11d8 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 11 May 2026 15:55:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A6=85=E9=81=93374?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/workHoursRY_MP.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/views/statistics/bxerp/workHoursRY_MP.vue b/src/views/statistics/bxerp/workHoursRY_MP.vue
index 080b3d1b..c5298c15 100644
--- a/src/views/statistics/bxerp/workHoursRY_MP.vue
+++ b/src/views/statistics/bxerp/workHoursRY_MP.vue
@@ -17,6 +17,12 @@
 					placeholder="结束时间"
 					style="margin-left: 2px; width: 150px"
 				/>
+				<el-input v-model="query1.batch_contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+					v-if="activeName=='product'"
+				></el-input>
 				<el-input v-model="query1.number_contains" 
 					placeholder="板号" 
 					clearable 
@@ -112,6 +118,11 @@
 										<span>{{ scope.row.data.排板_检测项_丝高?scope.row.data.排板_检测项_丝高:'' }}</span>
 									</template>
 								</el-table-column>
+								<el-table-column label="间距" align="center">
+									<template #default="scope">
+										<span>{{ scope.row.data.排板_检测项_间距?scope.row.data.排板_检测项_间距:'' }}</span>
+									</template>
+								</el-table-column>
 								<el-table-column label="炉号" align="center">
 									<template #default="scope">
 										<span>{{ scope.row.data.装炉压板出炉_设备编号?scope.row.data.装炉压板出炉_设备编号:'' }}</span>
@@ -574,6 +585,7 @@ export default {
 				],
 			},
 			query1:{
+				batch_contains:'',
 				number_contains:'',
 				time_gte:'',
 				time_lte:'',
@@ -682,6 +694,13 @@ export default {
 				querys1[0].push(obj2);
 			}
 			
+			if(that.activeName=='product'&&that.query1.batch_contains!==''&&that.query1.batch_contains!==null){
+				let obj3 = {};
+				obj3.field = 'wm__batch';
+				obj3.value = that.query1.batch_contains;
+				obj3.compare = '';
+				querys1[0].push(obj3);
+			}
 			that.$nextTick(() => {
 				if(that.activeName=='product'){
 					that.params1.querys = querys1;