From 8ec07d581c9c305185d83474a1b66d82f2d2b659 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Sat, 3 Aug 2024 14:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/style/pdabasic.css                   |  2 +-
 src/mycomponents/location/locationCompare.vue   | 10 +++-------
 src/pages/productionReturn/job/returnDetail.vue |  4 +++-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/common/style/pdabasic.css b/src/common/style/pdabasic.css
index a6573500..b5e25e1f 100644
--- a/src/common/style/pdabasic.css
+++ b/src/common/style/pdabasic.css
@@ -773,7 +773,7 @@ page {
 
 .page-footer {
 	/* color: #fff; */
-	line-height: 100rpx;
+	/* line-height: 100rpx; */
 	/* 不放大不缩小固定100rpx */
 	flex: 0 0 100rpx;
 	/* background-color: #00AAFF; */
diff --git a/src/mycomponents/location/locationCompare.vue b/src/mycomponents/location/locationCompare.vue
index aba61626..14bff332 100644
--- a/src/mycomponents/location/locationCompare.vue
+++ b/src/mycomponents/location/locationCompare.vue
@@ -1,19 +1,15 @@
 <template>
-	<view class="uni-flex u-col-center" style="padding-top: 15rpx; 
-	padding-bottom: 15rpx;
-	 padding-left: 10rpx;
-	 padding-right: 10rpx;
+	<view class="uni-flex u-col-center" style="padding-left: 10rpx;padding-right: 10rpx;
 	 font-size:32rpx;">
 		<view class="uni-flex uni-row u-col-center" @click="showLocation">
 			<view class="flex uni-row" v-if="isShowEdit"  >
 				<view >
-					<text style="font-size: 35rpx;">{{title}}</text>
-				
+					<text style="font-size: 35rpx;">{{title}}</text>	
 					<text style="font-size: 45rpx;color:#3FBAFF; font-weight: bold;">&nbsp {{recommendLocationCode}}</text>
 					<text v-if="locationCode" style="font-size: 45rpx;color:#3FBAFF;font-weight: bold;">&nbsp/&nbsp{{locationCode}}</text>
 					<!-- <text style="font-size: 35rpx;color:#3FBAFF;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text> -->
 				</view>
-				<image style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
+				<image style="width:45rpx;height: 45rpx; vertical-align:center" class="center" src="/static/icons/icons_edit.svg"></image>
 			</view>
 			<view class="" v-else>
 				<view >
diff --git a/src/pages/productionReturn/job/returnDetail.vue b/src/pages/productionReturn/job/returnDetail.vue
index 44301682..3d5c69c0 100644
--- a/src/pages/productionReturn/job/returnDetail.vue
+++ b/src/pages/productionReturn/job/returnDetail.vue
@@ -193,6 +193,9 @@
 							that.fromLocationCode = that.subList[0].fromLocationCode
 							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.titleInfo = that.subList[0];
+							
+							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes);
+							
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -428,7 +431,6 @@
 					this.showMessageHint('请扫描收货库位', callback => {
 						this.$refs.locationCompare.showLocation();
 					})
-
 					return isPass = false;
 				}
 				return isPass;