diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index d3c1fe15..97ac306b 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -35,6 +35,15 @@ 抽检数量 {{item.sampleQty}} + + 到货数量 + {{item.quantityQty}} + 抽检数量 + {{item.sampleQty}} + + + 未生成检验申请 + @@ -197,41 +206,83 @@ this.readFile(htmlFileUrl1, (htmlContent) => { this.newHtmlContent1 = htmlContent this.data1.inspectDTOList.forEach(item => { - str += ` -

-
-
Q
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
物料代码:${item.itemCode}
物料名称${item.itemName}发货单号${this.data1.asnNumber}
供应商${item.supplierCode}供应商批次${item.supplierBatch}
到货数量${item.quantityQty}抽检数量${item.sampleQty}
+ if(!item.haveInspectionRequest){ + str += ` +

+
+
Q
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
物料代码:${item.itemCode}
物料名称${item.itemName}发货单号${this.data1.asnNumber}
供应商${item.supplierCode}供应商批次${item.supplierBatch}
到货数量${item.quantityQty}抽检数量${item.sampleQty}
未生成检验申请
+
-
- ` + ` + }else{ + str += ` +

+
+
Q
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
物料代码:${item.itemCode}
物料名称${item.itemName}发货单号${this.data1.asnNumber}
供应商${item.supplierCode}供应商批次${item.supplierBatch}
到货数量${item.quantityQty}抽检数量${item.sampleQty}
+
+
+ ` + } + }) this.newHtmlContent1 = this.newHtmlContent1.replace( "mainBody", str); //替换物品代码 @@ -306,9 +357,9 @@ await queryInspectionFreeFlag({ number: this.number }).then(async res1 => { + console.log(444,res1) this.data1 = res1.data 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 }