diff --git a/src/api/quality/qcProduce.js b/src/api/quality/qcProduce.js index bf7b4ad..82e98d5 100644 --- a/src/api/quality/qcProduce.js +++ b/src/api/quality/qcProduce.js @@ -50,4 +50,13 @@ export function getQcListWorkCenter(query) { method: 'get', params: query }); - } \ No newline at end of file + } + +// 查询工作中心列表 +export function getCheckTypes() { + return request({ + url: '/quality/qcProduce/getCheckTypes', + method: 'get' + }); + } + diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue index c74023f..1ccddc9 100644 --- a/src/views/quality/qcIncome/index.vue +++ b/src/views/quality/qcIncome/index.vue @@ -434,7 +434,7 @@ export default { let start = this.Fungetdate (0) let end = this.Fungetdate (1) this.queryParams.incomeTimeArray.push(start,end) - this.queryParams.checkTimeArray.push(start,end) + //this.queryParams.checkTimeArray.push(start,end) }, Fungetdate (num) { var dd = new Date(); @@ -449,12 +449,12 @@ export default { getList() { this.loading = true; - if(this.queryParams.incomeTimeArray!=null){ + if(this.queryParams.incomeTimeArray.length>0){ this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); } - if(this.queryParams.checkTimeArray!=null){ + if(this.queryParams.checkTimeArray.length>0){ this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); } diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue index d928bd6..d1c077b 100644 --- a/src/views/quality/qcProduce/index.vue +++ b/src/views/quality/qcProduce/index.vue @@ -270,9 +270,9 @@ @@ -368,7 +368,7 @@