From 2a9c092ffea9882d3d30ce105dc1390680c3cf12 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 14:58:47 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/unPlanned/job/receiptJobDetail.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue index 5033f7c5..a2af2f2e 100644 --- a/src/pages/unPlanned/job/receiptJobDetail.vue +++ b/src/pages/unPlanned/job/receiptJobDetail.vue @@ -302,11 +302,11 @@ this.continueScan() } } - let array = this.detailSource.map((item=>{ - return { - ...item, - subList: item.subList.filter(cur=>cur.isRecommend == true) - } + let array = [] + this.detailSource.forEach((item=>{ + let obj = {...item} + obj.subList=item.subList.filter(cur=>cur.isRecommend == true) + array.push(obj) })) calcHandleQty(array); } From 5f637f9e496a164f921fb0a1bcfe60266c31e020 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 16:43:59 +0800 Subject: [PATCH 2/8] =?UTF-8?q?YT-1106pda=E5=8F=91=E6=96=99=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E6=8F=90=E4=BA=A4=E7=82=B9=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueDetailBatch.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue index 03d014a1..d0f79487 100644 --- a/src/pages/issue/job/issueDetailBatch.vue +++ b/src/pages/issue/job/issueDetailBatch.vue @@ -688,7 +688,7 @@ if (res) { return //防止重复点击 - // this.$throttle(this.submit, 2000, this)() + this.$throttle(this.submit, 2000, this)() } else { this.scanPopupGetFocus() } @@ -696,7 +696,7 @@ }else { return //防止重复点击 - // this.$throttle(this.submit, 2000, this)() + this.$throttle(this.submit, 2000, this)() } }, From c9c5a6cf17258d4bbcf192279da07aa4d63d0505 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 16:58:31 +0800 Subject: [PATCH 3/8] =?UTF-8?q?YT-1077=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1PDA=E7=82=B9=E5=87=BB=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=B2=A1=E6=9C=89=E6=89=93=E5=BC=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E5=8F=AA=E6=98=AF=E6=8A=8A=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=94=B6=E8=B5=B7=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/unPlanned/job/receiptJobDetail.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue index a2af2f2e..b6cc5274 100644 --- a/src/pages/unPlanned/job/receiptJobDetail.vue +++ b/src/pages/unPlanned/job/receiptJobDetail.vue @@ -42,6 +42,7 @@ + @@ -80,6 +81,7 @@ import comReceiptDetailCard from '@/pages/unPlanned/coms/comReceiptDetailCard.vue' import jobTop from '@/mycomponents/job/jobTop.vue' import comRecommendDetailCard from "@/mycomponents/detail/comRecommendDetailCard.vue" + import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue' export default { name: 'receipt_detail', @@ -89,7 +91,8 @@ comReceiptDetailCard, locationCompare, jobTop, - comRecommendDetailCard + comRecommendDetailCard, + detailInfoPopup }, data() { return { @@ -523,6 +526,9 @@ return this.jobContent; }, + openDetail(item) { + this.$refs.detailInfoPopup.openPopup(item) + }, From e7bad329a73b41b6e64752a7e3c59044c3771aab Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 17:02:35 +0800 Subject: [PATCH 4/8] =?UTF-8?q?YT-1079=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1PDA=E7=A7=BB=E9=99=A4=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=BF=A1=E6=81=AF=E5=90=8E=E5=AE=9E=E9=99=85=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E7=9A=84=E4=BF=A1=E6=81=AF=E6=B2=A1=E6=9C=89=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/unPlanned/job/receiptJobDetail.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue index b6cc5274..9435b0b6 100644 --- a/src/pages/unPlanned/job/receiptJobDetail.vue +++ b/src/pages/unPlanned/job/receiptJobDetail.vue @@ -232,6 +232,16 @@ updateData() { + //删除新添加的 + for (var i = 0; i < this.detailSource.length; i++) { + var item =this.detailSource[i] + for (var j = 0; j < item.subList.length; j++) { + var sub =item.subList[j] + if(!sub.isRecommend&&!sub.scaned){ + item.subList.splice(j,1) + } + } + } calcHandleQty(this.detailSource); this.$forceUpdate() }, From d7b3282288e0fcd2c281c3c7a506b6a7a02d0016 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 17:06:35 +0800 Subject: [PATCH 5/8] =?UTF-8?q?YT-1076=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F=EF=BC=8C=E6=A0=87?= =?UTF-8?q?=E5=8C=85=E9=87=8F=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=EF=BC=8C=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/unPlanned/job/receiptJobDetail.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue index 9435b0b6..7bfddc96 100644 --- a/src/pages/unPlanned/job/receiptJobDetail.vue +++ b/src/pages/unPlanned/job/receiptJobDetail.vue @@ -292,13 +292,13 @@ toLocationCode:locationCode, // inventoryStatus:inventoryStatus, // toInventoryStatus:inventoryStatus, - // balance:result.balance, + balance:{}, isRecommend:false, isNewAdd:"newAdd" } // newAdd.balance.balanceQty = Number(result.balance.qty); - // newAdd.balance.packQty = Number(result.package.packQty) - // newAdd.balance.packUnit = result.package.packUnit + newAdd.balance.packQty = Number(result.package.packQty) + newAdd.balance.packUnit = result.package.packUnit newAdd.scaned = true; detail.subList.push(newAdd) } else { From 9b5ae21eb8ce54f54c081e1354ace6f45867906f Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 17:17:57 +0800 Subject: [PATCH 6/8] =?UTF-8?q?YT-1063=E5=8D=8F=E5=AE=9A=E5=93=81=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=92=8C=E5=8F=B7=E8=AF=95=E5=93=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/purchaseReceipt/job/receiptDetail.vue | 3 +++ src/pages/purchaseReceipt/job/receiptJob.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 4f5e7505..a791e5b8 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -194,6 +194,9 @@ this.source_type = option.source_type; this.switchCode = "purchasereceiptPrintPDA" //采购收货PDA打印开关 this.switchCode1 = "EnableQms" //根据开关中是否启用QMS去判断，如果为TRUE显示检验指引单，如果为FALSE不显示检验指引单 + uni.setNavigationBarTitle({ + title:option.title + '详情' + }) if (this.id != undefined) { //新建的任务自动接收 if (this.status == "1") { diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index c2769bb2..11fb464a 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -310,7 +310,7 @@ openJobDetail(item, scanMessage = '') { uni.navigateTo({ url: './receiptDetail?id=' + item.masterId + '&status=' + item.status + '&operation=' + this - .operation + '&scanMessage=' + scanMessage + '&source_type=' + this.source_type + .operation + '&scanMessage=' + scanMessage + '&source_type=' + this.source_type + '&title=' + this.title }); this.scanMessage = "" }, From fb5e662cf9f0a197d24803b36ca734798dbfeb0a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 17:33:14 +0800 Subject: [PATCH 7/8] =?UTF-8?q?YT-1064=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=BC=96=E8=BE=91=E6=95=B0=E9=87=8F=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E6=A0=A1=E9=AA=8C=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E=E6=A0=87=E7=AD=BE=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/qty/recommendQtyEdit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue index b3c64e0b..a722fc76 100644 --- a/src/mycomponents/qty/recommendQtyEdit.vue +++ b/src/mycomponents/qty/recommendQtyEdit.vue @@ -196,7 +196,7 @@ import { nextTick } from 'vue'; }) return } - if (this.allQty > this.labelQty && this.isNumTips) { + if (this.allQty > this.labelQty && this.isNumTips && !this.isNumPackTips) { this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于标签数量[' + this.labelQty + ']', From d1913ab2a436df06c03d01874165afd8a7766d5c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 17:35:57 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/mycomponents/qty/recommendQtyEdit.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.env.development b/.env.development index 4e262404..1b41c7eb 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ VITE_BASE_URL=http://localhost:12080/admin-api -# VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api +#VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api # VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api # 租户配置 diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue index a722fc76..75bb6791 100644 --- a/src/mycomponents/qty/recommendQtyEdit.vue +++ b/src/mycomponents/qty/recommendQtyEdit.vue @@ -187,6 +187,7 @@ import { nextTick } from 'vue'; setValue() { // var recommendQty = Number(this.dataContent.qty); // var labelQty = Number(this.dataContent.record.label.qty); + // 采购收货判断是否大于包装数量isNumPackTips这个字段做判断 if (this.allQty > parseFloat(this.dataContent.packQty) && this.isNumPackTips) { this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于包装数量[' + this.dataContent.packQty + @@ -196,6 +197,7 @@ import { nextTick } from 'vue'; }) return } + // 其他功能判断是否大于标签数量 if (this.allQty > this.labelQty && this.isNumTips && !this.isNumPackTips) { this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于标签数量[' + this.labelQty +