|
|
|
@ -1239,6 +1239,17 @@ export default {
|
|
|
|
|
this.$message.warning("至少选择一条数据!!!"); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
let a = false; |
|
|
|
|
this.selectionList.some( i =>{ |
|
|
|
|
if(!!i.stockupStatus){ |
|
|
|
|
a=true; |
|
|
|
|
return ; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
if(a){ |
|
|
|
|
this.$message.warning("有已备货数据!!!"); |
|
|
|
|
return ; |
|
|
|
|
} |
|
|
|
|
break; |
|
|
|
|
case '2': |
|
|
|
|
this.form.ids = row.id; |
|
|
|
@ -1483,28 +1494,31 @@ export default {
|
|
|
|
|
onLoad (page, params = {}) { |
|
|
|
|
this.loading = true; |
|
|
|
|
this.query.id = this.$route.query.id; |
|
|
|
|
getDetailStockupOwn(this.$route.query.id).then(res => { |
|
|
|
|
console.log("返回的值",res.data.data); |
|
|
|
|
const data = res.data.data; |
|
|
|
|
if(!data)return |
|
|
|
|
this.data[0] = data; |
|
|
|
|
const { serveType, deliveryWay, deliveryType } = this.data[0]; |
|
|
|
|
const serveTypes = !!serveType ? serveType.split(',') : null; |
|
|
|
|
const deliveryWays = !!deliveryWay ? deliveryWay.split(',') : null; |
|
|
|
|
const deliveryTypes = !!deliveryType ? deliveryType.split(',') : null; |
|
|
|
|
const serveTypeName =!!serveTypes ? this.getOwnServer(serveTypes, '', this.serveTypeList) || null : null; |
|
|
|
|
const deliveryWayName =!!deliveryWays ? this.getOwnServer(deliveryWays, '', this.deliveryWayList) || null : null; |
|
|
|
|
const deliveryTypeName =!!deliveryTypes ? this.getOwnServer(deliveryTypes, '', this.distributionType) || null : null; |
|
|
|
|
Object.assign(this.data[0], { |
|
|
|
|
serveTypeName, |
|
|
|
|
deliveryWayName, |
|
|
|
|
deliveryTypeName |
|
|
|
|
}); |
|
|
|
|
this.loading = false; |
|
|
|
|
this.getReservationList(page); |
|
|
|
|
// console.log(">>>>>",this.data[0],deliveryTypeName,deliveryWayName,serveTypeName); |
|
|
|
|
this.selectionClear(); |
|
|
|
|
}); |
|
|
|
|
// getDetailStockupOwn(this.$route.query.id).then(res => { |
|
|
|
|
// console.log("返回的值",res.data.data); |
|
|
|
|
// const data = res.data.data; |
|
|
|
|
// if(!data)return |
|
|
|
|
// this.data[0] = data; |
|
|
|
|
// const { serveType, deliveryWay, deliveryType } = this.data[0]; |
|
|
|
|
// const serveTypes = !!serveType ? serveType.split(',') : null; |
|
|
|
|
// const deliveryWays = !!deliveryWay ? deliveryWay.split(',') : null; |
|
|
|
|
// const deliveryTypes = !!deliveryType ? deliveryType.split(',') : null; |
|
|
|
|
// const serveTypeName =!!serveTypes ? this.getOwnServer(serveTypes, '', this.serveTypeList) || null : null; |
|
|
|
|
// const deliveryWayName =!!deliveryWays ? this.getOwnServer(deliveryWays, '', this.deliveryWayList) || null : null; |
|
|
|
|
// const deliveryTypeName =!!deliveryTypes ? this.getOwnServer(deliveryTypes, '', this.distributionType) || null : null; |
|
|
|
|
// Object.assign(this.data[0], { |
|
|
|
|
// serveTypeName, |
|
|
|
|
// deliveryWayName, |
|
|
|
|
// deliveryTypeName |
|
|
|
|
// }); |
|
|
|
|
// this.loading = false; |
|
|
|
|
// this.getReservationList(page); |
|
|
|
|
// // console.log(">>>>>",this.data[0],deliveryTypeName,deliveryWayName,serveTypeName); |
|
|
|
|
// this.selectionClear(); |
|
|
|
|
// }); |
|
|
|
|
|
|
|
|
|
this.getReservationList(page); |
|
|
|
|
this.loading = false; |
|
|
|
|
} , |
|
|
|
|
//查询预约列表 |
|
|
|
|
async getReservationList(page){ |
|
|
|
|