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

src/pages/fg/coms/comNoReceiptPopup.vue

@@ -48,7 +48,7 @@
 								<view class="customerBorder">
 									{{itemCode}}
 								</view>
-								<view v-if="bomVersion" class="">
+								<view v-if="bomVersion" class="" style="min-width: 160rpx;text-align: center;">
 									Bom版本{{bomVersion}}
 								</view>
 								<u-select v-model="showItemCodeSelect" mode="mutil-column-auto" :list="itemCodeList"

src/pages/fg/receiptNoPlan.vue

@@ -6,6 +6,8 @@
 				<com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
 			</view>
 			<view class="" v-if="dataContent">
+				<view class="page-header">
+				<view class="header-view" >
 				<view class="cell_box uni-flex uni-row">
 					<view class="cell_info">
 						<view class="text_lightblue">完工库位</view>
@@ -18,13 +20,15 @@
 						<view>{{dataContent.planQty}}{{dataContent.uom}}</view>
 					</view>
 				</view>
+				</view>
+				</view>
 				<view class='split_line'></view>
 
-				<view class="" style="padding-top: 10rpx; padding-bottom: 10rpx; margin-left: 10rpx;">
+				<view class="" style="padding: 10rpx;margin-left: 10rpx;">
 					<item :dataContent="dataContent"></item>
 				</view>
 				<view class='split_line'></view>
-				<view class="uni-flex uni-row space-between" style="align-items: center">
+				<view class="uni-flex uni-row space-between" style="align-items: center;padding-left:10rpx">
 					<view style="word-break: break-all;">
 						<batch :batch="dataContent.batch"></batch>
 						<view class="card_view ">
@@ -446,15 +450,10 @@
 
 	.header {
 		position: fixed;
-		/* #ifdef H5 */
-		top: 88rpx;
-		/* #endif */
 		left: 0;
 		width: 100%;
 		background-color: #fff;
 		z-index: 10;
-		padding: 10rpx;
-		/* 确保头部在内容之上 */
 	}
 
 	.page-footer {