ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -1,21 +1,27 @@
			<template>
			<view>
			<!-- <u-sticky>
			<u-sticky>
			<view style="background-color: #ffffff;">
			<uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
			</view>
			</u-sticky> -->
			</u-sticky>
			<uni-list :border="true">
			<uni-list-item direction="column" clickable @click="groupClick(item.batch_num)" link
			:to="page+item.batch_num+'&order_qty='+item.order_qty+'&order_Inqty='+item.order_Outqty+'&goods_no='+item.goods_no"
			v-for="item in allReceivingOrders" :key="item.batch_num">
			<uni-list-item direction="column" clickable @click="groupClick(item.locationCode)" link
			:to="page+item.locationCode+'&stockQuantity='+item.stockQuantity+'&taskId='+item.taskId+'&materielCode='+item.materielCode+'&batchNo='+item.batchNo+'&materielName='+item.materielName"
			v-for="item in allReceivingOrders" :key="item.locationCode">
			<template v-slot:body>
			<uni-group margin-top="20">
			<view> ç©æåç§°:{{item.materielName}} </view>
			<view> åå/éç¨å:{{item.item \|\| ''}} </view>
			<view> ç©æç¼å·:{{item.materielCode}} </view>
			<view> ç©æè§æ ¼:{{item.materielSpec}} </view>
			<view> çäº§åå®¶:{{item.factory \|\| ''}} </view>
			<view> åºæ¬åä½:{{item.materielUnit}} </view>
			<view> ææ:{{item.modifier \|\| ''}} </view>
			<view> æ¹å·:{{item.batchNo}} </view>
			<view> åæ®ç¼å·:{{orderNo}} </view>
			<view> æ¹å·:{{item.batch_num}} </view>
			<view> ç©æç¼å·:{{item.goods_no}} </view>
			<view> åæ®æ°é:{{item.order_qty}} </view>
			<view> åºåºæ°é:{{item.order_Outqty}} </view>
			<view> è´§ä½ç¼å·:{{item.locationCode}} </view>
			<view> æ°é:{{item.stockQuantity}} </view>
			</uni-group>
			</template>
			</uni-list-item>
			@@ -31,7 +37,7 @@
			export default {
			data() {
			return {
			page: "/pages/stash/Outorderboxing?",
			page: "/pages/stash/outFinish?",
			loadVisible: false,
			searchValue: "",
			status: "more",
			@@ -39,24 +45,77 @@
			orderNo: "",
			pageNo: 1,
			scrollTop: 0,
			warehouseId: ""
			outTask: false,
			warehouseId: "",
			hasDataLoaded: false, // æ°æ®æ¯å¦å·²å è½½è¿
			shouldRefreshFromC: false, // å³é®ï¼ä»Cé¡µé¢è¿åæ¶éè¦å·æ°çæ å¿
			}
			},
			onLoad(res) {
			this.warehouseId = res.warehouseId;
			this.orderNo = res.orderNo;
			this.allReceivingOrders=res.detail;
			this.page = this.page + "orderNo=" + this.orderNo +"&warehouseId=" + this.warehouseId + "&batchNo=";
			this.getData();
			// çå¬æ¥èªCé¡µé¢çå·æ°äºä»¶
			const eventChannel = this.getOpenerEventChannel();
			if (eventChannel) {
			eventChannel.on('refreshData', (data) => {
			if (data.refresh) {
			this.pageNo = 1;
			this.allReceivingOrders = [];
			this.getData();
			}
			});
			}

			// ä¿åä¼ å¥çåå§æ°æ®
			if (res.detail && res.detail.length > 0) {
			this.allReceivingOrders = res.detail;
			}
			this.warehouseId = res.warehouseId;
			this.orderNo = res.orderNo;
			this.page = this.page + "orderNo=" + this.orderNo + "&warehouseId=" + this.warehouseId + "&locationCode=";
			},
			onReachBottom() {
			// åªæå¨è¿ææ´å¤æ°æ®æ¶æå è½½ä¸ä¸é¡µ
			if (this.status === 'more') {
			this.pageNo += 1;
			this.getData();
			}
			},
			// æ·»å è¿ä¸ªçå½å¨æ
			onHide() {
			// é¡µé¢éèæ¶ä¸åä»»ä½æä½
			},



			onShow() {
			// æ£æ¥æ¯å¦éè¦å·æ°
			const needRefresh = uni.getStorageSync('needRefreshOutbound');
			if (needRefresh) {
			uni.removeStorageSync('needRefreshOutbound');
			this.pageNo = 1;
			this.allReceivingOrders = [];
			this.getData();
			return;
			}

			// å¦æè¿æ²¡æå è½½è¿æ°æ®ï¼å è½½æ°æ®
			if (!this.hasDataLoaded) {
			this.pageNo = 1;
			this.allReceivingOrders = [];
			this.getData();
			this.hasDataLoaded = true;
			}
			},
			onPageScroll(e) {
			this.scrollTop = e.scrollTop;
			},
			methods: {
			// æ·»å å·æ°æ¹æ³ä¾å¶ä»é¡µé¢è°ç¨
			// refreshData() {
			// console.log('æ¶å°å·æ°è¯·æ±');
			// this.pageNo = 1;
			// this.allReceivingOrders = [];
			// this.getData();
			// },
			search(res) {
			this.pageNo = 1;
			this.getData();
			@@ -64,46 +123,106 @@
			groupClick() {

			},
			getData() {
			// var postData = {
			// MainData: {
			// warehouseId: this.warehouseId,
			// orderNo: this.searchValue,
			// pageNo: this.pageNo
			// },
			// }
			if (this.pageNo == 1) this.allReceivingOrders = [];
			this.$u.post('/api/DeliveryOrder/GetDeliveryOrderDetail?pageNo=' + this.warehouseId + '&orderNo=' + this.orderNo+'&isPick=false').then((
			res) => {
			if (res.status) {
			if (res.data.length > 0) {
			if (this.searchValue == '') {
			this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
			// this.allReceivingOrders = res.data;
			if (this.allReceivingOrders.length > 3) {
			this.loadVisible = true;
			} else {
			this.loadVisible = false;
			}
			} else {
			this.allReceivingOrders = res.data;
			if (this.allReceivingOrders.length > 3) {
			this.loadVisible = true;
			} else {
			this.loadVisible = false;
			}
			}
			} else {
			this.status = 'noMore';
			//this.allReceivingOrders = [];
			this.loadVisible = true;
			}
			}
			})

			// getData() {
			// var postData = {
			// MainData: {
			// warehouseId: this.warehouseId,
			// locationCode: this.searchValue,
			// orderNo: this.orderNo,
			// pageNo: this.pageNo,
			// isCheck:false,
			// },
			// }
			// if (this.pageNo == 1) this.allReceivingOrders = [];
			// this.$u.post('/api/DeliveryOrder/CheckOutTasks',postData).then((
			// res) => {
			// if (res.status) {
			// if (res.data.length > 0) {
			// if (this.searchValue == '') {
			// this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
			// // this.allReceivingOrders = res.data;
			// if (this.allReceivingOrders.length > 3) {
			// this.loadVisible = true;
			// } else {
			// this.loadVisible = false;
			// }
			// } else {
			// this.allReceivingOrders = res.data;
			// if (this.allReceivingOrders.length > 3) {
			// this.loadVisible = true;
			// } else {
			// this.loadVisible = false;
			// }
			// }
			// } else {
			// this.status = 'noMore';
			// //this.allReceivingOrders = [];
			// this.loadVisible = true;
			// }
			// }
			// })
			// }
			getData() {
			var postData = {
			MainData: {
			warehouseId: this.warehouseId,
			locationCode: this.searchValue,
			orderNo: this.orderNo,
			pageNo: this.pageNo,
			isCheck: false,
			},
			}

			// å¦ææ¯ç¬¬ä¸é¡µææç´¢ï¼æ¸ç©ºæ°æ®
			if (this.pageNo === 1 \|\| this.searchValue !== '') {
			this.allReceivingOrders = [];
			this.status = "more";
			}

			this.$u.post('/api/DeliveryOrder/CheckOutTasks', postData).then((res) => {
			if (res.status) {
			if (res.data && res.data.length > 0) {
			// è¿½å æ°æ®
			this.allReceivingOrders = [...this.allReceivingOrders, ...res.data];

			// åé¡µé»è¾
			if (res.data.length < 5) {
			this.status = 'noMore';
			} else {
			this.status = 'more';
			}

			this.loadVisible = this.allReceivingOrders.length > 0;

			} else {
			this.status = 'noMore';
			this.loadVisible = this.allReceivingOrders.length > 0;

			if (this.pageNo === 1) {
			this.allReceivingOrders = [];
			}

			// ç´æ¥è¿åAé¡µé¢ï¼ä¸éè¦æç¤º
			if (this.allReceivingOrders.length === 0 && this.pageNo === 1) {
			setTimeout(() => {
			uni.navigateBack({
			delta: 1 // è¿åAé¡µé¢
			});
			}, 300); // ç¨å¾®å»¶è¿ä¸ä¸ï¼è®©ç¨æ·çå°"æ²¡ææ°æ®"çç¶æ
			}
			}
			}
			}).catch(err => {
			console.error('è¯·æ±å¤±è´¥:', err);
			this.status = 'noMore';
			})
			}
			}
			}
			</script>
			</script>



			<style lang="scss">
			@import '@/common/uni-ui.scss';