diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue index c80efba0..860481ab 100644 --- a/src/views/quality/qcInventory/index.vue +++ b/src/views/quality/qcInventory/index.vue @@ -184,7 +184,7 @@ - + - + - + @@ -265,7 +265,7 @@ - + @@ -284,7 +284,7 @@ - + @@ -388,7 +388,7 @@ export default { // 表单校验 rules: { checkType:[ - { required: true, message: "检验类型不能为空", trigger: "blur" } + { required: true, message: "检验类型不能为空", trigger: "blur" } ], incomeBatchNo: [ { required: true, message: "批次号不能为空", trigger: "blur" } @@ -452,12 +452,12 @@ export default { /** 查询库存检验列表 */ getList() { this.loading = true; - + console.log("--------"+this.queryParams) 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.incomeTimeStart = null; this.queryParams.incomeTimeEnd = null; } @@ -619,7 +619,7 @@ export default { this.form.supplierCode = obj.code; this.form.supplierName = obj.name; }, - + /**人员选择弹出框**/ handleSelectUser() { this.$refs.itemSelectUser.showFlag = true; diff --git a/src/views/quality/qcMarket/index.vue b/src/views/quality/qcMarket/index.vue index 3e3d01e4..95be25df 100644 --- a/src/views/quality/qcMarket/index.vue +++ b/src/views/quality/qcMarket/index.vue @@ -185,7 +185,7 @@ - + 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; + } listWarehousing(this.queryParams).then(response => { this.warehousingList = response.rows; diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue index a5c6ae88..78be986e 100644 --- a/src/views/quality/unqualified/index.vue +++ b/src/views/quality/unqualified/index.vue @@ -389,10 +389,13 @@ export default { getList() { this.loading = true; - 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; + } listUnqualified(this.queryParams).then(response => { this.unqualifiedList = response.rows; diff --git a/src/views/system/datasource/index.vue b/src/views/system/datasource/index.vue index 13a7aa1d..5aea8d89 100644 --- a/src/views/system/datasource/index.vue +++ b/src/views/system/datasource/index.vue @@ -128,7 +128,7 @@ - + + + +