From 77d3c3755131308551c0fef2b1e819d36e8c53f2 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 6 Sep 2024 15:00:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=B8=8D=E6=98=AF=E6=8E=A8=E8=8D=90=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/package/coms/comScanPackagePack.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue index 3ffd4563..93b4d22a 100644 --- a/src/pages/package/coms/comScanPackagePack.vue +++ b/src/pages/package/coms/comScanPackagePack.vue @@ -242,7 +242,7 @@ import { getDirectoryItemArray } from '@/common/directory'; let record = batch.Records.find(r => r.packingNumber == packingCode); if (record == undefined) { //如果有推荐箱码 - if (batch.Recommends.length > 0) { + if (batch.Recommends != undefined &&batch.Recommends.length > 0) { let recommend = batch.Recommends.find(r => r.packingNumber == packingCode); if (recommend != undefined) { that.addRecord(batch, label, balance, packageInfo) From 01303941ab343ae85a925035903f438e3b26c8ae Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 6 Sep 2024 15:05:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=89=AB=E6=8F=8F=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/package/job/overPackageJobDetail.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index 23121322..d7527616 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -235,6 +235,8 @@ that.detailSource = getDataSource(that.detailSource, that.subList) if (this.scanMessage) { this.openScanPopupSimulate(this.scanMessage); + }else { + this.openScanDetailPopup() } // this.$nextTick(() => { // if (uni.getStorageSync('overPackageJobDetailPointParams')) { From e9c740ad3e3600a10601ef6d42c126833abe30e0 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 6 Sep 2024 15:06:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index bf3b3ff4..b5783ca2 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,8 +3,8 @@ "package" : "uni.UNI43932FE", "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.72", - "versionCode" : 72, + "versionName" : "1.0.73", + "versionCode" : 73, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : {