chenrui 2 лет назад
Родитель
Сommit
72e9b99062
2 измененных файлов с 60 добавлено и 56 удалено
  1. 50 55
      pages/shuntBackManage/addBackOrder.vue
  2. 10 1
      pages/shuntBackManage/shelfList.vue

+ 50 - 55
pages/shuntBackManage/addBackOrder.vue

@@ -15,60 +15,60 @@
 			</view> -->
 		</view>
 		<view class="backOrderCon">
-			<scroll-view scroll-y class="scroll-view" v-if="recallBillList && recallBillList.length>0" >
-					<view class="partList-list-box" v-for="(item,index) in recallBillList" :key="item.id">
-						<view class="product flex align_center">
-							<view class="uni-col-1" @click="delDetail(item,index)">
-								<u-icon name="close-circle" color="#ff5500" size="35"></u-icon>
+			<view v-if="recallBillList && recallBillList.length>0">
+				<view class="partList-list-box" v-for="(item,index) in recallBillList" :key="item.id">
+					<view class="product flex align_center">
+						<view class="uni-col-1" @click="delDetail(item,index)">
+							<u-icon name="close-circle" color="#ff5500" size="35"></u-icon>
+						</view>
+						<view class="flex flex_1">
+							<view class="pimgs">
+								<u-image :src="item.productImageUrl?item.productImageUrl:`../../static/${$config('themePath')}/def_img@2x.png`" width="120" height="120" border-radius="10"></u-image>
 							</view>
-							<view class="flex flex_1">
-								<view class="pimgs">
-									<u-image :src="item.productImageUrl?item.productImageUrl:`../../static/${$config('themePath')}/def_img@2x.png`" width="120" height="120" border-radius="10"></u-image>
+							<view class="pinfo">
+								<view class="pname item-name">
+									<text>{{item.shelfPlaceCode}}</text>
+									{{item.productCode}}
+								</view>
+								<view class="productName u-line-2">
+									{{item.productName}}
 								</view>
-								<view class="pinfo">
-									<view class="pname item-name">
-										<text>{{item.shelfPlaceCode}}</text>
-										{{item.productCode}}
+								<view class="ptxt flex align_center">
+									<view>
+										最大库容
+										<text class="pnums">{{item.maxQty}}</text>
 									</view>
-									<view class="productName u-line-2">
-										{{item.productName}}
+									<view>
+										/货架库存
+										<text class="pnums">{{item.qty}}</text>
 									</view>
-									<view class="ptxt flex align_center">
-										<view>
-											最大库容
-											<text class="pnums">{{item.maxQty}}</text>
-										</view>
-										<view>
-											/货架库存
-											<text class="pnums">{{item.qty}}</text>
-										</view>
-										<view>
-											/滞销
-											<text class="pnums">{{!item.unsalableDays || (item.unsalableDays&&item.unsalableDays) == 0 ?'--天':item.unsalableDays}}</text>
-										</view>
+									<view>
+										/滞销
+										<text class="pnums">{{!item.unsalableDays || (item.unsalableDays&&item.unsalableDays) == 0 ?'--天':item.unsalableDays}}</text>
 									</view>
 								</view>
 							</view>
-							</u-checkbox>
 						</view>
-						<view class="ptools flex align_center u-row-between">
-							<view class="ptools_l u-flex">
-								<view v-if="item.replenishBillQty && item.replenishBillQty!=0">
-									补货在途
-									<text class="pnums">{{item.replenishBillQty}}</text>
-								</view>
-								<view v-if="item.recallBillQty && item.recallBillQty!=0">
-									{{item.replenishBillQty && item.replenishBillQty!=0 ? '/':''}}调回在途
-									<text class="pnums">{{item.recallBillQty}}</text>
-								</view>
+						</u-checkbox>
+					</view>
+					<view class="ptools flex align_center u-row-between">
+						<view class="ptools_l u-flex">
+							<view v-if="item.replenishBillQty && item.replenishBillQty!=0">
+								补货在途
+								<text class="pnums">{{item.replenishBillQty}}</text>
 							</view>
