diff --git a/src/views/statistics/bxerp/maopiTotal.vue b/src/views/statistics/bxerp/maopiTotal.vue index c4869c56..ac599aaf 100644 --- a/src/views/statistics/bxerp/maopiTotal.vue +++ b/src/views/statistics/bxerp/maopiTotal.vue @@ -189,12 +189,8 @@ export default { querys:[[{field:"data__has_key",compare:"",value:"毛坯检测_日期"}]], }, query:{ - name__contains:'', - batch__contains:'', - last_time__gte:'', - last_time__lte:'', + batch__contains:'' }, - // apiObj: this.$API.wpm.wpr.query, apiObj: this.$API.wpm.batchstquery, options:[], tableData:[], @@ -203,43 +199,17 @@ export default { methods: { handleQuery(){ let that = this; - let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]]; - let obj = {},obj1 = {},obj2 = {},obj3 = {}; - obj.field = 'data__毛坯检测_批次号'; + let querys = [[{field:"data__has_key",compare:"",value:"毛坯检测_日期"}]]; + let obj = {}; + obj.field = 'batch'; obj.value = that.query.batch__contains; obj.compare = ''; - - obj1.field = 'last_time'; - obj1.value = that.query.last_time__gte; - obj1.compare = 'gte'; - - obj2.field = 'last_time'; - obj2.value = that.query.last_time__lte; - obj2.compare = 'lte'; - - obj3.field = 'data__毛坯检测_物料名'; - obj3.value = that.query.name__contains; - obj3.compare = ''; - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ querys[0].push(obj); } - if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){ - querys[0].push(obj1); - } - if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){ - querys[0].push(obj2); - } - if(that.query.name__contains!==''&&that.query.name__contains!==null){ - querys[0].push(obj3); - } that.params.querys = querys; this.$refs.table.queryData(that.params); }, - getCountQt(data,type){ - let count_qt = 0,count = 0; - - } }, }; diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 19f753f3..44034738 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -557,6 +557,8 @@ export default { }, mounted() { let that = this; + this.paramsIn.mlog = ""; + this.paramsOut.mlog = ""; this.route_code = this.$route.path.split("/")[2]; this.paramsIn.mlog = this.mlogId; this.paramsOut.mlog = this.mlogId;