From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/淮安PDA/pages/stash/inboundorder.vue |   53 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 7 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/inboundorder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/inboundorder.vue"
index 868fe1b..372bb78 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/inboundorder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/inboundorder.vue"
@@ -10,9 +10,27 @@
 				:to="page+item.inboundOrderNo" v-for="item in allReceivingOrders" :key="item.inboundOrderNo">
 				<template v-slot:body>
 					<uni-group margin-top="20">
-						<view> 鍗曞彿:{{item.inboundOrderNo}} </view>
-						<view> 鍒涘缓浜�:{{item.creater}} </view>
-						<view> 鏃ユ湡:{{item.createDate}} </view>
+						<view style="line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
+							鍏ュ簱鍗曞彿&nbsp;&nbsp;{{item.inboundOrderNo}} 
+						</view>
+						<view style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
+							鍒涘缓浜哄憳&nbsp;&nbsp;{{item.creater}} 
+						</view>
+						<view style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
+							鍒涘缓鏃ユ湡&nbsp;&nbsp;{{item.createDate}} 
+						</view>
+						<view
+							style="margin-top: 10rpx;display: flex;align-items: center; ">
+							<view style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 238rpx;height: 40rpx;font-size: 22rpx;background-color:rgba(22,127,247,0.18);color: #1F63FF;">
+								璁㈠崟鐘舵��&nbsp;&nbsp;{{item.InboundOrderStatus}}
+							</view>
+							<view style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
+								鎬婚噺&nbsp;&nbsp;{{item.SumQty}}
+							</view>
+							<view style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
+								宸插叆&nbsp;&nbsp;{{item.OverQty}}
+							</view>
+						</view>
 					</uni-group>
 				</template>
 			</uni-list-item>
@@ -25,17 +43,19 @@
 </template>
 
 <script>
+	import { InboundOrderStatus } from '../../common/config.js'
 	export default {
 		data() {
 			return {
-				page: "/pages/raworderboxing/raworderboxing?",
+				page: "/pages/stash/raworderboxing?",
 				loadVisible: false,
 				searchValue: "",
 				status: "more",
 				allReceivingOrders: [],
 				pageNo: 1,
 				scrollTop: 0,
-				warehouseId: ""
+				warehouseId: "",
+				isLoaded:false
 			}
 		},
 		onLoad(res) {
@@ -46,6 +66,13 @@
 		onReachBottom() {
 			this.pageNo += 1;
 			this.getData();
+			this.isLoaded=true;
+		},
+		onShow() {
+			if (this.isLoaded) {
+				// 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
+				this.getData();
+			}
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -69,7 +96,13 @@
 					if (res.status) {
 						if (res.data.length > 0) {
 							if (this.searchValue == '') {
-								this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
+								this.allReceivingOrders = res.data.map(i => ({
+									...i,
+									InboundOrderStatus: InboundOrderStatus.find(item => item.value == i
+										.orderStatus).label,
+									SumQty: i.details.map(item => item.orderQuantity).reduce((prev, next) => prev + next, 0),
+									OverQty: i.details.map(item => item.overInQuantity).reduce((prev, next) => prev + next, 0)
+								}));
 								// this.allReceivingOrders = res.data;
 								if (this.allReceivingOrders.length > 3) {
 									this.loadVisible = true;
@@ -77,7 +110,13 @@
 									this.loadVisible = false;
 								}
 							} else {
-								this.allReceivingOrders = res.data;
+								this.allReceivingOrders = res.data.map(i => ({
+									...i,
+									InboundOrderStatus: InboundOrderStatus.find(item => item.value == i
+										.orderStatus).label,
+									SumQty: i.details.map(item => item.orderQuantity).reduce((prev, next) => prev + next, 0),
+									OverQty: i.details.map(item => item.overInQuantity).reduce((prev, next) => prev + next, 0)
+								}));
 								if (this.allReceivingOrders.length > 3) {
 									this.loadVisible = true;
 								} else {

--
Gitblit v1.9.3