From dc156fd8d9b83c3a6a8032603ded7d5267da1827 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Tue, 16 Jan 2024 16:19:52 +0800 Subject: [PATCH] =?UTF-8?q?2024.1.16=20=E6=B4=BE=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=A8=A1=E6=80=81=E6=A1=86=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/qc/FAIResultEntry.vue | 69 +++++++++++++++++------- src/views/modules/qc/FQCResultEntry.vue | 69 +++++++++++++++++------- src/views/modules/qc/IPQCResultEntry.vue | 60 +++++++++++++++++---- 3 files changed, 151 insertions(+), 47 deletions(-) diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index f8f7e05..a5079ea 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -161,7 +161,7 @@ - + - - - - - - - - - - - - + + + + + + + + + + @@ -488,7 +486,7 @@ - + @@ -505,6 +503,9 @@ + + + 查询 @@ -546,6 +547,24 @@ align="center" label="物料名称"> + + + + + + 关闭 @@ -890,6 +909,9 @@ orderNo: '', sku: '', cinvSourceCode: '', + qtyrequired: '', + lotsize:'', + operationDesc:'', specialRequirements: '', templateId: '', templateName: '', @@ -1685,7 +1707,10 @@ seqNo: '', sku: '', partNo: '', - partDesc:'' + partDesc:'', + operationDesc:'', + qtyrequired:'', + lotsize:'' }, // 子明细数据对象 tableData: [], @@ -2185,6 +2210,9 @@ this.modalData.spec = data.rows[0].spec this.modalData.sku = data.rows[0].sku this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode + this.modalData.operationDesc = data.rows[0].operationDesc + this.modalData.qtyrequired = data.rows[0].qtyrequired + this.modalData.lotsize = data.rows[0].lotsize } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -2444,6 +2472,9 @@ this.modalData.partDesc = row.partDesc this.modalData.orderNo = row.orderNo this.modalData.seqNo = row.seqNo + this.modalData.lotsize = row.lotsize + this.modalData.operationDesc = row.operationDesc + this.modalData.qtyrequired = row.qtyrequired this.getOperationList() this.seqDetailFlag = false }, @@ -3129,9 +3160,10 @@ orderNo: this.seqDetailData.orderNo, sku: this.seqDetailData.sku, partDesc: this.seqDetailData.partDesc, - partNo: this.seqDetailData.partNo + partNo: this.seqDetailData.partNo, + operationDesc: this.seqDetailData.operationDesc } - if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc){ + if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){ this.seqInfoList = [] } else { searchSeqInfo(tempData).then(({data}) => { @@ -3151,7 +3183,8 @@ orderNo: '', sku: '', partNo: '', - partDesc: '' + partDesc: '', + operationDesc: '' } this.seqInfoList = [] } diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index d4b7387..dfab032 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -161,7 +161,7 @@ - + - - - - - - - - - - - - + + + + + + + + + + @@ -687,7 +685,7 @@ - + @@ -704,6 +702,9 @@ + + + 查询 @@ -745,6 +746,24 @@ align="center" label="物料名称"> + + + + + + 关闭 @@ -889,6 +908,9 @@ batchRollNo: '', spec: '', sku: '', + qtyrequired: '', + lotsize:'', + operationDesc:'', specialRequirements: '', templateId: '', templateName: '', @@ -1684,7 +1706,10 @@ seqNo: '', sku: '', partNo: '', - partDesc:'' + partDesc:'', + operationDesc:'', + qtyrequired:'', + lotsize:'' }, // 子明细数据对象 tableData: [], @@ -2184,6 +2209,9 @@ this.modalData.spec = data.rows[0].spec this.modalData.sku = data.rows[0].sku this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode + this.modalData.operationDesc = data.rows[0].operationDesc + this.modalData.qtyrequired = data.rows[0].qtyrequired + this.modalData.lotsize = data.rows[0].lotsize } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -2442,6 +2470,9 @@ this.modalData.cinvSourceCode = row.cinvSourceCode this.modalData.orderNo = row.orderNo this.modalData.seqNo = row.seqNo + this.modalData.lotsize = row.lotsize + this.modalData.operationDesc = row.operationDesc + this.modalData.qtyrequired = row.qtyrequired this.getOperationList() this.seqDetailFlag = false }, @@ -3137,9 +3168,10 @@ orderNo: this.seqDetailData.orderNo, sku: this.seqDetailData.sku, partDesc: this.seqDetailData.partDesc, - partNo: this.seqDetailData.partNo + partNo: this.seqDetailData.partNo, + operationDesc: this.seqDetailData.operationDesc } - if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc){ + if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){ this.seqInfoList = [] } else { searchSeqInfo(tempData).then(({data}) => { @@ -3159,7 +3191,8 @@ orderNo: '', sku: '', partNo: '', - partDesc:'' + partDesc:'', + operationDesc: '' } this.seqInfoList = [] } diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 7e595bc..bb5619f 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -166,7 +166,7 @@ - + - - + + + + + + @@ -190,10 +194,10 @@ - - - - + + + + 派工单号 @@ -545,7 +549,7 @@ - + @@ -562,6 +566,9 @@ + + + 查询 @@ -603,6 +610,24 @@ align="center" label="物料名称"> + + + + + + 关闭 @@ -911,6 +936,8 @@ spec: '', sku: '', cinvSourceCode: '', + qtyrequired: '', + lotsize:'', specialRequirements: '', templateId: '', templateName: '', @@ -1725,7 +1752,10 @@ sku: '', cinvSourceCode:'', partNo: '', - partDesc: '' + partDesc: '', + operationDesc:'', + qtyrequired:'', + lotsize:'' }, // 子明细数据对象 tableData: [], @@ -2338,6 +2368,9 @@ this.modalData.spec = data.rows[0].spec this.modalData.sku = data.rows[0].sku this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode + this.modalData.operationDesc = data.rows[0].operationDesc + this.modalData.qtyrequired = data.rows[0].qtyrequired + this.modalData.lotsize = data.rows[0].lotsize } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -2494,6 +2527,9 @@ this.modalData.partDesc = row.partDesc this.modalData.orderNo = row.orderNo this.modalData.seqNo = row.seqNo + this.modalData.lotsize = row.lotsize + this.modalData.operationDesc = row.operationDesc + this.modalData.qtyrequired = row.qtyrequired this.getOperationList() this.seqDetailFlag = false }, @@ -3194,9 +3230,10 @@ orderNo: this.seqDetailData.orderNo, sku: this.seqDetailData.sku, partDesc: this.seqDetailData.partDesc, - partNo: this.seqDetailData.partNo + partNo: this.seqDetailData.partNo, + operationDesc: this.seqDetailData.operationDesc } - if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc){ + if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){ this.seqInfoList = [] } else { searchSeqInfo(tempData).then(({data}) => { @@ -3217,6 +3254,7 @@ sku: '', partNo: '', partDesc: '', + operationDesc: '' } this.seqInfoList = [] }