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"
/>
+
{{ scope.row.data.装炉压板出炉_装炉_日期?scope.row.data.装炉压板出炉_装炉_日期:'' }}
+
+
@@ -201,6 +209,8 @@
+
+
{{ scope.row.data.装炉压板出炉_设备编号 }}
@@ -372,6 +382,8 @@
+
+
{{ scope.row.总切片数 }}
@@ -425,6 +437,8 @@
{{scope.row.横压}}
+
+
@@ -470,6 +484,8 @@
+
+
@@ -515,6 +531,8 @@
+
+
@@ -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"
/>
+
+
+
@@ -133,6 +141,8 @@
{{scope.row.横压}}
+
+
@@ -202,6 +212,8 @@
+
+
@@ -271,6 +283,8 @@
+
+
@@ -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 = '装炉压板出炉';