From dca5f418dcd4727236ce54524bdbe0937bd1bfcf Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 6 Nov 2023 14:18:23 +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=E5=88=86=E9=A1=B5=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/common/new_style.css                   |   2 +-
 fe/PDA/mycomponents/comItem/comItemBottom.vue |  14 ++-
 fe/PDA/pages/putaway/purchasePutaway.vue      | 119 +++++++++++-------
 fe/PDA/pages/task/count_detail.vue            |   2 +-
 4 files changed, 83 insertions(+), 54 deletions(-)

diff --git a/fe/PDA/common/new_style.css b/fe/PDA/common/new_style.css
index f6e9ec526..d02a5c519 100644
--- a/fe/PDA/common/new_style.css
+++ b/fe/PDA/common/new_style.css
@@ -279,7 +279,7 @@ uni-page-head .uni-page-head__title {
 
 .bot_card_item {
 	width: 50%;
-	text-align: left;
+	text-align:left;
 	height: 60rpx;
 	overflow: hidden;
 	white-space: nowrap;
diff --git a/fe/PDA/mycomponents/comItem/comItemBottom.vue b/fe/PDA/mycomponents/comItem/comItemBottom.vue
index 12bb271dd..e182b461c 100644
--- a/fe/PDA/mycomponents/comItem/comItemBottom.vue
+++ b/fe/PDA/mycomponents/comItem/comItemBottom.vue
@@ -2,17 +2,23 @@
 	<view class="uni-flex uni-row bot_card">
 		<!-- 库位 -->
 		<view class="bot_card_item">
-			<label class="icon_bg icon_bg_kw">
-				<image class="icon_normal" src="@/static/icons_ui/icon_kw.svg">
+			<!-- <text class="icon_bg icon_bg_kw" style="color: white;font-size: 28rpx ;padding: 8rpx; ">库</text> -->
+			<label class="icon_bg icon_bg_kw" > 
+				<!-- 库位 -->
+					<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">
-				</image>
+				<text style=" display: block; color: white;text-align: center;font-size: 28rpx;">批</text>
+				<!-- <image class="icon_normal" src="@/static/icons_ui/icon_pc.svg">
+				</image> -->
 			</label>
 			<text >{{dataContent.lot}}</text>
 		</view>
diff --git a/fe/PDA/pages/putaway/purchasePutaway.vue b/fe/PDA/pages/putaway/purchasePutaway.vue
index 079c3e0b2..d7dddb4c5 100644
--- a/fe/PDA/pages/putaway/purchasePutaway.vue
+++ b/fe/PDA/pages/putaway/purchasePutaway.vue
@@ -2,55 +2,64 @@
 	<page-meta root-font-size="18px"></page-meta>
 	<view class="">
 		<win-blank-view @goScan='openScanPopup' v-if="itemList.length==0"></win-blank-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>
+		<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>
-				</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 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>
-
-
-		<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>
-								</uni-swipe-action-item>
-							</uni-swipe-action>
+					</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>
-					</com-collapse-item>
+					</uni-collapse>
 				</view>
-			</uni-collapse>
-		</scroll-view>
-
-		<div class="new_bot_box" v-show="itemList.length>0">
+			</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>
 			<view class="new_btn_bot bot_pos uni-flex">
@@ -227,7 +236,7 @@
 				let params = {
 					pageSize: 100,
 					pageIndex: 1,
-					locationTypes: [1], //待检库
+					locationTypes: [2], //待检库
 					inventoryStatuses: [2], //合格
 					packingCode: packingCode
 				};
@@ -276,7 +285,7 @@
 						title: "获取采购订单箱码...",
 						mask: true
 					});
-					 getPurchasePutawayAsyncDetail(poNumber).then(res => {
+					getPurchasePutawayAsyncDetail(poNumber).then(res => {
 						uni.hideLoading()
 						if (res.length > 0) {
 							that.poNumber = poNumber
@@ -287,7 +296,7 @@
 						uni.hideLoading()
 						that.poNumber = "";
 						that.showPopList = [];
-						that.showMessage(err.message);
+						that.showMessage(error.message);
 					})
 
 				} else {
@@ -297,7 +306,7 @@
 					if (item == undefined) {
 						//提示不在采购订单中
 						that.showMessage("扫描的箱码[" + packingCode + "]不在当前采购订单[" + this.poNumber + "]中");
-					return 
+						return
 					} else {
 						that.createItem(balanceItem, purchaseDetail);
 					}
@@ -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>
diff --git a/fe/PDA/pages/task/count_detail.vue b/fe/PDA/pages/task/count_detail.vue
index c0365c5f9..1f72c758a 100644
--- a/fe/PDA/pages/task/count_detail.vue
+++ b/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">