Browse Source

bug 修复

lilei 2 năm trước cách đây
mục cha
commit
e06988b106

+ 10 - 7
pages/latePlay/chooseProduct.vue

@@ -120,14 +120,17 @@
 		},
 		// 批量打印
 		onNavigationBarButtonTap(e) {
-			if(this.curTab=='all'){
-				uni.showToast({
-					icon: 'none',
-					title: '请先筛选层,按层批量打印!',
-					duration: 5000
-				})
-				return
+			if(this.queryWord=='' && this.placeTab.length>1){
+				if(this.curTab=='all'){
+					uni.showToast({
+						icon: 'none',
+						title: '请先筛选层,按层批量打印!',
+						duration: 5000
+					})
+					return
+				}
 			}
+			
 			const list = this.allList.filter(item => item.qty>0)
 			this.$store.state.vuex_tempPrintList = list
 			if(this.shelfInfo&&list.length){

+ 31 - 27
pages/stockCheck/freezeDetailModal.vue

@@ -6,18 +6,20 @@
 					修理厂提交以下订单,但未取货,请联系修理厂处理
 				</view>
 			</view>
-			<view class="product-main">
-				<view class="p-h1">
-					<text>下单时间</text>
-					<text>下单人员</text>
-					<text>数量</text>
+			<scroll-view class="product-main" scroll-y>
+				<view class="product-main-list">
+					<view class="p-h1">
+						<text>下单时间</text>
+						<text>下单人员</text>
+						<text>数量</text>
+					</view>
+					 <view class="p-row" v-for="item in list" :key="item.id">
+						  <text>{{item.orderDate}}</text>
+						  <text>{{item.orderPersonName}}</text>
+						  <text>{{item.totalQty}}</text>
+					 </view>
 				</view>
-				 <view class="p-row" v-for="item in list" :key="item.id">
-					  <text>{{item.orderDate}}</text>
-					  <text>{{item.orderPersonName}}</text>
-					  <text>{{item.totalQty}}</text>
-				 </view>
-			</view>
+			</scroll-view>
 			<view class="product-footer">
 				<view class="button-cancel" @click="isShow=false">关闭</view>
 			</view>
@@ -87,27 +89,29 @@
 			font-weight: bold;
 		}
 		.product-con{
-			width: 75%;
-			margin: 55% auto 0;
+			width: 580rpx;
+			margin: 18vh auto 0;
 			background-color: #fff;
 			border-radius: 22upx;
 			.product-main{
 				padding: 0 30upx 20upx 30upx;
 				font-size: 22upx;
-				max-height: 30vh;
-				overflow: auto;
-				> view{
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					border-bottom: 1upx solid #E5E5E5;
-					padding: 15upx 0;
-					> text{
-						text-align: center;
-						width: 33%;
-					}
-					&:last-child{
-						border:0;
+				height: 40vh;
+				width: 520rpx;
+				.product-main-list{
+					> view{
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						border-bottom: 1upx solid #E5E5E5;
+						padding: 15upx 0;
+						> text{
+							text-align: center;
+							width: 33%;
+						}
+						&:last-child{
+							border:0;
+						}
 					}
 				}
 				.p-h1{

+ 18 - 16
pages/stockCheck/freezeQtyModal.vue

@@ -7,14 +7,18 @@
 					此货架存在以下未取货的订单,导致库存被冻结,为方便盘点,请先联系修理厂处理
 				</view>
 			</view>
-			<view class="product-main">
-				 <view v-for="item in list" :key="item.id">
-					 <view class="flex align_center">
-						 <view class="l-no"><text>{{item.shelfPlaceCode}}</text>{{item.productCode}}</view>
-						 <view class="r-nums">冻结库存:<text>{{item.totalQty}}</text> 个</view>
-					 </view>
-					 <view class="p-name">{{item.productName}}</view>
-				 </view>
+			<view>
+				<scroll-view class="product-main" scroll-y>
+					<view>
+						<view class="p-item" v-for="item in list" :key="item.id">
+							 <view class="flex align_center">
+								 <view class="l-no"><text>{{item.shelfPlaceCode}}</text>{{item.productCode}}</view>
+								 <view class="r-nums">冻结库存:<text>{{item.totalQty}}</text> 个</view>
+							 </view>
+							 <view class="p-name">{{item.productName}}</view>
+						</view>
+					</view>
+				</scroll-view>
 			</view>
 			<view class="product-footer">
 				<view class="button-cancel" @click="isShow=false">返回列表</view>
@@ -88,9 +92,6 @@
 			color: #666;
 			.shelfName{
 				width: 100%;
-				height: 48rpx;
-				text-overflow: ellipsis;
-				overflow: hidden;
 				flex-grow: 1;
 				font-weight: bold;
 				font-size: 26rpx;
@@ -106,16 +107,17 @@
 			}
 		}
 		.product-con{
-			width: 78%;
-			margin: 55% auto 0;
+			width: 600rpx;
+			margin: 16vh auto 0;
 			background-color: #fff;
 			border-radius: 24upx;
+			position: relative;
 			.product-main{
 				padding: 0 30upx 20upx 30upx;
 				font-size: 24upx;
-				max-height: 30vh;
-				overflow: auto;
-				> view{
+				height: 40vh;
+				width: 540rpx;
+				.p-item{
 					border-bottom: 2rpx solid #eee;
 					padding: 15upx 0;
 					&:last-child{