From 477892122107188ddd1e41db1cae40ba855aa09c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 20 Sep 2024 15:10:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=98=8E=E7=9B=98=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=A7=BB=E5=87=BA=E5=90=8E=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/count/job/countLightDetail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue index fabb62a7..e74d0ed6 100644 --- a/src/pages/count/job/countLightDetail.vue +++ b/src/pages/count/job/countLightDetail.vue @@ -304,6 +304,7 @@ if (res) { item.scaned = false; item.handleQty = 0; + this.showList.splice(index,1) this.$emit('removePack') } }); From a91cc7861ff6f4d6a70b334307ddea766ff8b803 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 20 Sep 2024 17:54:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?HL-6098PDA=E7=AB=AF=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=E6=97=B6=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=B8=8D=E6=89=AB=E6=8F=8F=E7=AE=B1=E7=A0=81=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E8=BF=9B=E8=A1=8C=E6=8F=90=E4=BA=A4=E3=80=82=E5=9C=A8?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4=E6=97=B6=E5=B0=B1=E6=98=AF?= =?UTF-8?q?=E8=A6=81=E5=BA=93=E4=BD=8D=E4=B8=8A=E7=9A=84=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/count/job/countLightDetail.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue index e74d0ed6..a2f9c7de 100644 --- a/src/pages/count/job/countLightDetail.vue +++ b/src/pages/count/job/countLightDetail.vue @@ -478,10 +478,10 @@ commit() { this.calcAllCount() this.calcScanCount() - if(!this.scanCount){ - this.$refs.comMessage.showErrorMessage('请先进行扫描,再进行提交'); - return - } + // if(!this.scanCount){ + // this.$refs.comMessage.showErrorMessage('请先进行扫描,再进行提交'); + // return + // } if (this.scanCount == this.allCount) { this.submitJob(); } else if (this.scanCount < this.allCount) { From dbfe14d094bf2567e2ef1542480c5f79b3296672 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Fri, 20 Sep 2024 19:50:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/count/job/countJob.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index ebf1416c..fd2b9da1 100644 --- a/src/pages/count/job/countJob.vue +++ b/src/pages/count/job/countJob.vue @@ -178,8 +178,8 @@ filters: filters, pageNo: this.pageNo, pageSize: this.pageSize, - sort:"count_split_code", - by:"ASC" + sort:"number", + by:"DESC" } getCountJobList(params).then(res => { From f9be614589f6eeebf69f4a0c11862623c6d6c719 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 20 Sep 2024 20:52:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/count/job/countLightDetail.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue index a2f9c7de..32db4660 100644 --- a/src/pages/count/job/countLightDetail.vue +++ b/src/pages/count/job/countLightDetail.vue @@ -528,11 +528,13 @@ console.log("提交参数", JSON.stringify(params)); countJobSubmit(params).then(res => { uni.hideLoading() - if (res.data) { - this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data) - } else { - this.showErrorMessage("提交失败[" + res.msg + "]") - } + const str =res.data || '' + this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + str) + // if (res.data) { + // this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data) + // } else { + // this.showErrorMessage("提交失败[" + res.msg + "]") + // } }).catch(error => { uni.hideLoading() this.showErrorMessage(error)