From 71438834a8b76b13e2659e8ff6052a3368fd865c Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 14 Nov 2023 16:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/pages/putaway/purchasePutaway.vue | 117 ++++++++++-------------
 1 file changed, 48 insertions(+), 69 deletions(-)

diff --git a/fe/PDA/pages/putaway/purchasePutaway.vue b/fe/PDA/pages/putaway/purchasePutaway.vue
index ea94a44ae..4910abe15 100644
--- a/fe/PDA/pages/putaway/purchasePutaway.vue
+++ b/fe/PDA/pages/putaway/purchasePutaway.vue
@@ -2,64 +2,59 @@
 	<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">
-							<view class="font_sm">
-								指定ERP储位:
-								<text class="text_bold">{{recommendErpLocationCode}}</text>
-							</view>
-						</view>
+		<view class="top_wrap" v-if="itemList.length>0">
+			<view class="top_card">
+				<view class="uni-flex space-between top_lines_info">
+					<view class="font_sm">
+						指定ERP储位:
+						<text class="text_bold">{{recommendErpLocationCode}}</text>
 					</view>
-					<view class="uni-flex space-between u-col-center"
-						style="font-size: 33rpx;align-items: center;margin-top: 5rpx;margin-bottom: 5rpx;">
-						<view class="">
-							<text>采购订单 : {{poNumber}}</text>
-						</view>
-						<view @click="showPopListPopup" class=""
-							style="font-size: 33rpx;background-color: #3399FF; padding:10rpx ;border-radius:10rpx;color: #FFFFFF;">
-							查看箱码
-						</view>
+				</view>
+			</view>
+			<view class="uni-flex space-between u-col-center"
+				style="font-size: 33rpx;align-items: center;margin-top: 5rpx;margin-bottom: 5rpx;">
+				<view class="">
+					<text>采购订单 : {{poNumber}}</text>
+				</view>
+				<view @click="showPopListPopup" class=""
+					style="font-size: 33rpx;background-color: #3399FF; padding:10rpx ;border-radius:10rpx;color: #FFFFFF;">
+					查看箱码
+				</view>
 
-					</view>
-					<view class="" style="background-color: black; width: 100%;  height: 1rpx;">
+			</view>
+			<view class="" style="background-color: black; width: 100%;  height: 1rpx;">
 
-					</view>
-				</view>
-			</template>
-
-			<template v-slot:cell="{item,index}">
-				<view class="" style=" margin-bottom: 150rpx;">
-					<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" style="font-size: 20px; ">
-								<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>
-											<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>
+		</view>
+
+
+		<scroll-view scroll-y="true" class="scroll-Y" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll"
+			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"
+						style="font-size: 20px; ">
+						<view v-for="(label, index) in item.labelList" :key="item.id">
+							<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>
+									<!-- <view class="choose_marked">
+										<image src="@/static/image_marked.svg"></image>
+									</view> -->
+									<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>
-					</uni-collapse>
+					</com-collapse-item>
 				</view>
-			</template>
-		</z-paging>
-		<div class="new_bot_box" v-show="itemList.length>0" >
+			</uni-collapse>
+		</scroll-view>
+
+		<div class="new_bot_box" v-show="itemList.length>0">
 			<win-collapse-location ref='comCollapseLocation' @getLocationCode='getToLocation' @clear='clear'>
 			</win-collapse-location>
 			<view class="new_btn_bot bot_pos uni-flex">
@@ -427,9 +422,6 @@
 			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) {
@@ -522,10 +514,8 @@
 						item.details.push(r);
 					})
 				})
-				
 				item.supplierCode = item.details[0].supplierCode
 				item.asnNumber = item.details[0].asnNumber
-				
 				let params = JSON.stringify(item);
 				purchasePutaway(params)
 					.then(res => {
@@ -611,17 +601,6 @@
 			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>