From 895f07961d720b5ae1283e50cd3d5c47ccec9ff0 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 24 May 2024 10:29:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?#=20=E6=98=AF=E5=90=A6=E6=98=AF=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=20VITE=5FisDevelopment=3Dtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 5 ++++- .env.hella13 | 5 ++++- .env.hella14 | 5 ++++- .env.hella15 | 5 ++++- .env.hella16 | 5 ++++- .env.hella8 | 5 ++++- .env.hella9 | 5 ++++- .env.production | 5 ++++- .env.test | 5 ++++- src/static/config.js | 2 +- 10 files changed, 37 insertions(+), 10 deletions(-) diff --git a/.env.development b/.env.development index 805318a5..88c59b10 100644 --- a/.env.development +++ b/.env.development @@ -1 +1,4 @@ -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_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' \ No newline at end of file +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_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' + +# 是否是测试环境 +VITE_isDevelopment=true diff --git a/.env.hella13 b/.env.hella13 index ac6a95bc..853c42c2 100644 --- a/.env.hella13 +++ b/.env.hella13 @@ -2,4 +2,7 @@ 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":"长春","value":1}]' \ No newline at end of file +VITE_TENANT='[{"text":"长春","value":1}]' + +# 是否是测试环境 +VITE_isDevelopment=false \ No newline at end of file diff --git a/.env.hella14 b/.env.hella14 index 496e1c4a..b36727af 100644 --- a/.env.hella14 +++ b/.env.hella14 @@ -2,4 +2,7 @@ VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 -VITE_TENANT='[{"text":"长春","value":1}]' \ No newline at end of file +VITE_TENANT='[{"text":"长春","value":1}]' + +# 是否是测试环境 +VITE_isDevelopment=false \ No newline at end of file diff --git a/.env.hella15 b/.env.hella15 index b7e31d84..b2e736b3 100644 --- a/.env.hella15 +++ b/.env.hella15 @@ -2,4 +2,7 @@ VITE_BASE_URL=http://172.21.32.15:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.15:81/admin-api # 租户配置 -VITE_TENANT='[{"text":"长春","value":1}]' \ No newline at end of file +VITE_TENANT='[{"text":"长春","value":1}]' + +# 是否是测试环境 +VITE_isDevelopment=false \ No newline at end of file diff --git a/.env.hella16 b/.env.hella16 index aab54cc5..2f7a69ed 100644 --- a/.env.hella16 +++ b/.env.hella16 @@ -2,4 +2,7 @@ VITE_BASE_URL=http://172.21.32.16:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.16:81/admin-api # 租户配置 -VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' \ No newline at end of file +VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' + +# 是否是测试环境 +VITE_isDevelopment=false \ No newline at end of file diff --git a/.env.hella8 b/.env.hella8 index d9348e22..d1fde796 100644 --- a/.env.hella8 +++ b/.env.hella8 @@ -2,4 +2,7 @@ VITE_BASE_URL=http://172.22.32.8:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api # 租户配置 -VITE_TENANT='[{"text":"成都","value":2}]' \ No newline at end of file +VITE_TENANT='[{"text":"成都","value":2}]' + +# 是否是测试环境 +VITE_isDevelopment=false \ No newline at end of file diff --git a/.env.hella9 b/.env.hella9 index f032d6e2..cfa01c2a 100644 --- a/.env.hella9 +++ b/.env.hella9 @@ -2,4 +2,7 @@ VITE_BASE_URL=http://172.22.32.9:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api # 租户配置 -VITE_TENANT='[{"text":"成都","value":2}]' \ No newline at end of file +VITE_TENANT='[{"text":"成都","value":2}]' + +# 是否是测试环境 +VITE_isDevelopment=false \ No newline at end of file diff --git a/.env.production b/.env.production index 8856dddb..dbe149eb 100644 --- a/.env.production +++ b/.env.production @@ -1 +1,4 @@ -VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' \ No newline at end of file +VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' + +# 是否是测试环境 +VITE_isDevelopment=false \ No newline at end of file diff --git a/.env.test b/.env.test index c86eaa90..6c18a67f 100644 --- a/.env.test +++ b/.env.test @@ -3,4 +3,7 @@ VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api # 租户配置 -VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' \ No newline at end of file +VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' + +# 是否是测试环境 +VITE_isDevelopment=false \ No newline at end of file diff --git a/src/static/config.js b/src/static/config.js index 5a123a23..ec887f86 100644 --- a/src/static/config.js +++ b/src/static/config.js @@ -1,7 +1,7 @@ let request_url = "http://dev.ccwin-in.com:25300/api/admin-api" // let request_url = "http://192.168.0.128:12080/admin-api" -let isDevelopment = false +let isDevelopment = import.meta.env.VITE_isDevelopment=='true'; export default { request_url, From 6265b5f6941d2d4ba4e81e934d7e9fb889bca10c Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 24 May 2024 11:25:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?PDA=20WMS=20=E5=85=81=E8=AE=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BA=93=E4=BD=8D=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=90=A6?= =?UTF-8?q?=EF=BC=8C=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productReceipt/job/fgProductReceiptDetail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index cde91af9..9d93c945 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -49,8 +49,8 @@ - - + From 57adc018447e481f0faccc3ec7faae6db37c54c7 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 24 May 2024 13:34:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3WMS=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91=EF=BC=8CPDA=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=BF=AE=E6=94=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/customerReturn/job/returnDetail.vue | 2 +- src/pages/productReceipt/job/productReceiptDetail.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue index 9d3342fc..e5a0e4f5 100644 --- a/src/pages/customerReturn/job/returnDetail.vue +++ b/src/pages/customerReturn/job/returnDetail.vue @@ -18,7 +18,7 @@ - diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 13bf47a5..65048ed1 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -53,7 +53,7 @@ - From 7d6fa392bc66c8ffc734056eaf15b53b9f2cc39f Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sat, 25 May 2024 09:47:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1-?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/qty/balanceQtyEdit.vue | 20 +++++++++++++++----- src/mycomponents/status/balanceStatus.vue | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue index 11f048de..735d5205 100644 --- a/src/mycomponents/qty/balanceQtyEdit.vue +++ b/src/mycomponents/qty/balanceQtyEdit.vue @@ -14,11 +14,11 @@ - 标包个数 : + 包装数量 : - + @@ -94,9 +94,7 @@ maxlength: 10 } }, - watch: { - - }, + created() { }, @@ -119,6 +117,18 @@ default: false } }, + watch:{ + 'allQty'(newVal){ + if(newVal % Number(this.dataContent.packQty)>0){ + this.stdCount = Math.floor(Number(newVal)/Number(this.dataContent.packQty))+1 + + }else{ + this.stdCount = Math.floor(Number(newVal)/Number(this.dataContent.packQty)) + + } + console.log('allQty===',newVal) + } + }, methods: { checkNum(e) { let value = e.detail.value; diff --git a/src/mycomponents/status/balanceStatus.vue b/src/mycomponents/status/balanceStatus.vue index 786c4ff9..0fb32b1c 100644 --- a/src/mycomponents/status/balanceStatus.vue +++ b/src/mycomponents/status/balanceStatus.vue @@ -1,6 +1,6 @@