修改采购上架分页加载

fe/PDA/mycomponents/comItem/comItemBottom.vue

@@ -2,17 +2,23 @@
 	<view class="uni-flex uni-row bot_card">
 		<!-- 库位 -->
 		<view class="bot_card_item">
+			<!-- <text class="icon_bg icon_bg_kw" style="color: white;font-size: 28rpx ;padding: 8rpx; ">库</text> -->
 			<label class="icon_bg icon_bg_kw" > 
-				<image class="icon_normal" src="@/static/icons_ui/icon_kw.svg">
+				<!-- 库位 -->
+					<text style="display: block; color: white; text-align: center;font-size: 28rpx; ">库</text> 
+				
+				<!-- <image class="icon_normal" src="@/static/icons_ui/icon_kw.svg">
 				</image>
+				 -->
 			</label>
 			<text>{{ dataContent.locationCode }}</text>
 		</view>
 		<!-- 批次 -->
 		<view class="bot_card_item">
 			<label class="icon_bg icon_bg_pc">
-				<image class="icon_normal" src="@/static/icons_ui/icon_pc.svg">
+				<text style=" display: block; color: white;text-align: center;font-size: 28rpx;">批</text>
-				</image>
+				<!-- <image class="icon_normal" src="@/static/icons_ui/icon_pc.svg">
+				</image> -->
 			</label>
 			<text >{{dataContent.lot}}</text>
 		</view>

fe/PDA/pages/putaway/purchasePutaway.vue

@@ -2,6 +2,8 @@
 	<page-meta root-font-size="18px"></page-meta>
 	<view class="">
 		<win-blank-view @goScan='openScanPopup' v-if="itemList.length==0"></win-blank-view>
+		<z-paging  v-if="itemList.length>0" ref="paging" use-virtual-list  @query="queryList" >
+			<template #top>
 				<view class="top_wrap" v-if="itemList.length>0">
 					<view class="top_card">
 						<view class="uni-flex space-between top_lines_info">
@@ -26,30 +28,37 @@
 
 					</view>
 				</view>
+			</template>
 
-
+			<template v-slot:cell="{item,index}">
-		<scroll-view scroll-y="true" class="scroll-Y" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll"
+				<view class="" style=" margin-bottom: 150rpx;">
-			style="padding-bottom:150px">
 					<uni-collapse v-if="itemList.length>0">
 						<view class="pop_list list_info semi_col" v-for="(item, index) in itemList" :key="item.id">
-					<com-collapse-item :open="true" :title="item.itemCode" :item="item" :scanCount="item.scanQty"
+							<com-collapse-item :open="true" :title="item.itemCode" :item="item"
-						style="font-size: 20px; ">
+								:scanCount="item.scanQty" style="font-size: 20px; ">
-						<view v-for="(label, index) in item.labelList" :key="item.id">
+								<view v-for="(label, index) in item.labelList" :key="item.id" style="margin-top: 2rpx;">
 									<uni-swipe-action>
 										<uni-swipe-action-item :right-options="options" :auto-close="false"
 											@click="swipeClick($event,item,index)" style='background-color: #ffffff;'>
-									<com-base-item :dataContent="label" style='margin-left: 10px;'></com-base-item>
+											<com-base-item :dataContent="label" style='margin-left: 10px;'>
-									<view class="choose_marked">
+											</com-base-item>
-										<image src="@/static/image_marked.svg"></image>
+											<view class="choose_marked_count"
+												style="background-color: #5FCB94; opacity: 0.15">
+												<view class=""
+													style="background-color: #5FCB94; width: 200rpx;height: 300rpx;">
+
+												</view>
 											</view>
 										</uni-swipe-action-item>
 									</uni-swipe-action>
+
 								</view>
 							</com-collapse-item>
 						</view>
 					</uni-collapse>
-		</scroll-view>
+				</view>
-
+			</template>
+		</z-paging>
 		<div class="new_bot_box" v-show="itemList.length>0" >
 			<win-collapse-location ref='comCollapseLocation' @getLocationCode='getToLocation' @clear='clear'>
 			</win-collapse-location>
@@ -227,7 +236,7 @@
 				let params = {
 					pageSize: 100,
 					pageIndex: 1,
-					locationTypes: [1], //待检库
+					locationTypes: [2], //待检库
 					inventoryStatuses: [2], //合格
 					packingCode: packingCode
 				};
@@ -287,7 +296,7 @@
 						uni.hideLoading()
 						that.poNumber = "";
 						that.showPopList = [];
-						that.showMessage(err.message);
+						that.showMessage(error.message);
 					})
 
 				} else {
@@ -418,6 +427,9 @@
 			addLabel(item, label) {
 				item.labelList.unshift(label);
 				item.scanQty += label.qty;
+				if (this.$refs.paging != undefined) {
+					this.$refs.paging.setLocalPaging(this.itemList)
+				}
 			},
 
 			async selectedBalanceItem(balanceItem) {
@@ -593,6 +605,17 @@
 			scanPopupLoseFocus(message) {
 				this.$refs.scanPopup.losefocus();
 			},
+			queryList(pageNo, pageSize) {
+				console.log("加载", pageNo)
+				// var list = []
+				// this.currentPage = pageNo
+				// list = this.getDataPage(pageNo, pageSize)
+				// this.$refs.paging.complete(list)
+				if (this.itemList.length > 0) {
+					this.$refs.paging.setLocalPaging(this.itemList)
+				}
+
+			}
 		}
 	};
 </script>

fe/PDA/pages/task/count_detail.vue

@@ -156,7 +156,7 @@
 			</view>
 		</scroll-view> -->
 		<view class="" v-if="allDetails.length>0">
-			<z-paging ref="paging" use-virtual-list cell-height-mode="dynamic" @query="queryList">
+			<z-paging ref="paging" use-virtual-list  @query="queryList">
 				<template #top>
 					<com-count-scan-detail :jobContent="datacontent" :allCount="allCount" :scanCount="scanCount"
 						:newCount="newCount" :location="location">