diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue index e3864dea..4224f9c3 100644 --- a/src/views/statistics/bxerp/maopi.vue +++ b/src/views/statistics/bxerp/maopi.vue @@ -199,7 +199,7 @@ export default { ordering:'-data__毛坯检测_日期', // ordering:'data__毛坯检测_批次号,-data__毛坯检测_小日期,number_prefix,number_suffix', annotate_field_list:["number_prefix", "number_suffix"], - querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]], + querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__毛坯检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]], }, query:{ name__contains:'', @@ -215,7 +215,7 @@ export default { methods: { handleQuery(){ let that = this; - let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]]; + let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__毛坯检测_日期",compare:"isnull",value:false},,{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]]; let obj = {},obj1 = {},obj2 = {},obj3 = {}; obj.field = 'data__毛坯检测_批次号'; obj.value = that.query.batch__contains;