Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/views/statistics/bxerp/maopiTotal.vue

@@ -176,8 +176,7 @@ export default {
 		return {
 			params: {
 				ordering:'-data__毛坯检测_小日期',
-				ordering:'data__毛坯检测_批次号',
+				querys:[[{field:"data__has_key",compare:"",value:"毛坯检测_日期"}]],
-				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]],
 			},
 			query:{
 				name__contains:'',
@@ -186,7 +185,7 @@ export default {
 				last_time__lte:'',
 			},
 			// apiObj: this.$API.wpm.wpr.query,
-			apiObj: null,
+			apiObj: this.$API.wpm.batchstquery,
 			options:[],
 			tableData:[],
 		};