|
|
|
|
@ -818,6 +818,8 @@ const VehicleInformationCopy=ref([]);//拷贝司机信息
|
|
|
|
|
const StockInfo = ref({ |
|
|
|
|
createDate: new Date(), //默认日期 |
|
|
|
|
radio: 1, |
|
|
|
|
Cl:[], |
|
|
|
|
Sj:[], |
|
|
|
|
//司机信息 |
|
|
|
|
DriverInformation: [ |
|
|
|
|
{ |
|
|
|
|
@ -1757,9 +1759,7 @@ const wrap = ref([
|
|
|
|
|
}, |
|
|
|
|
]); |
|
|
|
|
// 获取表格数据 |
|
|
|
|
function onLoad() { |
|
|
|
|
loading.value = true; //开启加载效果 |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
statisticsList.value = menuData.value.filter(item => item.statistics); //筛选出要统计的 |
|
|
|
|
console.log(statisticsList.value, '需要统计的字段'); |
|
|
|
|
@ -1808,8 +1808,8 @@ onMounted(() => {
|
|
|
|
|
driverName: item.driverName, //司机姓名 |
|
|
|
|
driverPhone: item.driverPhone, //司机电话 |
|
|
|
|
}); |
|
|
|
|
console.log(DriverTemporaryStorage.value,'处理好的司机'); |
|
|
|
|
chooseDriverIds.value.push(item.driverId); |
|
|
|
|
|
|
|
|
|
VehicleTemporaryStorage.value.push({ |
|
|
|
|
vehicleId: item.vehicleId, //车辆ID |
|
|
|
|
vehicleNub: item.vehicleNub, //车牌号 |
|
|
|
|
@ -1817,17 +1817,20 @@ onMounted(() => {
|
|
|
|
|
chooseCarIds.value.push(item.vehicleId); |
|
|
|
|
// 配送司机 |
|
|
|
|
StockInfo.value.Sj.push(item.driverId); |
|
|
|
|
|
|
|
|
|
// 配送车辆 |
|
|
|
|
StockInfo.value.Cl.push(item.vehicleId); |
|
|
|
|
if (item.isMaster == 2) { |
|
|
|
|
DataSubmit.value.masterDriverName = item.driverName; //主司机名称 |
|
|
|
|
DataSubmit.value.masterVehicleNub = item.vehicleNub; //司机车牌号 |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
console.log(res.data.data,'123'); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
wrapDataInfo.value = res.data.data.stockArticleList||''; // 订单包件 |
|
|
|
|
dataInfo.value = res.data.data.stockArticleList||''; //订单列表 |
|
|
|
|
@ -1840,7 +1843,7 @@ onMounted(() => {
|
|
|
|
|
if(!res.data.data.stockupInfo){ |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
DataSubmit.value.stockup.forkliftName = res.data.data.stockupInfo.forkliftName||''; //备货人员名称 |
|
|
|
|
DataSubmit.value.stockup.forkliftName = res.data.data.stockupInfo.forkliftId||''; //备货人员名称 |
|
|
|
|
DataSubmit.value.stockup.forkliftId = res.data.data.stockupInfo.forkliftId||''; //备货人员ID |
|
|
|
|
// DataSubmit.value.stockup.goodsAreaId = res.data.data.stockupInfo.goodsAreaId||''; //备货区域ID |
|
|
|
|
DataSubmit.value.stockup.goodsAreaName = res.data.data.stockupInfo.stockupArea||''; //备货区域名称 |
|
|
|
|
@ -1852,7 +1855,7 @@ onMounted(() => {
|
|
|
|
|
}).catch(()=>{ |
|
|
|
|
|
|
|
|
|
}).finally(()=>{ |
|
|
|
|
editLoading.value = false; //开启加载 |
|
|
|
|
editLoading.value = false; //关闭加载 |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
@ -3327,7 +3330,7 @@ sjInput.value=''
|
|
|
|
|
<style lang="scss" scoped> |
|
|
|
|
.orderPage, |
|
|
|
|
.orderPageS { |
|
|
|
|
height: 100%; |
|
|
|
|
height: auto; |
|
|
|
|
:deep(.el-form) { |
|
|
|
|
display: flex; |
|
|
|
|
align-items: flex-start; |
|
|
|
|
|
