diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index da839b9c..e0972aea 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -580,6 +580,16 @@
{{ scope.row.data.七车间_批次发货合格率 }}
+
+
+ {{ scope.row.data.六车间生产入库_组合件_批次号 }}
+
+
+
+
+ {{ scope.row.data.销售发货_count }}
+
+
@@ -592,7 +602,7 @@ export default {
return {
params: {
ordering:'-data__管料成型_小日期',
- querys : [[{field:"data__has_key",compare:"",value:"管料成型_日期"}]]
+ querys : [[{field:"data__has_key",compare:"",value:"管料成型_日期"}],[{field:"data__has_key",compare:"",value:"管料退火_日期"}]]
},
query:{
batch__contains:'',
@@ -608,7 +618,7 @@ export default {
methods: {
handleQuery(){
let that = this;
- let querys = [[{field:"data__has_key",compare:"",value:"管料成型_日期"}]];
+ let querys = [[{field:"data__has_key",compare:"",value:"管料成型_日期"}],[{field:"data__has_key",compare:"",value:"管料退火_日期"}]];
let obj = {},obj1 = {},obj2 = {};
obj.field = 'batch__contains';
obj.value = that.query.batch__contains;
@@ -621,12 +631,15 @@ export default {
obj2.compare = 'lte';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);
+ querys[1].push(obj);
}
if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
querys[0].push(obj1);
+ querys[1].push(obj1);
}
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
querys[0].push(obj2);
+ querys[1].push(obj2);
}
let params = {};
params.querys = querys;