diff --git a/.env.development b/.env.development index 7c04b5cd..471ca3f9 100644 --- a/.env.development +++ b/.env.development @@ -1 +1,6 @@ -VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/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_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/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/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 @@