From 6e36f0d4c15d31afffb1f0194ebf8abebd31c4dd Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 15 Aug 2024 15:43:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8D=95=E6=8F=90=E7=A4=BA=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/pointPutawayJob/index.vue | 121 ++++++++++++++++++++-------- 1 file changed, 86 insertions(+), 35 deletions(-) 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 } From 6e1ba14992c9eb7ce04ab9710d4575a856a4f7b1 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 15 Aug 2024 17:12:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8D=95=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/pointPutawayJob/index.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index 97ac306b..df63a6e8 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -85,6 +85,7 @@ + @@ -319,7 +320,14 @@ this.showTableInspectDTOList = this.data1.inspectDTOList } console.log(233, this.showTableInspectDTOList) - } + }, + showMessage(message) { + this.$refs.comMessage.showMessage(message, res => { + if (res) { + + } + }); + }, }, watch: { isLoadFinish: { @@ -364,6 +372,12 @@ this.tabIndex =2 } this.getTableInspectDTOList() + }).catch(error=>{ + this.$refs.comMessage.showMessage(error, res => { + if (res) { + + } + }); }) } From b21fbc2f76dd49ce80ad3644ec3c6662f02b77d6 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 15 Aug 2024 19:14:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8D=95=E5=9B=9E?= =?UTF-8?q?=E9=80=80=E5=88=B0=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 6 +- src/pages/pointPutawayJob/index.vue | 99 +++++++++++++++-------------- 2 files changed, 53 insertions(+), 52 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index 82cae880..c5464834 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.62", + "versionCode" : 62, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index df63a6e8..82418c03 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -41,9 +41,9 @@ 抽检数量 {{item.sampleQty}} - + @@ -207,7 +207,46 @@ this.readFile(htmlFileUrl1, (htmlContent) => { this.newHtmlContent1 = htmlContent this.data1.inspectDTOList.forEach(item => { - if(!item.haveInspectionRequest){ + // if(!item.haveInspectionRequest){ + // str += ` + //

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

@@ -238,51 +277,12 @@ 抽检数量 ${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( @@ -372,13 +372,14 @@ this.tabIndex =2 } this.getTableInspectDTOList() - }).catch(error=>{ - this.$refs.comMessage.showMessage(error, res => { - if (res) { - - } - }); }) + // .catch(error=>{ + // this.$refs.comMessage.showMessage(error, res => { + // if (res) { + + // } + // }); + // }) } this.getPointPutawayJobHtml() From 9eb9161274a10d7e0fbac3c12c11ca171e46cf20 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 15 Aug 2024 20:21:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8D=95=E6=96=87?= =?UTF-8?q?=E5=AD=97=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 4 ++-- src/pages/pointPutawayJob/index.vue | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index c5464834..3da3f3cc 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,8 +3,8 @@ "package" : "uni.UNI43932FE", "appid" : "__UNI__F36DDCF", "description" : "", - "versionName" : "1.0.62", - "versionCode" : 62, + "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 82418c03..67f69a46 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -35,12 +35,6 @@ 抽检数量 {{item.sampleQty}} - - 到货数量 - {{item.quantityQty}} - 抽检数量 - {{item.sampleQty}} - From 14061c3dc9d938a45513ed17ea884b4b2f0fc1b4 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 15 Aug 2024 21:04:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/pointPutawayJob/index.vue | 98 ++++++++++++++--------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index 67f69a46..dab39818 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -35,9 +35,9 @@ 抽检数量 {{item.sampleQty}} - + @@ -201,46 +201,46 @@ this.readFile(htmlFileUrl1, (htmlContent) => { this.newHtmlContent1 = htmlContent this.data1.inspectDTOList.forEach(item => { - // if(!item.haveInspectionRequest){ - // str += ` - //

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

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

@@ -276,7 +276,7 @@
` - // } + } }) this.newHtmlContent1 = this.newHtmlContent1.replace( @@ -367,13 +367,13 @@ } this.getTableInspectDTOList() }) - // .catch(error=>{ - // this.$refs.comMessage.showMessage(error, res => { - // if (res) { + .catch(error=>{ + this.$refs.comMessage.showMessage(error, res => { + if (res) { - // } - // }); - // }) + } + }); + }) } this.getPointPutawayJobHtml()