-							<view class="pcurnums flex align_center">
-								<text>调回数量</text>
-								<view class="u-ninput"><u-number-box color="#000" bg-color="#fff" :input-height="60" v-model="item.confirmQty" :min="item.recallBillQty?item.qty - item.recallBillQty>0 ?1 :0 :1" :max="item.recallBillQty?item.qty - item.recallBillQty>0 ?item.qty - item.recallBillQty :0 :item.qty"></u-number-box></view>
+							<view v-if="item.recallBillQty && item.recallBillQty!=0">
+								{{item.replenishBillQty && item.replenishBillQty!=0 ? '/':''}}调回在途
+								<text class="pnums">{{item.recallBillQty}}</text>
 							</view>
 						</view>
+						<view class="pcurnums flex align_center">
+							<text>调回数量</text>
+							<view class="u-ninput"><u-number-box color="#000" bg-color="#fff" :input-height="60" v-model="item.confirmQty" :min="item.recallBillQty?item.qty - item.recallBillQty>0 ?1 :0 :1" :max="item.recallBillQty?item.qty - item.recallBillQty>0 ?item.qty - item.recallBillQty :0 :item.qty"></u-number-box></view>
+						</view>
 					</view>
-			</scroll-view>
+				</view>
+			</view>
 			<view class="nodata" v-else>
 				<image :src="`/static/${$config('themePath')}/def_no_data@3x.png`"></image>
 				<view class="nodataTip">
@@ -76,7 +76,7 @@
 					<text @click="toChooseProduct">选择产品</text>
 				</view>
 			</view>
-		</view>
+		</view>	
 		<view class="backOrderFooter u-flex" :style="{zIndex:(detailFlag? 99999:11)}">
 			<view class="footerBox u-flex u-row-between">
 				<view class="footerBox_m u-flex">
@@ -304,13 +304,10 @@ export default {
 <style lang="less" scoped>
 .content {
 	background: #ffffff;
-	padding:0 20rpx;
 	width: 100%;
 	height: 100vh;
-	box-sizing: border-box;
 		.headerName {
-			padding-bottom: 16rpx;
-			padding-top: 20rpx;
+			padding:20rpx 20rpx 16rpx;
 			color: #222;
 			font-size: 30rpx;
 			.barBox {
@@ -337,12 +334,12 @@ export default {
 	}
 	.backOrderCon {
 		width: 100%;
-		flex-grow:1 ;
-		.scroll-view{
-			height: 100%;
+		flex-grow:1;
+		overflow: auto; 
 		.partList-list-box {
 			width: 700rpx;
-			padding: 10px 0;
+			padding: 10px 20rpx;
+			box-sizing: border-box;
 			border-bottom: 2rpx solid #f5f5f5;
 			&:last-child {
 				border: 0;
@@ -434,7 +431,6 @@ export default {
 				}
 			}
 		}
-		}
 		.nodata{
 			text-align: center;
 			image{
@@ -455,10 +451,9 @@ export default {
 	.backOrderFooter {
 		height: 98rpx;
 		box-sizing: border-box;
-		padding: 10rpx 0;
-		vertical-align: top;
+		padding: 10rpx 20rpx;
 		position: relative;
-		background-color: #fff;
+		background-color: #f8f8f8;
 		.footerBox {
 			width: 100%;
 			.footerBox_m {

+ 10 - 1
pages/shuntBackManage/shelfList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="moreShelfPart flex flex_column">
 		<view class="moreShelfPart-search">
-			<u-search
+			<u-search ref="searchBox"
 				placeholder="请输入货架名称搜索"
 				v-model="shelfName"
 				:show-action="isGobleSearch"
@@ -128,6 +128,7 @@ export default {
 					_this.total = 0;
 					_this.noDataText = res.message ? res.message : '网络似乎出错了,请稍后再试';
 				}
+				
 			});
 		},
 		viewDetail(item) {
@@ -140,6 +141,14 @@ export default {
 			})
 		}
 	},
+	onHide() {
+		this.$nextTick(()=>{
+			this.$refs.searchBox.blur();
+			this.isGobleSearch=false
+			uni.hideKeyboard()
+		})
+		
+	},
 	// 上拉加载更多
 	onReachBottom() {
 		if (this.shelfList.length < this.total) {