From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/PDA/pages/stash/CheckoutorderDetail.vue | 81 ++++++++++++++++++++++++++++------------
1 files changed, 56 insertions(+), 25 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue"
index b1db7ea..7ee0aed 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue"
@@ -40,19 +40,30 @@
orderNo: "",
pageNo: 1,
scrollTop: 0,
+ checkTask: false,
warehouseId: ""
}
},
onLoad(res) {
this.warehouseId = res.warehouseId;
this.orderNo = res.orderNo;
- this.allReceivingOrders=res.detail;
- this.page = this.page + "orderNo=" + this.orderNo +"&warehouseId=" + this.warehouseId + "&locationCode=";
- this.getData();
+ this.allReceivingOrders = res.detail;
+ this.page = this.page + "orderNo=" + this.orderNo + "&warehouseId=" + this.warehouseId + "&locationCode=";
+ // this.getData();
},
onReachBottom() {
this.pageNo += 1;
this.getData();
+ },
+ onShow() {
+ // this.checkTask = uni.getStorageSync('checkTask');
+ // if (this.checkTask) {
+ // uni.removeStorageSync('checkTask');
+ this.pageNo = 1;
+ this.allReceivingOrders = [];
+ // 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
+ this.getData();
+ // }
},
onPageScroll(e) {
this.scrollTop = e.scrollTop;
@@ -72,37 +83,57 @@
locationCode: this.searchValue,
orderNo: this.orderNo,
pageNo: this.pageNo,
- isCheck:true,
+ isCheck: true,
},
}
if (this.pageNo == 1) this.allReceivingOrders = [];
- this.$u.post('/api/DeliveryOrder/GetCheckOutTasks',postData).then((
+ this.$u.post('/api/DeliveryOrder/GetCheckOutTasks', 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;
- }
+ 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.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
+ this.loadVisible = false;
}
} else {
- this.status = 'noMore';
- //this.allReceivingOrders = [];
- this.loadVisible = true;
+ 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;
+ if (this.allReceivingOrders.length < 1) {
+ // uni.showModal({
+ // title: '鎻愮ず',
+ // content: '鐩樼偣宸插畬鎴愶紝鏄惁杩斿洖棣栭〉锛�',
+ // success: (res) => {
+ // uni.getStorageSync('ischeck',true)
+ // if (res.confirm) {
+ // // 鐢ㄦ埛鐐瑰嚮纭畾
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 300);
+ // } else {
+ // // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
+ // // 鎴栬�呮墽琛屽叾浠栨搷浣�
+ // }
+ // }
+ // });
}
}
- })
+ }
+ })
}
}
}
--
Gitblit v1.9.3