From 2b49f7643d15b74889d190f216630559006ed93a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 01 十二月 2025 09:48:43 +0800
Subject: [PATCH] pad和后端的优化
---
新建文件夹/PDA/pages/stash/inboundorder.vue | 109 +++++++++++++++++++++++++++++-------------------------
1 files changed, 58 insertions(+), 51 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
index e9ea9ba..3734c0d 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
@@ -71,9 +71,11 @@
this.getData();
},
onReachBottom() {
- this.pageNo += 1;
+ if (this.status === 'more') {
+ this.pageNo += 1;
this.getData();
this.isLoaded = true;
+ }
},
onShow() {
this.isLoaded = uni.getStorageSync('isLoaded');
@@ -90,61 +92,66 @@
},
methods: {
search(res) {
+ this.pageNo = 1;
this.getData();
},
groupClick() {
},
- getData() {
- var postData = {
- MainData: {
- warehouseId: this.warehouseId,
- orderNo: this.searchValue,
- pageNo: this.pageNo
- },
- }
- // if (this.pageNo == 1) this.allReceivingOrders = [];
- this.$u.post('/api/CabinOrder/GetCabinOrders', postData).then((res) => {
- if (res.status) {
- if (res.data.length > 0) {
- if (this.searchValue == '') {
- this.allReceivingOrders = res.data.map(i => ({
- ...i,
- InboundOrderStatus: i.odrderStatus.label,
- SumQty: i.details.map(item => item.order_qty).reduce((prev,
- next) => prev + next, 0),
- OverQty: i.details.map(item => item.order_Inqty).reduce((prev,
- next) => prev + next, 0)
- }));
- // this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- } else {
- this.allReceivingOrders = res.data.map(i => ({
- ...i,
- InboundOrderStatus: i.odrderStatus.label,
- SumQty: i.details.map(item => item.order_qty).reduce((prev,
- next) => prev + next, 0),
- OverQty: i.details.map(item => item.order_Inqty).reduce((prev,
- next) => prev + next, 0)
- }));
- 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,
+ orderNo: this.searchValue,
+ pageNo: this.pageNo
+ },
+ }
+
+ // 濡傛灉鏄涓�椤垫垨鎼滅储锛屾竻绌烘暟鎹�
+ if (this.pageNo === 1 || this.searchValue !== '') {
+ this.allReceivingOrders = [];
+ this.status = "more";
+ }
+
+ this.$u.post('/api/CabinOrder/GetCabinOrders', postData).then((res) => {
+ if (res.status) {
+ if (res.data && res.data.length > 0) {
+ const newData = res.data.map(i => ({
+ ...i,
+ InboundOrderStatus: i.odrderStatus.label,
+ SumQty: i.details.map(item => item.order_qty).reduce((prev, next) => prev + next, 0),
+ OverQty: i.details.map(item => item.order_Inqty).reduce((prev, next) => prev + next, 0)
+ }));
+
+ // 鍏抽敭淇敼锛氳拷鍔犳暟鎹�屼笉鏄浛鎹�
+ this.allReceivingOrders = [...this.allReceivingOrders, ...newData];
+
+ // 濡傛灉杩斿洖鐨勬暟鎹皯浜�5鏉★紝璇存槑娌℃湁鏇村鏁版嵁浜�
+ 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 = [];
+ }
+ }
+ }
+ }).catch(err => {
+ console.error('璇锋眰澶辫触:', err);
+ this.status = 'noMore';
+ })
+}
}
}
</script>
--
Gitblit v1.9.3