bug修复
This commit is contained in:
parent
93bc12d32b
commit
4b1b2e32e1
|
|
@ -74,8 +74,10 @@
|
||||||
"vueVersion": "3",
|
"vueVersion": "3",
|
||||||
"h5": {
|
"h5": {
|
||||||
"router": {
|
"router": {
|
||||||
"base": "./",
|
// "base": "./",
|
||||||
"mode": "hash"
|
// "mode": "hash"
|
||||||
|
"base": "/iws/h5portal",
|
||||||
|
"mode": "history"
|
||||||
},
|
},
|
||||||
"title": "安徽机具租赁商城"
|
"title": "安徽机具租赁商城"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -735,7 +735,7 @@ const statusList = [
|
||||||
{ id: '2', name: '待出库' },
|
{ id: '2', name: '待出库' },
|
||||||
{ id: '3', name: '待收货' },
|
{ id: '3', name: '待收货' },
|
||||||
{ id: '4', name: '租赁中' },
|
{ id: '4', name: '租赁中' },
|
||||||
{ id: '5', name: '已退租' },
|
// { id: '5', name: '已退租' },
|
||||||
{ id: '10', name: '已检修待结算' },
|
{ id: '10', name: '已检修待结算' },
|
||||||
{ id: '15', name: '结算待确认' },
|
{ id: '15', name: '结算待确认' },
|
||||||
{ id: '20', name: '已完成' },
|
{ id: '20', name: '已完成' },
|
||||||
|
|
@ -755,7 +755,7 @@ const orderType = (status) => {
|
||||||
const tabList = ref([
|
const tabList = ref([
|
||||||
{ tab_name: '全部', order_status: 0 },
|
{ tab_name: '全部', order_status: 0 },
|
||||||
{ tab_name: '租赁中', order_status: 4 },
|
{ tab_name: '租赁中', order_status: 4 },
|
||||||
{ tab_name: '已退租', order_status: 5 },
|
// { tab_name: '已退租', order_status: 5 },
|
||||||
{ tab_name: '已完成', order_status: 20 },
|
{ tab_name: '已完成', order_status: 20 },
|
||||||
{ tab_name: '已取消', order_status: 99 },
|
{ tab_name: '已取消', order_status: 99 },
|
||||||
// { tab_name: '待出库', order_status: 2 },
|
// { tab_name: '待出库', order_status: 2 },
|
||||||
|
|
@ -922,7 +922,7 @@ const onEditOrderStatus = (item, status) => {
|
||||||
tipText = '确认收货'
|
tipText = '确认收货'
|
||||||
break
|
break
|
||||||
case 4:
|
case 4:
|
||||||
editParams.orderStatus = 5
|
editParams.orderStatus = 20
|
||||||
tipText = '申请全部退租'
|
tipText = '申请全部退租'
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
@ -1021,7 +1021,7 @@ const onReturnGoods = (items, goods) => {
|
||||||
})
|
})
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
const res = await editOrderStatusAPI({
|
const res = await editOrderStatusAPI({
|
||||||
orderStatus: 5,
|
orderStatus: 20,
|
||||||
orderId: items.orderId,
|
orderId: items.orderId,
|
||||||
maIds: [goods.maId],
|
maIds: [goods.maId],
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue