From d74893e692169829b3ce5dbd942328f0c6a7bdd1 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 21 Dec 2023 09:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85=E5=92=8C?=
 =?UTF-8?q?=E6=8B=86=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/scan/winScanContainer.vue       | 2 +-
 mycomponents/scan/winScanPackAndLocation.vue | 2 +-
 pages/package/record/mergePackageRecord.vue  | 2 +-
 pages/package/record/overPackageRecord.vue   | 2 +-
 pages/package/record/splitPackageRecord.vue  | 2 +-
 pages/pallet/record/unBindPalletRecord.vue   | 2 +-
 static/config.json                           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mycomponents/scan/winScanContainer.vue b/mycomponents/scan/winScanContainer.vue
index dae2d39b..b114584d 100644
--- a/mycomponents/scan/winScanContainer.vue
+++ b/mycomponents/scan/winScanContainer.vue
@@ -12,7 +12,7 @@
 			</view>
 			<view class="">
 				<view class="">
-					<win-com-scan ref="scan" @getResult="getScanResult" :placeholder='title' :clearResult="false"
+					<win-com-scan ref="scan" headerType='HCQ' @getResult="getScanResult" :placeholder='title' :clearResult="false"
 						:boxFocus="true" :isShowHistory="isShowHistory">
 					</win-com-scan>
 				</view>
diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index c61dd364..5760d413 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -27,7 +27,7 @@
 
 						<view v-if='allowModifyLocation'>
 							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位"
-								@confirm="scanLocation"></uni-combox>
+								@confirm="scanLocation" style='height: 30px;'></uni-combox>
 						</view>
 						<view v-else>
 							<text style="padding: 5px">
diff --git a/pages/package/record/mergePackageRecord.vue b/pages/package/record/mergePackageRecord.vue
index b7f4e1ce..9cf29be0 100644
--- a/pages/package/record/mergePackageRecord.vue
+++ b/pages/package/record/mergePackageRecord.vue
@@ -35,7 +35,7 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false"></win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationTypeList="fromlocationTypeList"></win-scan-location>
 		<com-message ref="comMessage"></com-message>
diff --git a/pages/package/record/overPackageRecord.vue b/pages/package/record/overPackageRecord.vue
index 1492819a..eef1d1d0 100644
--- a/pages/package/record/overPackageRecord.vue
+++ b/pages/package/record/overPackageRecord.vue
@@ -30,7 +30,7 @@
 
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false"></win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationTypeList="fromlocationTypeList"></win-scan-location>
 		<win-scan-button @goScan='showScanPopupPack'></win-scan-button>
diff --git a/pages/package/record/splitPackageRecord.vue b/pages/package/record/splitPackageRecord.vue
index ec2410db..4c70c950 100644
--- a/pages/package/record/splitPackageRecord.vue
+++ b/pages/package/record/splitPackageRecord.vue
@@ -29,7 +29,7 @@
 			</view>
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false"></win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationTypeList="fromlocationTypeList"></win-scan-location>
 		<win-scan-button @goScan='showScanPopupPack'></win-scan-button>
diff --git a/pages/pallet/record/unBindPalletRecord.vue b/pages/pallet/record/unBindPalletRecord.vue
index c8aac886..c40b08d9 100644
--- a/pages/pallet/record/unBindPalletRecord.vue
+++ b/pages/pallet/record/unBindPalletRecord.vue
@@ -297,7 +297,7 @@
 				this.scanPopupGetFocus();
 			},
 			getContainer(containerInfo) {
-				this.containerCode = containerInfo.Number;
+				this.containerCode = containerInfo.number;
 				getContainerDetailByNumber(this.containerCode).then(res => {
 					if (res.data.length > 0) {
 						this.detailSource = this.getDataSource(res.data)
diff --git a/static/config.json b/static/config.json
index 7426682e..c33affa0 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
+			"value": "http://192.168.0.106:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.180:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",