From 44cc291540babc5924ab70c4969a986c2d039cb6 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 6 Jul 2026 14:45:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A6=85=E9=81=93443?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/workHoursRY_MP.vue | 21 +++++++++++++++++++
 src/views/statistics/bxerp/workHoursRY_NZ.vue | 20 +++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/views/statistics/bxerp/workHoursRY_MP.vue b/src/views/statistics/bxerp/workHoursRY_MP.vue
index c5298c15..90b83068 100644
--- a/src/views/statistics/bxerp/workHoursRY_MP.vue
+++ b/src/views/statistics/bxerp/workHoursRY_MP.vue
@@ -63,6 +63,12 @@
 					placeholder="结束时间"
 					style="margin-left: 2px; width: 150px"
 				/>
+				<el-input
+					v-model="query.material_name"
+					placeholder="物料名"
+					clearable
+					style="width: 200px; margin-left: 2px;"
+				/>
 				<el-button
 					type="primary"
 					icon="el-icon-search"
@@ -96,6 +102,8 @@
 										<span>{{ scope.row.data.装炉压板出炉_装炉_日期?scope.row.data.装炉压板出炉_装炉_日期:'' }}</span>
 									</template>
 								</el-table-column>
+								<el-table-column label="物料名称" prop="material_name" fixed="left">	
+								</el-table-column>
 								<el-table-column label="板号" prop="number" fixed="left">	
 								</el-table-column>
 								<el-table-column label="压前对边" align="center">
@@ -201,6 +209,8 @@
 								<el-table-column label="序号" type="index" width="50"  fixed="left"/>
 								<el-table-column label="板号" prop="number" fixed="left">
 								</el-table-column>
+								<el-table-column label="物料名称" prop="material_name" fixed="left">
+								</el-table-column>
 								<el-table-column label="炉号" fixed="left">
 									<template #default="scope">
 										<span v-if="scope.row.data.装炉压板出炉_设备编号">{{ scope.row.data.装炉压板出炉_设备编号 }}</span>
@@ -372,6 +382,8 @@
 								<el-table-column type="index" width="50"  fixed="left"/>
 								<el-table-column label="设备编号" prop="设备编号">
 								</el-table-column>
+								<el-table-column label="物料名" prop="物料名">
+								</el-table-column>
 								<el-table-column label="总数">
 									<template #default="scope">
 										<span v-if="scope.row.总切片数" @click="handleNumClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span>
@@ -425,6 +437,8 @@
 										<span v-if="scope.row.横压!==null">{{scope.row.横压}}</span>
 									</template>
 								</el-table-column>
+								<el-table-column label="物料名" prop="物料名">
+								</el-table-column>
 								<el-table-column label="总数" prop="总切片数">
 								</el-table-column>
 								<el-table-column label="长点">
@@ -470,6 +484,8 @@
 								<el-table-column type="index" width="50"  fixed="left"/>
 								<el-table-column label="操作人" prop="员工">
 								</el-table-column>
+								<el-table-column label="物料名" prop="物料名">
+								</el-table-column>
 								<el-table-column label="总数" prop="总切片数">
 								</el-table-column>
 								<el-table-column label="长点">
@@ -515,6 +531,8 @@
 								<el-table-column type="index" width="50"  fixed="left"/>
 								<el-table-column label="丝高" prop="丝高">
 								</el-table-column>
+								<el-table-column label="物料名" prop="物料名">
+								</el-table-column>
 								<el-table-column label="总数" prop="总切片数">
 								</el-table-column>
 								<el-table-column label="长点">
@@ -629,6 +647,9 @@ export default {
 			}else{
 				query.end_date = that.query.end_date;
 			}
+			if(that.query.material_name!=''&&that.query.material_name!=null){
+				query.material_name = that.query.material_name;
+			}
 			if(that.activeName=='luhao'){
 				query.select_cols = that.query.select_cols;
 				params.query = query;
diff --git a/src/views/statistics/bxerp/workHoursRY_NZ.vue b/src/views/statistics/bxerp/workHoursRY_NZ.vue
index 45343b3a..f58f2b1e 100644
--- a/src/views/statistics/bxerp/workHoursRY_NZ.vue
+++ b/src/views/statistics/bxerp/workHoursRY_NZ.vue
@@ -31,6 +31,12 @@
 					placeholder="结束时间"
 					style="margin-left: 2px; width: 150px"
 				/>
+				<el-input
+					v-model="query.material_name"
+					placeholder="物料名"
+					clearable
+					style="width: 200px; margin-left: 2px;"
+				/>
 				<el-button
 					type="primary"
 					icon="el-icon-search"
@@ -55,6 +61,8 @@
 								<el-table-column type="index" width="50"  fixed="left"/>
 								<el-table-column label="炉号" prop="设备编号">
 								</el-table-column>
+								<el-table-column label="物料名" prop="物料名">
+								</el-table-column>
 								<el-table-column label="总数">
 									<template #default="scope">
 										<!--  @click="handleNumClick(scope.row)"  -->
@@ -133,6 +141,8 @@
 										<span v-if="scope.row.横压!==null">{{scope.row.横压}}</span>
 									</template>
 								</el-table-column>
+								<el-table-column label="物料名" prop="物料名">
+								</el-table-column>
 								<el-table-column label="总数" prop="总切片数">
 								</el-table-column>
 								<el-table-column label="黑网重">
@@ -202,6 +212,8 @@
 								<el-table-column type="index" width="50"  fixed="left"/>
 								<el-table-column label="操作人" prop="员工">
 								</el-table-column>
+								<el-table-column label="物料名" prop="物料名">
+								</el-table-column>
 								<el-table-column label="总数" prop="总切片数">
 								</el-table-column>
 								<el-table-column label="黑网重">
@@ -271,6 +283,8 @@
 								<el-table-column type="index" width="50"  fixed="left"/>
 								<el-table-column label="丝高" prop="丝高">
 								</el-table-column>
+								<el-table-column label="物料名" prop="物料名">
+								</el-table-column>
 								<el-table-column label="总数" prop="总切片数">
 								</el-table-column>
 								<el-table-column label="黑网重">
@@ -352,7 +366,8 @@ export default {
 			query:{
 				end_date:'',
 				start_date:'',
-  				select_cols: ""
+  				select_cols: "",
+				material_name:'',
 			},
 			end_date:'',
 			start_date:'',
@@ -384,6 +399,9 @@ export default {
 			}else{
 				query.end_date = that.query.end_date;
 			}
+			if(that.query.material_name!=''&&that.query.material_name!=null){
+				query.material_name = that.query.material_name;
+			}
 			if(that.activeName=='luhao'){
 				query.select_cols = that.query.select_cols;
 				query.mgroup_name = '装炉压板出炉';