From ca3dc72b155bc09c1130a40f3eef10c6b31ceaef Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 17 Aug 2024 14:01:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8CPDA=E5=A2=9E=E5=8A=A0=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/coms/comMoveJob.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue index 7446bf81..4e77583f 100644 --- a/src/pages/inventoryMove/coms/comMoveJob.vue +++ b/src/pages/inventoryMove/coms/comMoveJob.vue @@ -212,14 +212,14 @@ uni.stopPullDownRefresh(); } - var list = res.data.list; + let list = res.data.list; this.totalCount = res.data.total this.loadingType = "loadmore"; + this.jobList = type === "refresh" ? list : this.jobList.concat(list); if (list == null || list.length == 0) { this.loadingType = "nomore"; return; } - this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; this.updateTitle(); }).catch(error => { From df6cf1ff23303120a2f4c158cb528be609902ddf Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Sat, 17 Aug 2024 14:20:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueDetail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 76a209e7..baabd9a2 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -453,6 +453,7 @@ }, autoCommit(){ + let str="" var totalQty =0; var taskQty =0; this.detailSource.forEach(detail => { From 0f194e6870c6336aaa54ec4f28b62486649f6d59 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 17 Aug 2024 15:07:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?HL-5366=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E6=98=8E=E7=9B=98=EF=BC=8C=E4=BB=BB=E5=8A=A1=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=98=AF=E7=9B=B8=E5=90=8C=E5=8C=85=E8=A3=85=E3=80=81?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=E7=89=A9=E6=96=99=E3=80=81=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E3=80=81=E4=B8=8D=E5=90=8C=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E7=9B=98=E7=82=B9=E4=B9=8B=E5=90=8E=EF=BC=8C=E4=BA=A7?= =?UTF-8?q?=E7=94=9F=E8=AE=B0=E5=BD=95=E5=8F=98=E6=88=90=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E7=89=A9=E6=96=99=E3=80=81=E7=9B=B8=E5=90=8C=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E3=80=81=E7=9B=B8=E5=90=8C=E7=8A=B6=E6=80=81=EF=BC=8C=E4=B9=9F?= =?UTF-8?q?=E9=83=BD=E7=94=9F=E6=88=90=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winScanPackAndLocation.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index d7504bf6..a5e6cdce 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -140,6 +140,7 @@ managementPrecision: '', fromInventoryStatuses: "", isCheck: false, + chooseWhich:'1' } }, created() { @@ -341,7 +342,8 @@ this.countCallBack(datas); } else { if (Array.isArray(datas)) { - this.countCallBack(datas[0]); + this.chooseWhich = '2' + this.showBalanceSelect(datas); } else { this.countCallBack(datas); } @@ -386,6 +388,7 @@ // } } else { this.showBalanceSelect(datas); + this.chooseWhich='1' } }, @@ -394,7 +397,12 @@ }, selectBalanceItem(balance) { - this.packCallBack(balance); + if(this.chooseWhich == 1){ + this.packCallBack(balance); + }else{ + this.countCallBack(balance); + } + //因为盘点时有负库存，暂时去掉判断 2023年12月28日 // if (balance.qty > 0) { // this.packCallBack(balance);