diff --git a/src/hybrid/html/purchaseReceiptJob.html b/src/hybrid/html/purchaseReceiptJob.html new file mode 100644 index 00000000..8238cb76 --- /dev/null +++ b/src/hybrid/html/purchaseReceiptJob.html @@ -0,0 +1,67 @@ + + + + + + + + + + + + mainBody + + \ No newline at end of file diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index f3e684ca..c68ab836 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -2,28 +2,37 @@ - 检验指引单 - 上架指引单 + 检验指引单 + 上架指引单 - + + Q - - - - - - - + + - - + + + + + + + + + + + + + + + @@ -34,7 +43,7 @@ - + 目标库位：{{item.toLocationCode}} @@ -59,7 +68,7 @@ -
发货单号:{{data1.asnNumber}}
物料代码供应商批次检验数量物料代码:{{item.itemCode}}
{{item.itemCode}}
物料名称{{item.itemName}}发货单号{{data1.asnNumber}}
供应商{{item.supplierCode}}批次 {{item.supplierBatch}}
到货数量{{item.quantityQty}}抽检数量 {{item.sampleQty}}
- - - - - - - - - - - - - strBody - -
发货单号:${this.data1.asnNumber}
物料代码供应商批次检验数量
- - - ` - let str1 = '' this.data1.inspectDTOList.forEach(item => { - str1 += ` - - ${item.itemCode} - ${item.supplierBatch} - ${item.sampleQty} - + str += ` +

+
+
Q
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
物料代码:${item.itemCode}
物料名称${item.itemName}发货单号${this.data1.asnNumber}
供应商${item.supplierCode}批次${item.supplierBatch}
到货数量${item.quantityQty}抽检数量${item.sampleQty}
+
+
` }) - str2 = str2.replace("strBody", str1) - console.log(335, str1) this.newHtmlContent1 = this.newHtmlContent1.replace( - "mainBody", str2); //替换物品代码 + "mainBody", str); //替换物品代码 }); }) @@ -232,7 +245,7 @@ export default { (this.currentPage - 1) * this.pageSize, this.currentPage * this.pageSize ) - if(array.length>0){ + if (array.length > 0) { this.showTableSubList = [...this.showTableSubList, ...array] this.currentPage += 1 } @@ -247,14 +260,14 @@ export default { (this.currentPage1 - 1) * this.pageSize1, this.currentPage1 * this.pageSize1 ) - if(array.length>0){ + if (array.length > 0) { this.showTableInspectDTOList = [...this.showTableInspectDTOList, ...array] this.currentPage1 += 1 } } else { this.showTableInspectDTOList = this.data1.inspectDTOList } - console.log(233,this.showTableInspectDTOList) + console.log(233, this.showTableInspectDTOList) } }, watch: { @@ -280,7 +293,7 @@ export default { }, async onShow() { // 获取上架指引单 - if(this.data.ids){ + if (this.data.ids) { await getJimuPutawayJobDetail({ masterIds: this.data.ids }).then(res => { @@ -289,29 +302,30 @@ export default { }) } // 获取采购收货指引单 - if(this.number){ + if (this.number) { await queryInspectionFreeFlag({ number: this.number }).then(async res1 => { this.data1 = res1.data - this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item=>item.sampleQty>0) + this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item => item.sampleQty > 0) // this.data1.inspectDTOList=[] - if(this.data1&&this.data1.inspectDTOList&&this.data1.inspectDTOList.length == 0){ - this.tabIndex =2 + if (this.data1 && this.data1.inspectDTOList && this.data1.inspectDTOList.length == 0) { + this.tabIndex = 2 } this.getTableInspectDTOList() }) } + this.getPointPutawayJobHtml() this.getPurchaseReceiptJobHtml() }, onReachBottom() { - if(this.tabIndex == 1){ - if(this.showTableInspectDTOList.length!=this.data1.inspectDTOList.length){ + if (this.tabIndex == 1) { + if (this.showTableInspectDTOList != this.data1.inspectDTOList.length) { this.getTableInspectDTOList() } - }else{ - if(this.showTableSubList.length!=this.data.sublist.length){ + } else { + if (this.showTableSubList.length != this.data.sublist.length) { this.getTableSubList() } } @@ -322,7 +336,7 @@ export default { \ No newline at end of file