diff --git a/src/manifest.json b/src/manifest.json index 82cae880..3da3f3cc 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,10 +1,10 @@ { "name" : "wms", "package" : "uni.UNI43932FE", - "appid" : "__UNI__C9CF4BF", + "appid" : "__UNI__F36DDCF", "description" : "", - "versionName" : "1.0.60", - "versionCode" : 60, + "versionName" : "1.0.63", + "versionCode" : 63, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index d3c1fe15..dab39818 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -35,6 +35,9 @@ 抽检数量 {{item.sampleQty}} + + 未生成检验申请 + @@ -76,6 +79,7 @@ + @@ -197,41 +201,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); //替换物品代码 @@ -268,7 +314,14 @@ this.showTableInspectDTOList = this.data1.inspectDTOList } console.log(233, this.showTableInspectDTOList) - } + }, + showMessage(message) { + this.$refs.comMessage.showMessage(message, res => { + if (res) { + + } + }); + }, }, watch: { isLoadFinish: { @@ -306,14 +359,21 @@ 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 } this.getTableInspectDTOList() }) + .catch(error=>{ + this.$refs.comMessage.showMessage(error, res => { + if (res) { + + } + }); + }) } this.getPointPutawayJobHtml()