diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index 75fdd8c..f8f7e05 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -488,7 +488,7 @@ - + @@ -499,8 +499,11 @@ - - + + + + + 查询 @@ -532,10 +535,16 @@ label="SKU"> + label="物料编码"> + + @@ -1676,6 +1685,7 @@ seqNo: '', sku: '', partNo: '', + partDesc:'' }, // 子明细数据对象 tableData: [], @@ -2430,7 +2440,8 @@ // 选中派工单号 getRowData1 (row) { this.modalData.sku = row.sku - this.modalData.cinvSourceCode = row.cinvSourceCode + this.modalData.partNo = row.partNo + this.modalData.partDesc = row.partDesc this.modalData.orderNo = row.orderNo this.modalData.seqNo = row.seqNo this.getOperationList() @@ -3117,24 +3128,30 @@ seqNo: this.seqDetailData.seqNo, orderNo: this.seqDetailData.orderNo, sku: this.seqDetailData.sku, - cinvSourceCode: this.seqDetailData.cinvSourceCode, + partDesc: this.seqDetailData.partDesc, + partNo: this.seqDetailData.partNo } - searchSeqInfo(tempData).then(({data}) => { - if (data && data.code === 0) { - this.seqInfoList = data.rows - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }) - }, + if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc){ + this.seqInfoList = [] + } else { + searchSeqInfo(tempData).then(({data}) => { + if (data && data.code === 0) { + this.seqInfoList = data.rows + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + } + }, closeDialog (){ this.seqDetailData = { seqNo : '', orderNo: '', sku: '', - cinvSourceCode: '' + partNo: '', + partDesc: '' } this.seqInfoList = [] } diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index b25e82c..d4b7387 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -687,7 +687,7 @@ - + @@ -698,8 +698,11 @@ - - + + + + + 查询 @@ -731,10 +734,16 @@ label="SKU"> + + + label="物料名称"> @@ -1675,6 +1684,7 @@ seqNo: '', sku: '', partNo: '', + partDesc:'' }, // 子明细数据对象 tableData: [], @@ -3126,24 +3136,30 @@ seqNo: this.seqDetailData.seqNo, orderNo: this.seqDetailData.orderNo, sku: this.seqDetailData.sku, - cinvSourceCode: this.seqDetailData.cinvSourceCode, + partDesc: this.seqDetailData.partDesc, + partNo: this.seqDetailData.partNo + } + if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc){ + this.seqInfoList = [] + } else { + searchSeqInfo(tempData).then(({data}) => { + if (data && data.code === 0) { + this.seqInfoList = data.rows + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) } - searchSeqInfo(tempData).then(({data}) => { - if (data && data.code === 0) { - this.seqInfoList = data.rows - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }) }, closeDialog (){ this.seqDetailData = { seqNo : '', orderNo: '', sku: '', - cinvSourceCode: '' + partNo: '', + partDesc:'' } this.seqInfoList = [] } diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index a91c15f..7e595bc 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -545,7 +545,7 @@ - + @@ -556,8 +556,11 @@ - - + + + + + 查询 @@ -589,10 +592,16 @@ label="SKU"> + label="物料编码"> + + @@ -1714,7 +1723,9 @@ orderNo: '', seqNo: '', sku: '', + cinvSourceCode:'', partNo: '', + partDesc: '' }, // 子明细数据对象 tableData: [], @@ -2479,7 +2490,8 @@ // 选中派工单号 getRowData1 (row) { this.modalData.sku = row.sku - this.modalData.cinvSourceCode = row.cinvSourceCode + this.modalData.partNo = row.partNo + this.modalData.partDesc = row.partDesc this.modalData.orderNo = row.orderNo this.modalData.seqNo = row.seqNo this.getOperationList() @@ -3181,24 +3193,30 @@ seqNo: this.seqDetailData.seqNo, orderNo: this.seqDetailData.orderNo, sku: this.seqDetailData.sku, - cinvSourceCode: this.seqDetailData.cinvSourceCode, + partDesc: this.seqDetailData.partDesc, + partNo: this.seqDetailData.partNo + } + if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc){ + this.seqInfoList = [] + } else { + searchSeqInfo(tempData).then(({data}) => { + if (data && data.code === 0) { + this.seqInfoList = data.rows + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) } - searchSeqInfo(tempData).then(({data}) => { - if (data && data.code === 0) { - this.seqInfoList = data.rows - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }) }, closeDialog (){ this.seqDetailData = { seqNo : '', orderNo: '', sku: '', - cinvSourceCode: '' + partNo: '', + partDesc: '', } this.seqInfoList = [] } diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index 6147943..d0e1335 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -1290,6 +1290,7 @@ partDesc: '', seqNo: '', sku: '', + cinvSourceCode:'', }, } },