From a1c0a8f9deabb7910091b87adbe2f6f788ca504e Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 29 Jul 2024 15:13:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/record/issueRecord.vue | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/pages/issue/record/issueRecord.vue b/src/pages/issue/record/issueRecord.vue index f59e58a0..4d85fe74 100644 --- a/src/pages/issue/record/issueRecord.vue +++ b/src/pages/issue/record/issueRecord.vue @@ -115,7 +115,7 @@ import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue' import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue' - + import balance from '@/mycomponents/balance/balance.vue' export default { components: { winScanButton, @@ -124,7 +124,8 @@ comBlankView, recordComDetailCard, recordDetailCard, - winComScanBalance + winComScanBalance, + balance }, data() { return { @@ -137,7 +138,7 @@ toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 - businessType: {}, + businessType: null, showToLoaction: true, recommendLocationList: [], //推荐库位列表 fromWarehouseCode: '', //来源仓库 @@ -513,14 +514,6 @@ closeScanMessage() { this.scanPopupGetFocus(); }, - getLocation(location, code) { - this.getFromLocationCode(location, code) - }, - getFromLocationCode(location, code) { - this.fromLocationInfo = location; - this.fromLocationCode = code; - this.openScanPopup(); - }, showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => { From 2948094bbe6209d629ab1ab1ec6dddb5c341f5f3 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 29 Jul 2024 16:22:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.hella13 | 2 +- .env.hella14 | 2 +- .env.hella8 | 2 +- .env.hella9 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.hella13 b/.env.hella13 index 996ada60..9a603299 100644 --- a/.env.hella13 +++ b/.env.hella13 @@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api VITE_TENANT='[{"text":"长春1379","value":1}]' # 是否是测试环境 -VITE_isDevelopment=true +VITE_isDevelopment=false # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' diff --git a/.env.hella14 b/.env.hella14 index d98ea7b5..91cea3ff 100644 --- a/.env.hella14 +++ b/.env.hella14 @@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api VITE_TENANT='[{"text":"长春1379","value":1}]' # 是否是测试环境 -VITE_isDevelopment=false +VITE_isDevelopment=true # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' diff --git a/.env.hella8 b/.env.hella8 index b7e0f7c8..f6803774 100644 --- a/.env.hella8 +++ b/.env.hella8 @@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' # 是否是测试环境 -VITE_isDevelopment=true +VITE_isDevelopment=false # 积木报表请求路径 diff --git a/.env.hella9 b/.env.hella9 index 1f71bb53..fc674a67 100644 --- a/.env.hella9 +++ b/.env.hella9 @@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' # 是否是测试环境 -VITE_isDevelopment=false +VITE_isDevelopment=true # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.22.32.9:90'