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

src/mycomponents/job/jobFilter.vue

@@ -1,8 +1,8 @@
 <template>
-	<uni-popup ref="popup">
+	<uni-popup ref="popup" >
 		<view class="maskbox" @tap="maskClick"></view>
 		<view class="uni-flex uni-column center"
-			style="background-color: white;width: 200px; height:auto;padding: 20rpx;z-index: 99;position: relative;">
+			style="background-color: white;width: 100%; height:auto;padding: 20rpx;z-index: 99;position: relative;">
 			<view class="uni-flex space-between u-col-center" style="width: 100%;">
 					<view class="" style="font-size: 32rpx;">
 						只看当天
@@ -23,14 +23,14 @@
 				</view>
 				<!-- <u-input style="margin-left: 20rpx;" v-model="productionLineCode" :border="true"
 					placeholder="请输入生产线" @confirm="productionLineCodeConfirm" /> -->
-				<uni-data-select class="uni-data-select" style="margin-left: 20rpx;" placeholder="请输入生产线" v-model="productionLineCode" :clear="false" :localdata="productionline" @change="productionLineCodeConfirm"></uni-data-select>
+				<uni-data-select class="uni-data-select" style="margin-left: 50rpx;" placeholder="请输入生产线" v-model="productionLineCode" :clear="false" :localdata="productionline" @change="productionLineCodeConfirm"></uni-data-select>
 				
 			</view>
 			<view v-if="isShowFromLocationCode" class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;">
 				<view class="" style="font-size: 32rpx;">
 					来源库位
 				</view>
-				<u-input type="textarea" style="margin-left: 20rpx;" v-model="fromLocationCode" :border="true"
+				<u-input style="margin-left: 20rpx;" confirmType="search" v-model="fromLocationCode" :border="true"
 					placeholder="请输入来源库位" @confirm="fromLocationCodeConfirm" />
 			</view>
 			
@@ -142,7 +142,7 @@
 				this.closeScanPopup();
 			},
 			openFilter() {
-				this.$refs['popup'].open("right");
+				this.$refs['popup'].open("top");
 			},
 			closeScanPopup() {
 				this.$refs.popup.close()

src/pages/pointPutawayJob/index.vue

@@ -18,7 +18,7 @@
 				</view>
 				<view class="mb-right">
 					<view class="mb-text">
-						数量：<view>{{item.packQty}}个</view>
+						数量：<view>{{item.qty}}个</view>
 					</view>
 				</view>
 				</view>
@@ -195,7 +195,7 @@
 								</div>
 								<div class="mb-right">
 									<div class="mb-text">
-										数量：<div>${item.packQty}个</div>
+										数量：<div>${item.qty}个</div>
 									</div>
 								</div>
 								</div>