From ce8c5400bd053e0dc4a6a6149d242c5d65868e7c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 18 Apr 2024 14:55:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/reportWork/index.vue | 20 ++++++++------------ src/views/quality/unqualified/index.vue | 3 ++- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index b6bbf4d..aa75b32 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -21,6 +21,7 @@ @@ -879,23 +880,17 @@ export default { }, /** 查询报工报表列表 */ getList() { - /** - if(this.queryParams.createTimeArray !=null && this.queryParams.createTimeArray.length>0){ - this.queryParams.createTimeStart = moment(this.queryParams.createTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); - this.queryParams.createTimeEnd = moment(this.queryParams.createTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); - } - - if ( - this.queryParams.feedbackTimeArray != null && - this.queryParams.feedbackTimeArray.length > 0 - ) { + if (this.queryParams.feedbackTimeArray != null &&this.queryParams.feedbackTimeArray.length > 0) { this.queryParams.feedbackTimeStart = moment( this.queryParams.feedbackTimeArray[0] ).format("YYYY-MM-DD"); this.queryParams.feedbackTimeEnd = moment( this.queryParams.feedbackTimeArray[1] ).format("YYYY-MM-DD"); - }**/ + }else{ + this.queryParams.feedbackTimeStart = null; + this.queryParams.feedbackTimeEnd = null; + } this.loading = true; listReportWork(this.queryParams).then((response) => { this.reportWorkList = response.rows; @@ -916,6 +911,7 @@ export default { }, // 取消按钮 cancel() { + window.location.reload(); this.open = false; this.openReport = false; this.openReportSAP = false; @@ -991,7 +987,7 @@ export default { createTime: null, updateTime: null, updateBy: null, - endReport: "0", + endReport: "0" }; this.resetForm("form"); this.libTabs = []; diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue index db0bac7..a5c6ae8 100644 --- a/src/views/quality/unqualified/index.vue +++ b/src/views/quality/unqualified/index.vue @@ -85,6 +85,7 @@ + Date: Thu, 18 Apr 2024 16:40:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?wms=E6=88=90=E5=93=81=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/systemFinished/systemFinished.js | 3 ++- src/views/wms/systemFinished/index.vue | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/systemFinished/systemFinished.js b/src/api/systemFinished/systemFinished.js index 4fc8420..84c8957 100644 --- a/src/api/systemFinished/systemFinished.js +++ b/src/api/systemFinished/systemFinished.js @@ -14,7 +14,8 @@ export function addOdsProductEmbryoInventory(data) { return request({ url: '/wms/systemFinished/addOdsProductEmbryoInventory', method: 'post', - params: data + data: data, + contentType:'application/json', }); } diff --git a/src/views/wms/systemFinished/index.vue b/src/views/wms/systemFinished/index.vue index 7b1b6d6..2e3377a 100644 --- a/src/views/wms/systemFinished/index.vue +++ b/src/views/wms/systemFinished/index.vue @@ -47,9 +47,9 @@ @keyup.enter.native="handleQuery" /> - + - - + @@ -567,7 +566,7 @@ const formData = Object.assign({}, this.form); // 将addoutorderList数组赋值给formData对象 - formData.addoutorderList = this.addoutorderList; + formData.odsProductEmbryoInventoryCorrelationList = this.addoutorderList; // 打印整合后的数据对象 console.log("Merged Data:", formData); From dc1675c02f238ac98170c49ec0493ba5eba4017c Mon Sep 17 00:00:00 2001 From: shaoyong Date: Fri, 19 Apr 2024 10:19:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/quality/qcInventory/index.vue | 18 +++++++++--------- src/views/quality/qcMarket/index.vue | 8 ++++---- src/views/quality/qcWarehousing/index.vue | 14 ++++++++++---- src/views/quality/unqualified/index.vue | 7 +++++-- src/views/system/datasource/index.vue | 5 ++++- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue index c80efba..860481a 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 3e3d01e..95be25d 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 a5c6ae8..78be986 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 13a7aa1..5aea8d8 100644 --- a/src/views/system/datasource/index.vue +++ b/src/views/system/datasource/index.vue @@ -128,7 +128,7 @@ - + + + +