|
@@ -82,19 +82,19 @@
|
|
|
status: 'loading',
|
|
|
noDataText: '暂无数据',
|
|
|
tabList: [
|
|
|
- // {
|
|
|
- // dispName: '待取货',
|
|
|
- // typeId: 1,
|
|
|
- // count: 0
|
|
|
- // },
|
|
|
+ {
|
|
|
+ dispName: '待取货',
|
|
|
+ typeId: 1,
|
|
|
+ count: 0
|
|
|
+ },
|
|
|
{
|
|
|
dispName: '已取货',
|
|
|
- typeId: 1,
|
|
|
+ typeId: 2,
|
|
|
count: 0
|
|
|
},
|
|
|
{
|
|
|
dispName: '已取消',
|
|
|
- typeId: 2,
|
|
|
+ typeId: 3,
|
|
|
count: 0
|
|
|
},
|
|
|
],
|
|
@@ -184,7 +184,7 @@
|
|
|
this.pageNo = pageNo
|
|
|
}
|
|
|
// 状态条件
|
|
|
- const state = ['FINISH','CLOSE']
|
|
|
+ const state = ['WAIT','FINISH','CLOSE']
|
|
|
let params = {
|
|
|
pageNo: this.pageNo,
|
|
|
pageSize: this.pageSize,
|
|
@@ -199,9 +199,9 @@
|
|
|
_this.list = res.data.list || []
|
|
|
}
|
|
|
_this.total = res.data.count || 0
|
|
|
- // if(this.current == 0){
|
|
|
- // _this.tabList[0].count = _this.total
|
|
|
- // }
|
|
|
+ if(this.current == 0){
|
|
|
+ _this.tabList[0].count = _this.total
|
|
|
+ }
|
|
|
} else {
|
|
|
_this.list = []
|
|
|
_this.total = 0
|
|
@@ -224,9 +224,9 @@
|
|
|
console.log(res)
|
|
|
if(res.status == 200){
|
|
|
this.list.splice(index,1)
|
|
|
- // if(this.current == 0){
|
|
|
- // this.tabList[0].count = this.tabList[0].count - 1
|
|
|
- // }
|
|
|
+ if(this.current == 0){
|
|
|
+ this.tabList[0].count = this.tabList[0].count - 1
|
|
|
+ }
|
|
|
}else{
|
|
|
uni.showModal({
|
|
|
title: '提示',
|
|
@@ -269,9 +269,9 @@
|
|
|
takeGoods({sn:item.shelfOrderSn}).then(res => {
|
|
|
if(res.status == 200){
|
|
|
_this.list.splice(index,1)
|
|
|
- // if(_this.current == 0){
|
|
|
- // _this.tabList[0].count = _this.tabList[0].count - 1
|
|
|
- // }
|
|
|
+ if(_this.current == 0){
|
|
|
+ _this.tabList[0].count = _this.tabList[0].count - 1
|
|
|
+ }
|
|
|
}
|
|
|
uni.showToast({
|
|
|
title: res.message,
|