Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

.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'

.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'

.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
 
 
 # 积木报表请求路径

.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'

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 => {