From 9a886d711d8b21adc335fdf8c39350584c7ba6fd Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 14 十月 2025 02:12:14 +0800
Subject: [PATCH] 更新代码，取消MES出库单号同步标识，平库转立库功能，寄售周期判断取消，精品标识等

---
 代码管理/淮安PDA/pages/stash/TakeStockOrder.vue |   64 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 16 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/TakeStockOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/TakeStockOrder.vue"
index 796ff27..93f88ed 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/TakeStockOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/TakeStockOrder.vue"
@@ -6,13 +6,23 @@
 			</view>
 		</u-sticky>
 		<uni-list :border="true">
-			<uni-list-item direction="column" clickable @click="groupClick(item.OrderNo)" link
-				:to="page+item.OrderNo" v-for="item in allReceivingOrders" :key="item.OrderNo">
+			<uni-list-item direction="column" clickable @click="groupClick(item.orderNo)" link
+				:to="page+item.orderNo+'&warehouseId='+warehouseId+'&id='+item.id" v-for="item in allReceivingOrders"
+				:key="item.orderNo">
 				<template v-slot:body>
 					<uni-group margin-top="20">
-						<view> 鍗曞彿:{{item.OrderNo}} </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.orderNo}} 
+						</view>
+						<view style="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.takeStockStatus}}
+							</view>
+						</view>
 					</uni-group>
 				</template>
 			</uni-list-item>
@@ -25,33 +35,42 @@
 </template>
 
 <script>
+	import { TakeStockStatus } from '../../common/config.js'
 	export default {
 		data() {
 			return {
-				page: "/pages/stash/raworderboxing?",
+				page: "/pages/stash/TakeStock?orderNo=",
 				loadVisible: false,
 				searchValue: "",
+				warehouseId: "",
 				status: "more",
 				allReceivingOrders: [],
 				pageNo: 1,
 				scrollTop: 0,
-				warehouseId: ""
+				isLoaded:false
 			}
 		},
 		onLoad(res) {
 			this.warehouseId = res.warehouseId;
-			this.page = this.page + "warehouseId=" + this.warehouseId + "&orderNo=";
-			this.getData();
-		},
-		onReachBottom() {
-			this.pageNo += 1;
+			this.isLoaded = true;
 			this.getData();
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
+		onShow() {
+			if (this.isLoaded) {
+				// 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
+				this.getData();
+			}
+		},
+		onReachBottom() {
+			this.pageNo += 1;
+			this.getData();
+		},
 		methods: {
 			search(res) {
+				this.pageNo = 1;
 				this.getData();
 			},
 			groupClick() {
@@ -60,16 +79,20 @@
 			getData() {
 				var postData = {
 					MainData: {
-						warehouseId: this.warehouseId,
 						orderNo: this.searchValue,
-						pageNo: this.pageNo
+						pageNo: this.pageNo,
+						warehouseId: this.warehouseId,
 					},
 				}
 				this.$u.post('/api/TakeStockOrder/GetTakeStockOrders', 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.map(i => ({
+								...i,
+								takeStockStatus: TakeStockStatus.find(item => item.value == i
+									.takeStockStatus).label
+								}))
 								// this.allReceivingOrders = res.data;
 								if (this.allReceivingOrders.length > 3) {
 									this.loadVisible = true;
@@ -77,7 +100,15 @@
 									this.loadVisible = false;
 								}
 							} else {
-								this.allReceivingOrders = res.data;
+								// this.allReceivingOrders = res.data;
+								if (postData.MainData.pageNo == 1) {
+									this.allReceivingOrders = [];
+								}
+								this.allReceivingOrders =res.data.map(i => ({
+								...i,
+								takeStockStatus: TakeStockStatus.find(item => item.value == i
+									.takeStockStatus).label
+								}))
 								if (this.allReceivingOrders.length > 3) {
 									this.loadVisible = true;
 								} else {
@@ -89,6 +120,7 @@
 							//this.allReceivingOrders = [];
 							this.loadVisible = true;
 						}
+
 					}
 				})
 			}

--
Gitblit v1.9.3