From d8d9a98fcce9fccc2a1c18cff6d7f420da0fbc35 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Wed, 3 Jul 2024 16:35:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +- src/mycomponents/scan/winComScan.vue | 4 +- src/mycomponents/scan/winScanPackage.vue | 98 +++++++++++-- src/pages/material/materialDowngrade.vue | 168 ++--------------------- 4 files changed, 103 insertions(+), 173 deletions(-) diff --git a/.env.development b/.env.development index 2d78cf62..96e32fde 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ -VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api -VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api +#VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api +#VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api -#VITE_BASE_URL=http://172.21.32.13:81/api/admin-api #VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api +VITE_BASE_URL=http://172.21.32.13:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' # 是否是测试环境 diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue index 481aa733..409e1cc9 100644 --- a/src/mycomponents/scan/winComScan.vue +++ b/src/mycomponents/scan/winComScan.vue @@ -23,7 +23,7 @@ - + 历史记录 @@ -33,7 +33,7 @@ - diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue index 44a08fc3..82b2eebe 100644 --- a/src/mycomponents/scan/winScanPackage.vue +++ b/src/mycomponents/scan/winScanPackage.vue @@ -14,20 +14,24 @@ - + - + From 64371643efd279c3dc55ab25847d0e7737ea382f Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 9 Jul 2024 16:28:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8C=85?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/package/coms/comPackageRecord.vue | 2 +- src/pages/package/record/splitPackageRecord.vue | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/package/coms/comPackageRecord.vue b/src/pages/package/coms/comPackageRecord.vue index fe24a43d..c420f68a 100644 --- a/src/pages/package/coms/comPackageRecord.vue +++ b/src/pages/package/coms/comPackageRecord.vue @@ -18,7 +18,7 @@ + :isShowFromLocation="false" :isShowToLocation="false"> diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue index 5cf86210..efa3ecb1 100644 --- a/src/pages/package/record/splitPackageRecord.vue +++ b/src/pages/package/record/splitPackageRecord.vue @@ -181,12 +181,12 @@ item.subList[0].Records.forEach(function(item1, index) { sumQty = calc.add(sumQty,item1.qty) }); - if (calc.add(qty,sumQty)> item.subList[0].qty) { - this.showErrorMessage("扫描数量总和【" + (Number(qty) + sumQty) + "】(当前输入数量【" + qty + "】+已添加数量【" + - sumQty + - "】)已超过拆包箱码的数量【" + Number(item.subList[0].qty) + "】!"); - return; - } + // if (calc.add(qty,sumQty)> item.subList[0].qty) { + // this.showErrorMessage("扫描数量总和【" + (Number(qty) + sumQty) + "】(当前输入数量【" + qty + "】+已添加数量【" + + // sumQty + + // "】)已超过拆包箱码的数量【" + Number(item.subList[0].qty) + "】!"); + // return; + // } item.subList[0].Records.push(temp); this.$forceUpdate(); }