diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue index bc066b3..5e3171d 100644 --- a/src/views/quality/qcIncome/index.vue +++ b/src/views/quality/qcIncome/index.vue @@ -493,14 +493,20 @@ export default { getList() { this.loading = true; - if(this.queryParams.incomeTimeArray.length>0){ + if(this.queryParams.incomeTimeArray !=null && 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'); + }else{ + this.queryParams.incomeTimeStart = null; + this.queryParams.incomeTimeEnd = null; } - if(this.queryParams.checkTimeArray.length>0){ + if(this.queryParams.checkTimeArray !=null && 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'); + }else{ + this.queryParams.checkTimeStart = null; + this.queryParams.checkTimeEnd = null; } listIncome(this.queryParams).then(response => { diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue index 97013cd..0a6e315 100644 --- a/src/views/quality/qcInventory/index.vue +++ b/src/views/quality/qcInventory/index.vue @@ -452,14 +452,20 @@ export default { getList() { this.loading = true; - if(this.queryParams.incomeTimeArray.length>0){ + if(this.queryParams.incomeTimeArray!=null && 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'); + }else{ + this.queryParams.incomeTimeStart = null; + this.queryParams.incomeTimeEnd = null; } - if(this.queryParams.checkTimeArray.length>0){ + if(this.queryParams.checkTimeArray!=null && 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'); + }else{ + this.queryParams.checkTimeStart = null; + this.queryParams.checkTimeEnd = null; } listQcInventory(this.queryParams).then(response => { diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue index 05b3a0d..5337a8c 100644 --- a/src/views/quality/unqualified/index.vue +++ b/src/views/quality/unqualified/index.vue @@ -452,6 +452,12 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { this.reset(); + let startOaStatus0 = this.selectRow[0].startOaStatus; + alert(startOaStatus0) + if( startOaStatus0 == '1'){ + this.$message.error('已经提交OA流程'); + return + } const id = row.id || this.ids getUnqualified(id).then(response => { this.form = response.data;