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"
/>
+
{{ scope.row.data.排板_检测项_丝高?scope.row.data.排板_检测项_丝高:'' }}
+
+
+ {{ scope.row.data.排板_检测项_间距?scope.row.data.排板_检测项_间距:'' }}
+
+
{{ scope.row.data.装炉压板出炉_设备编号?scope.row.data.装炉压板出炉_设备编号:'' }}
@@ -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;