修改样式

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; */

src/mycomponents/location/locationCompare.vue

@@ -1,19 +1,15 @@
 <template>
-	<view class="uni-flex u-col-center" style="padding-top: 15rpx; 
+	<view class="uni-flex u-col-center" style="padding-left: 10rpx;padding-right: 10rpx;
-	padding-bottom: 15rpx;
-	 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: 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 >

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;