|
|
|
|
@ -201,7 +201,7 @@
|
|
|
|
|
<!-- value-format="YYYY-MM-DD HH:mm:ss"--> |
|
|
|
|
<!-- >--> |
|
|
|
|
<!-- </el-date-picker>--> |
|
|
|
|
<el-date-picker v-model="form.taskTime" type="datetime" placeholder="请选择配车时间"> |
|
|
|
|
<el-date-picker v-model="stockUpForm.taskTime" type="datetime" placeholder="请选择配车时间"> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
@ -336,7 +336,7 @@
|
|
|
|
|
import option from '@/option/distribution/distributionReservation'; |
|
|
|
|
import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup'; |
|
|
|
|
import { deliveryTask, getReservationAddr } from '@/api/distribution/distributionReservation'; |
|
|
|
|
import { getMarketDeliveryList } from '@/api/distribution/distributionDeliveryList'; |
|
|
|
|
import { getMarketDeliveryList,updateMarketDelivery } from '@/api/distribution/distributionDeliveryList'; |
|
|
|
|
import { getListUser } from '@/api/distribution/distributionStockup'; |
|
|
|
|
import { getPostList } from '@/api/system/post'; |
|
|
|
|
import { getListOwn } from '@/api/system/user'; |
|
|
|
|
@ -617,14 +617,33 @@
|
|
|
|
|
fetchData() { |
|
|
|
|
this.error = this.post = null; |
|
|
|
|
this.loading = true; |
|
|
|
|
console.log("this.$route.query",this.$route.query); |
|
|
|
|
console.log('this.$route.query', this.$route.query); |
|
|
|
|
if (this.$route.query.id) { |
|
|
|
|
this.reservationIds = this.$route.query.id; |
|
|
|
|
} |
|
|
|
|
if (this.$route.query.deliveryId) { |
|
|
|
|
this.deliveryListId = this.$route.query.deliveryId; |
|
|
|
|
} |
|
|
|
|
this.loading = false; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
removeStockArticle(row){ |
|
|
|
|
if (this.data.length===1){ |
|
|
|
|
this.$message({ |
|
|
|
|
message: '无法进行预约任务取消!!!', |
|
|
|
|
type: 'warning' |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
let data = this.data; |
|
|
|
|
data.forEach((item,index)=>{ |
|
|
|
|
if (item.id === row.id){ |
|
|
|
|
data.splice(index, 1); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
this.data = data; |
|
|
|
|
console.log("row------------->",row); |
|
|
|
|
}, |
|
|
|
|
viewDriverInfo() { |
|
|
|
|
console.log(this.driverInfo.length); |
|
|
|
|
@ -665,8 +684,9 @@
|
|
|
|
|
for (let i = 0; i < this.driverInfo.length; i++) { |
|
|
|
|
let obj = {}; |
|
|
|
|
obj.driver = this.driverInfo[i].name; |
|
|
|
|
obj.driverName = this.driverInfo[i].name; |
|
|
|
|
obj.driverId = this.driverInfo[i].id; |
|
|
|
|
obj.driverPhone=this.driverInfo[i].phone; |
|
|
|
|
obj.driverPhone = this.driverInfo[i].phone; |
|
|
|
|
obj.vehicleNub = this.vehticleInfo[i].vehicleNub; |
|
|
|
|
obj.vehicleId = this.vehticleInfo[i].id; |
|
|
|
|
info.push(obj); |
|
|
|
|
@ -675,203 +695,219 @@
|
|
|
|
|
allocationInfo = info; |
|
|
|
|
} |
|
|
|
|
data.allocationInfo = allocationInfo; |
|
|
|
|
data.masterDriverName = this.driverForm.masterDriverName; |
|
|
|
|
data.masterVehicleNub = this.driverForm.masterVehicleNub; |
|
|
|
|
} |
|
|
|
|
if (this.waixieForm.tripartiteSource){ |
|
|
|
|
tripartite = this.waixieForm; |
|
|
|
|
data.tripartite = tripartite; |
|
|
|
|
} |
|
|
|
|
if (this.stockUpForm) { |
|
|
|
|
let params = this.stockUpForm; |
|
|
|
|
if (params.tripartiteSource) { |
|
|
|
|
//三方配送数据构建 |
|
|
|
|
if (params.driverName) { |
|
|
|
|
tripartite.driverName = params.driverName; |
|
|
|
|
} |
|
|
|
|
if (params.deiverPhone) { |
|
|
|
|
tripartite.deiverPhone = params.deiverPhone; |
|
|
|
|
} |
|
|
|
|
if (params.vehicleNum) { |
|
|
|
|
tripartite.vehicleNum = params.vehicleNum; |
|
|
|
|
data.masterDriverName = this.driverForm.masterDriverName; |
|
|
|
|
data.masterVehicleNub = this.driverForm.masterVehicleNub; |
|
|
|
|
} |
|
|
|
|
if (this.waixieForm.tripartiteSource) { |
|
|
|
|
tripartite = this.waixieForm; |
|
|
|
|
data.tripartite = tripartite; |
|
|
|
|
} |
|
|
|
|
if (this.stockUpForm) { |
|
|
|
|
let params = this.stockUpForm; |
|
|
|
|
if (params.tripartiteSource) { |
|
|
|
|
//三方配送数据构建 |
|
|
|
|
if (params.driverName) { |
|
|
|
|
tripartite.driverName = params.driverName; |
|
|
|
|
} |
|
|
|
|
if (params.deiverPhone) { |
|
|
|
|
tripartite.deiverPhone = params.deiverPhone; |
|
|
|
|
} |
|
|
|
|
if (params.vehicleNum) { |
|
|
|
|
tripartite.vehicleNum = params.vehicleNum; |
|
|
|
|
} |
|
|
|
|
if (params.deliveryFee) { |
|
|
|
|
tripartite.deliveryFee = params.deliveryFee; |
|
|
|
|
} |
|
|
|
|
if (params.tripartiteSource) { |
|
|
|
|
this.tripartiteSourceData.forEach(item => { |
|
|
|
|
if (params.tripartiteSource === item.dictValue) { |
|
|
|
|
tripartite.distributionCompanyId = item.dictKey; |
|
|
|
|
tripartite.distributionCompany = item.dictValue; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
data.tripartite = tripartite; |
|
|
|
|
} else { |
|
|
|
|
// 自主配送 |
|
|
|
|
if (params.loader) { |
|
|
|
|
this.loaderData.forEach(a => { |
|
|
|
|
if (params.loader === a.dictKey) { |
|
|
|
|
stockup.loaderName = a.dictValue; |
|
|
|
|
stockup.loaderId = a.dictKey; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
if (params.forklift) { |
|
|
|
|
this.forkliftData.forEach(b => { |
|
|
|
|
if (params.forklift === b.dictKey) { |
|
|
|
|
stockup.forkliftName = b.dictValue; |
|
|
|
|
stockup.forkliftId = b.dictKey; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
if (params.goodsAreaId) { |
|
|
|
|
this.goodsAreaData.forEach(c => { |
|
|
|
|
if (params.goodsAreaId === c.dictKey) { |
|
|
|
|
stockup.goodsAreaId = c.dictKey; |
|
|
|
|
stockup.goodsAreaName = c.dictValue; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
if (params.stockupDate) { |
|
|
|
|
stockup.stockupDate = params.stockupDate; |
|
|
|
|
} |
|
|
|
|
if (params.remarks) { |
|
|
|
|
stockup.remarks = params.remarks; |
|
|
|
|
} |
|
|
|
|
if (this.loadAndUnload.length > 0) { |
|
|
|
|
stockup.loadAndUnload = this.loadAndUnload.join(','); |
|
|
|
|
} |
|
|
|
|
if (params.outboundDate) { |
|
|
|
|
stockup.outboundDate = params.outboundDate; |
|
|
|
|
} |
|
|
|
|
data.stockup = stockup; |
|
|
|
|
} |
|
|
|
|
if (params.deliveryFee) { |
|
|
|
|
tripartite.deliveryFee = params.deliveryFee; |
|
|
|
|
if (this.stockUpForm.taskTime) { |
|
|
|
|
data.taskTime = this.stockUpForm.taskTime.toString(); |
|
|
|
|
} |
|
|
|
|
if (params.tripartiteSource) { |
|
|
|
|
this.tripartiteSourceData.forEach(item => { |
|
|
|
|
if (params.tripartiteSource === item.dictValue) { |
|
|
|
|
tripartite.distributionCompanyId = item.dictKey; |
|
|
|
|
tripartite.distributionCompany = item.dictValue; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
console.log('this.data------------>', this.data); |
|
|
|
|
if (!this.deliveryListId) { |
|
|
|
|
data.reservationIds = this.reservationIds; |
|
|
|
|
console.log('>>>>>>>>>>>>', data); |
|
|
|
|
deliveryTask(data).then((res) => { |
|
|
|
|
this.$router.push({ |
|
|
|
|
path: '/distribution/deliverylist/distributionDeliveryListmar', |
|
|
|
|
name: '配送市配列表' |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
data.tripartite = tripartite; |
|
|
|
|
}else { |
|
|
|
|
// 自主配送 |
|
|
|
|
if (params.loader) { |
|
|
|
|
this.loaderData.forEach(a => { |
|
|
|
|
if (params.loader === a.dictKey) { |
|
|
|
|
stockup.loaderName = a.dictValue; |
|
|
|
|
stockup.loaderId = a.dictKey; |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
data.reservationInfos =this.data; |
|
|
|
|
data.id = this.deliveryListId; |
|
|
|
|
data.stockupInfo = stockup; |
|
|
|
|
updateMarketDelivery(data).then(res=>{ |
|
|
|
|
let result = res; |
|
|
|
|
console.log("result---------------->",result); |
|
|
|
|
this.$message({ |
|
|
|
|
message: '操作成功', |
|
|
|
|
type: 'message' |
|
|
|
|
}); |
|
|
|
|
this.$router.go(-1) |
|
|
|
|
return; |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
changeVehicle(params) { |
|
|
|
|
console.log(params); |
|
|
|
|
this.vehticleList = params; |
|
|
|
|
let b = []; |
|
|
|
|
if (params) { |
|
|
|
|
this.vehicleData.forEach(item => { |
|
|
|
|
this.vehticleList.forEach(p => { |
|
|
|
|
if (p == item.id) { |
|
|
|
|
b.push(item); |
|
|
|
|
console.log(this.driverInfo); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
if (params.forklift){ |
|
|
|
|
this.forkliftData.forEach(b => { |
|
|
|
|
if (params.forklift === b.dictKey) { |
|
|
|
|
stockup.forkliftName = b.dictValue; |
|
|
|
|
stockup.forkliftId = b.dictKey; |
|
|
|
|
if (params[0] === item.id) { |
|
|
|
|
this.driverForm.masterVehicleNub = item.vehicleNub; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.vehticleInfo = b; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
changeDriver(params) { |
|
|
|
|
this.driverList = params; |
|
|
|
|
let a = []; |
|
|
|
|
if (params) { |
|
|
|
|
this.driverData.forEach(item => { |
|
|
|
|
this.driverList.forEach(p => { |
|
|
|
|
if (p == item.id) { |
|
|
|
|
a.push(item); |
|
|
|
|
console.log(this.driverInfo); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
if (params[0] === item.id) { |
|
|
|
|
this.driverForm.masterDriverName = item.name; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.driverInfo = a; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
//上移 |
|
|
|
|
moveUpVehictle(row) { |
|
|
|
|
let i = 0; |
|
|
|
|
this.vehticleInfo.forEach((item, index) => { |
|
|
|
|
if (item.id === row.id) { |
|
|
|
|
i = index; |
|
|
|
|
} |
|
|
|
|
if (params.goodsAreaId){ |
|
|
|
|
this.goodsAreaData.forEach(c => { |
|
|
|
|
if (params.goodsAreaId === c.dictKey) { |
|
|
|
|
stockup.goodsAreaId = c.dictKey; |
|
|
|
|
stockup.goodsAreaName = c.dictValue; |
|
|
|
|
}); |
|
|
|
|
//获取当当前选中的下标，如果下标为第一个则不能上移 |
|
|
|
|
if (i > 0) { |
|
|
|
|
let a = this.vehticleInfo[i - 1]; |
|
|
|
|
this.vehticleInfo.splice(i - 1, 1); |
|
|
|
|
this.vehticleInfo.splice(i, 0, a); |
|
|
|
|
} else { |
|
|
|
|
this.$message({ |
|
|
|
|
message: '已经是第一条，上移失败', |
|
|
|
|
type: 'warning' |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
console.log(this.vehticleInfo); |
|
|
|
|
}, |
|
|
|
|
handleSelect(selection, row) { |
|
|
|
|
// 阻止全选框原有逻辑 |
|
|
|
|
this.$refs.multipleTable.clearSelection(); |
|
|
|
|
if (row) { |
|
|
|
|
if (selection.length === 1) { |
|
|
|
|
this.multipleSelection = row; |
|
|
|
|
this.$refs.multipleTable.toggleRowSelection(row, true); |
|
|
|
|
} else if (selection.length > 1) { |
|
|
|
|
let a = {}; |
|
|
|
|
selection.forEach((s, index) => { |
|
|
|
|
if (s.id === row.id) { |
|
|
|
|
selection.splice(index, 1); |
|
|
|
|
a = s; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.multipleSelection = selection; |
|
|
|
|
this.$refs.multipleTable.toggleRowSelection(a, true); |
|
|
|
|
} |
|
|
|
|
if (params.stockupDate) { |
|
|
|
|
stockup.stockupDate = params.stockupDate; |
|
|
|
|
} |
|
|
|
|
if (params.remarks) { |
|
|
|
|
stockup.remarks = params.remarks; |
|
|
|
|
} |
|
|
|
|
if (this.loadAndUnload.length>0){ |
|
|
|
|
stockup.loadAndUnload = this.loadAndUnload.join(','); |
|
|
|
|
} |
|
|
|
|
if (params.outboundDate){ |
|
|
|
|
stockup.outboundDate = params.outboundDate; |
|
|
|
|
} |
|
|
|
|
data.stockup = stockup; |
|
|
|
|
} |
|
|
|
|
if (this.form.taskTime){ |
|
|
|
|
data.taskTime = this.form.taskTime; |
|
|
|
|
}, |
|
|
|
|
confirmDriver() { |
|
|
|
|
if (this.multipleSelection.length === 0) { |
|
|
|
|
this.$message.warning('请选择至少一条数据'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
data.reservationIds = this.reservationIds; |
|
|
|
|
console.log("this.data------------>",this.data); |
|
|
|
|
console.log(">>>>>>>>>>>>",data); |
|
|
|
|
deliveryTask(data).then((res) => { |
|
|
|
|
this.$router.push({ |
|
|
|
|
path: '/distribution/deliverylist/distributionDeliveryListmar', |
|
|
|
|
name:'配送市配列表' |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
changeVehicle(params) { |
|
|
|
|
console.log(params); |
|
|
|
|
this.vehticleList = params; |
|
|
|
|
let b = []; |
|
|
|
|
if (params) { |
|
|
|
|
this.vehicleData.forEach(item => { |
|
|
|
|
this.vehticleList.forEach(p => { |
|
|
|
|
if (p == item.id) { |
|
|
|
|
b.push(item); |
|
|
|
|
console.log(this.driverInfo); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
if (params[0] === item.id) { |
|
|
|
|
this.driverForm.masterVehicleNub = item.vehicleNub; |
|
|
|
|
console.log('this.adada', this.multipleSelection); |
|
|
|
|
this.isDriverShow = false; |
|
|
|
|
//获取到表格的行坐标 |
|
|
|
|
let a = 0; |
|
|
|
|
this.driverInfo.forEach((item, index) => { |
|
|
|
|
if (item.id === this.multipleSelection.id) { |
|
|
|
|
a = index; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.vehticleInfo = b; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
changeDriver(params) { |
|
|
|
|
this.driverList = params; |
|
|
|
|
let a = []; |
|
|
|
|
if (params) { |
|
|
|
|
this.driverData.forEach(item => { |
|
|
|
|
this.driverList.forEach(p => { |
|
|
|
|
if (p == item.id) { |
|
|
|
|
a.push(item); |
|
|
|
|
console.log(this.driverInfo); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
if (params[0] === item.id) { |
|
|
|
|
this.driverForm.masterDriverName = item.name; |
|
|
|
|
} |
|
|
|
|
this.driverForm.masterDriverName = this.driverInfo[a].name; |
|
|
|
|
this.driverForm.masterVehicleNub = this.vehticleInfo[a].vehicleNub; |
|
|
|
|
}, |
|
|
|
|
// //数据字典数据获取 |
|
|
|
|
getDictionary() { |
|
|
|
|
getDictionaryBiz('addvalue_serve_type').then(res => { |
|
|
|
|
this.addvalueServeTypeData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
this.driverInfo = a; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
//上移 |
|
|
|
|
moveUpVehictle(row) { |
|
|
|
|
let i = 0; |
|
|
|
|
this.vehticleInfo.forEach((item, index) => { |
|
|
|
|
if (item.id === row.id) { |
|
|
|
|
i = index; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
//获取当当前选中的下标，如果下标为第一个则不能上移 |
|
|
|
|
if (i > 0) { |
|
|
|
|
let a = this.vehticleInfo[i - 1]; |
|
|
|
|
this.vehticleInfo.splice(i - 1, 1); |
|
|
|
|
this.vehticleInfo.splice(i, 0, a); |
|
|
|
|
} else { |
|
|
|
|
this.$message({ |
|
|
|
|
message: '已经是第一条，上移失败', |
|
|
|
|
type: 'warning', |
|
|
|
|
getDictionaryBiz('load_and_unload').then(res => { |
|
|
|
|
this.loadAndUnloadData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
console.log(this.vehticleInfo); |
|
|
|
|
}, |
|
|
|
|
handleSelect(selection, row) { |
|
|
|
|
// 阻止全选框原有逻辑 |
|
|
|
|
this.$refs.multipleTable.clearSelection(); |
|
|
|
|
if (row) { |
|
|
|
|
if (selection.length === 1) { |
|
|
|
|
this.multipleSelection = row; |
|
|
|
|
this.$refs.multipleTable.toggleRowSelection(row, true); |
|
|
|
|
} else if (selection.length > 1) { |
|
|
|
|
let a = {}; |
|
|
|
|
selection.forEach((s, index) => { |
|
|
|
|
if (s.id === row.id) { |
|
|
|
|
selection.splice(index, 1); |
|
|
|
|
a = s; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.multipleSelection = selection; |
|
|
|
|
this.$refs.multipleTable.toggleRowSelection(a, true); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
confirmDriver() { |
|
|
|
|
if (this.multipleSelection.length === 0) { |
|
|
|
|
this.$message.warning('请选择至少一条数据'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
console.log('this.adada', this.multipleSelection); |
|
|
|
|
this.isDriverShow = false; |
|
|
|
|
//获取到表格的行坐标 |
|
|
|
|
let a = 0; |
|
|
|
|
this.driverInfo.forEach((item, index) => { |
|
|
|
|
if (item.id === this.multipleSelection.id) { |
|
|
|
|
a = index; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.driverForm.masterDriverName = this.driverInfo[a].name; |
|
|
|
|
this.driverForm.masterVehicleNub = this.vehticleInfo[a].vehicleNub; |
|
|
|
|
}, |
|
|
|
|
// //数据字典数据获取 |
|
|
|
|
getDictionary() { |
|
|
|
|
getDictionaryBiz('addvalue_serve_type').then(res => { |
|
|
|
|
this.addvalueServeTypeData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('load_and_unload').then(res => { |
|
|
|
|
this.loadAndUnloadData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('delivery_way').then(res => { |
|
|
|
|
this.deliveryWayData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
//三方外协来源 |
|
|
|
|
getDictionaryBiz('tripartite_source').then(res => { |
|
|
|
|
this.tripartiteSourceData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
getDictionaryBiz('delivery_way').then(res => { |
|
|
|
|
this.deliveryWayData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
//三方外协来源 |
|
|
|
|
getDictionaryBiz('tripartite_source').then(res => { |
|
|
|
|
this.tripartiteSourceData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
ccc() { |
|
|
|
|
if (this.deliveryListId){ |
|
|
|
|
@ -928,27 +964,89 @@
|
|
|
|
|
this.stockUpForm.stockupDate = new Date(); |
|
|
|
|
this.form.taskTime = new Date(); |
|
|
|
|
this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
|
this.stockUpForm.otherFee = 0 ; |
|
|
|
|
this.loadAndUnload = ["1","2"] ; |
|
|
|
|
if (this.reservationIds){ |
|
|
|
|
console.log("》》》》》》》》》》》》》》》",this.reservationIds); |
|
|
|
|
let ids =this.reservationIds; |
|
|
|
|
getReservationAddr(ids).then(res => { |
|
|
|
|
console.log("------------->",res); |
|
|
|
|
const reservationData = res.data.data; |
|
|
|
|
this.page.total = reservationData.total; |
|
|
|
|
this.data = reservationData.records; |
|
|
|
|
console.log('>>>>>>>>>>>', this.data); |
|
|
|
|
this.loading = false; |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
if (this.deliveryListId){ |
|
|
|
|
console.log("<<<<<<<<<<",this.deliveryListId); |
|
|
|
|
this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
|
this.stockUpForm.otherFee = 0; |
|
|
|
|
this.loadAndUnload = ['1', '2']; |
|
|
|
|
if (this.reservationIds) { |
|
|
|
|
this.isoperation = false; |
|
|
|
|
console.log('》》》》》》》》》》》》》》》', this.reservationIds); |
|
|
|
|
let ids = this.reservationIds; |
|
|
|
|
getReservationAddr(ids).then(res => { |
|
|
|
|
console.log('------------->', res); |
|
|
|
|
const reservationData = res.data.data; |
|
|
|
|
this.page.total = reservationData.total; |
|
|
|
|
this.data = reservationData.records; |
|
|
|
|
console.log('>>>>>>>>>>>', this.data); |
|
|
|
|
this.loading = false; |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
if (this.deliveryListId) { |
|
|
|
|
this.isoperation = true; |
|
|
|
|
console.log('<<<<<<<<<<', this.deliveryListId); |
|
|
|
|
|
|
|
|
|
//市配计划编辑回显 |
|
|
|
|
getMarketDeliveryList(this.deliveryListId).then(res=>{ |
|
|
|
|
console.log(res.data.data); |
|
|
|
|
}) |
|
|
|
|
getMarketDeliveryList(this.deliveryListId).then(async res => { |
|
|
|
|
console.log('--------------->', res.data.data); |
|
|
|
|
const deliveryData = res.data.data; |
|
|
|
|
this.stockUpForm.outboundDate = deliveryData.stockupInfo.outboundDate; |
|
|
|
|
this.stockUpForm.taskTime = deliveryData.stockupInfo.taskTime; |
|
|
|
|
this.stockUpForm.goodsAreaId = deliveryData.stockupInfo.goodsAreaId; |
|
|
|
|
this.stockUpForm.forklift = deliveryData.stockupInfo.forkliftId; |
|
|
|
|
this.stockUpForm.loader = deliveryData.stockupInfo.loaderId; |
|
|
|
|
this.stockUpForm.taskTime = deliveryData.taskTime; |
|
|
|
|
console.log('reservationInfo--------------->', res.data.data.reservationInfo); |
|
|
|
|
this.data = deliveryData.reservationInfos; |
|
|
|
|
if (deliveryData.kind === '1') { |
|
|
|
|
//自主配送 |
|
|
|
|
let self = deliveryData.deliverySelfVO; |
|
|
|
|
let vehicle = await this.getvehicleData(); |
|
|
|
|
console.log('___________________-->', vehicle); |
|
|
|
|
let driver = await this.getMasterDriverData(); |
|
|
|
|
let a = []; |
|
|
|
|
let b = []; |
|
|
|
|
let vehicleInfo = []; |
|
|
|
|
vehicle.forEach(item => { |
|
|
|
|
self.forEach(s => { |
|
|
|
|
if (item.id === s.vehicleId) { |
|
|
|
|
a.push(s.vehicleId); |
|
|
|
|
vehicleInfo.push(item); |
|
|
|
|
} |
|
|
|
|
if (s.isMaster === 2) { |
|
|
|
|
this.driverForm.masterVehicleNub = s.vehicleNub; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
this.vehticleList = a; |
|
|
|
|
this.vehicleIds = a; |
|
|
|
|
console.log(' this.vehicleIds', this.vehicleIds); |
|
|
|
|
this.vehticleInfo = vehicleInfo; |
|
|
|
|
let driverInfo = []; |
|
|
|
|
driver.forEach(item => { |
|
|
|
|
self.forEach(s => { |
|
|
|
|
if (item.id === s.driverId) { |
|
|
|
|
b.push(s.driverId); |
|
|
|
|
driverInfo.push(item); |
|
|
|
|
} |
|
|
|
|
if (s.isMaster === 2) { |
|
|
|
|
this.driverForm.masterDriverName = s.driverName; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
this.deliveryDriver = b; |
|
|
|
|
this.driverList = b; |
|
|
|
|
this.driverInfo = driverInfo; |
|
|
|
|
} else { |
|
|
|
|
let deliveryTripartiteVO = deliveryData.deliveryTripartiteVO; |
|
|
|
|
this.aaa = false; |
|
|
|
|
this.bbb = true; |
|
|
|
|
// this.form.tripartiteSource = deliveryTripartiteVO.distributionCompanyId; |
|
|
|
|
this.waixieForm.tripartiteSource = "1"; |
|
|
|
|
this.waixieForm.driverName = deliveryTripartiteVO.driverName ; |
|
|
|
|
this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum ; |
|
|
|
|
this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone ; |
|
|
|
|
this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee ; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
this.loading = false; |
|
|
|
|
}, |
|
|
|
|
|
kilo
2 years ago