From a770206c91e495b802b3e9371e06834586ad7715 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 30 十月 2025 20:17:30 +0800
Subject: [PATCH] 1
---
新建文件夹/PDA/pages/stash/outboundorderDetail.vue | 155 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 114 insertions(+), 41 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
index afe6d22..d2ca568 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
@@ -1,21 +1,22 @@
<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> 鍗曟嵁缂栧彿:{{orderNo}} </view>
- <view> 鎵瑰彿:{{item.batch_num}} </view>
- <view> 鐗╂枡缂栧彿:{{item.goods_no}} </view>
- <view> 鍗曟嵁鏁伴噺:{{item.order_qty}} </view>
- <view> 鍑哄簱鏁伴噺:{{item.order_Outqty}} </view>
+ <view> 鎵瑰彿:{{item.batchNo}} </view>
+ <view> 鐗╂枡缂栧彿:{{item.materielCode}} </view>
+ <!-- <view> 鐗╂枡鍚嶇О:{{item.materielName}} </view> -->
+ <view> 璐т綅缂栧彿:{{item.locationCode}} </view>
+ <view> 鏁伴噺:{{item.stockQuantity}} </view>
</uni-group>
</template>
</uni-list-item>
@@ -31,7 +32,7 @@
export default {
data() {
return {
- page: "/pages/stash/Outorderboxing?",
+ page: "/pages/stash/outFinish?",
loadVisible: false,
searchValue: "",
status: "more",
@@ -39,19 +40,30 @@
orderNo: "",
pageNo: 1,
scrollTop: 0,
+ outTask: 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 + "&batchNo=";
+ 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.outTask = uni.getStorageSync('outTask');
+ if (this.outTask) {
+ uni.removeStorageSync('outTask');
+ this.pageNo = 1;
+ this.allReceivingOrders = [];
+ // 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
+ this.getData();
+ }
},
onPageScroll(e) {
this.scrollTop = e.scrollTop;
@@ -64,42 +76,103 @@
groupClick() {
},
+ // 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/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;
+ // }
+ // } 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,
- // 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((
+ 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/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) => {
+ // if (res.confirm) {
+ uni.getStorageSync('isout',true)
+ // // 鐢ㄦ埛鐐瑰嚮纭畾
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 500);
+ // } else {
+ // // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
+ // // 鎴栬�呮墽琛屽叾浠栨搷浣�
+ // }
+ // }
+ // });
+ // }
}
- })
+ }
+ })
}
}
}
--
Gitblit v1.9.3