|
|
|
|
@ -68,11 +68,11 @@
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div style="margin: 2%;background-color: #ffffff;padding: 20px;box-sizing: border-box;" v-if="bbb"> |
|
|
|
|
<el-form ref="form" :model="driverForm" label-width="100px" style="margin: 3px"> |
|
|
|
|
<el-form ref="form" :model="waixieForm" label-width="100px" style="margin: 3px"> |
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="6"> |
|
|
|
|
<el-form-item label="外协来源:" prop="goodsShelfId"> |
|
|
|
|
<el-select filterable v-model="driverForm.tripartiteSource" placeholder="请选择来源"> |
|
|
|
|
<el-select filterable v-model="waixieForm.tripartiteSource" placeholder="请选择来源"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in tripartiteSourceData" |
|
|
|
|
:key="item.dictKey" |
|
|
|
|
@ -85,22 +85,22 @@
|
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="6"> |
|
|
|
|
<el-form-item label="司机名称:" prop="goodsShelfId"> |
|
|
|
|
<el-input v-model="driverForm.driverName" placeholder="请输入司机名称"></el-input> |
|
|
|
|
<el-input v-model="waixieForm.driverName" placeholder="请输入司机名称"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="6"> |
|
|
|
|
<el-form-item label="司机电话:" prop="goodsShelfId"> |
|
|
|
|
<el-input v-model="driverForm.driverPhone" placeholder="请输入司机电话"></el-input> |
|
|
|
|
<el-input v-model="waixieForm.driverPhone" placeholder="请输入司机电话"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="6"> |
|
|
|
|
<el-form-item label="车辆车牌:" prop="goodsShelfId"> |
|
|
|
|
<el-input v-model="driverForm.vehicleNum" placeholder="请输入本次费用"></el-input> |
|
|
|
|
<el-input v-model="waixieForm.vehicleNum" placeholder="请输入本次费用"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="6"> |
|
|
|
|
<el-form-item label="配送费用:" prop="goodsShelfId"> |
|
|
|
|
<el-input v-model="driverForm.deliveryFee" placeholder="请输入本次费用"></el-input> |
|
|
|
|
<el-input v-model="waixieForm.deliveryFee" placeholder="请输入本次费用"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
@ -189,19 +189,32 @@
|
|
|
|
|
<!-- value-format="YYYY-MM-DD HH:mm:ss"--> |
|
|
|
|
<!-- >--> |
|
|
|
|
<!-- </el-date-picker>--> |
|
|
|
|
<el-date-picker v-model="stockUpForm.outboundDate" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择配车时间"> |
|
|
|
|
<el-date-picker v-model="stockUpForm.outboundDate" type="datetime" placeholder="请选择配车时间"> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="6"> |
|
|
|
|
<el-form-item label="其他费用:" prop="collectFee" label-width="100px"> |
|
|
|
|
<el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用" /> |
|
|
|
|
<el-form-item label="配车时间:" prop="taskTime" label-width="100px"> |
|
|
|
|
<!-- <el-date-picker v-model="form.taskTime"--> |
|
|
|
|
<!-- type="datetime"--> |
|
|
|
|
<!-- placeholder="请选择配车时间"--> |
|
|
|
|
<!-- value-format="YYYY-MM-DD HH:mm:ss"--> |
|
|
|
|
<!-- >--> |
|
|
|
|
<!-- </el-date-picker>--> |
|
|
|
|
<el-date-picker v-model="form.taskTime" type="datetime" placeholder="请选择配车时间"> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
|
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="24"> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="其他费用:" prop="collectFee" label-width="100px"> |
|
|
|
|
<el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="备注:" prop="remarks"> |
|
|
|
|
<el-input type="textarea" :rows="1" placeholder="请输入内容" v-model="stockUpForm.remarks"> |
|
|
|
|
</el-input> |
|
|
|
|
@ -323,6 +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 { getListUser } from '@/api/distribution/distributionStockup'; |
|
|
|
|
import { getPostList } from '@/api/system/post'; |
|
|
|
|
import { getListOwn } from '@/api/system/user'; |
|
|
|
|
@ -341,6 +355,7 @@
|
|
|
|
|
form: {}, |
|
|
|
|
driverForm:{}, |
|
|
|
|
stockUpForm:{}, |
|
|
|
|
waixieForm:{}, |
|
|
|
|
data: [], |
|
|
|
|
// 分页信息 |
|
|
|
|
page: { |
|
|
|
|
@ -602,9 +617,14 @@
|
|
|
|
|
fetchData() { |
|
|
|
|
this.error = this.post = null; |
|
|
|
|
this.loading = true; |
|
|
|
|
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; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
viewDriverInfo() { |
|
|
|
|
console.log(this.driverInfo.length); |
|
|
|
|
@ -655,8 +675,12 @@
|
|
|
|
|
allocationInfo = info; |
|
|
|
|
} |
|
|
|
|
data.allocationInfo = allocationInfo; |
|
|
|
|
data.masterDriverName = this.form.masterDriverName; |
|
|
|
|
data.masterVehicleNub = this.form.masterVehicleNub; |
|
|
|
|
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; |
|
|
|
|
@ -857,12 +881,14 @@
|
|
|
|
|
this.loadAndUnload = []; |
|
|
|
|
this.serveType=[]; |
|
|
|
|
this.driverForm = {}; |
|
|
|
|
this.waixieForm = {}; |
|
|
|
|
} |
|
|
|
|
this.aaa = true; |
|
|
|
|
this.bbb = false; |
|
|
|
|
this.stockUpForm.deliveryType="2"; |
|
|
|
|
this.stockUpForm.deliveryWay="2"; |
|
|
|
|
this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
|
this.form.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
|
this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
|
}, |
|
|
|
|
ddd() { |
|
|
|
|
@ -875,11 +901,13 @@
|
|
|
|
|
this.loadAndUnload = []; |
|
|
|
|
this.serveType=[]; |
|
|
|
|
this.driverForm={}; |
|
|
|
|
this.waixieForm={}; |
|
|
|
|
} |
|
|
|
|
this.aaa = false; |
|
|
|
|
this.bbb = true; |
|
|
|
|
this.stockUpForm.deliveryType="2"; |
|
|
|
|
this.stockUpForm.deliveryWay="2"; |
|
|
|
|
this.form.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
|
this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
|
this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
|
}, |
|
|
|
|
@ -889,15 +917,18 @@
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
onLoad(page, params = {}) { |
|
|
|
|
console.log("》》》》》》》》》》》》》》》",this.reservationIds); |
|
|
|
|
|
|
|
|
|
//初始化页面数据 |
|
|
|
|
this.stockUpForm.deliveryType="2"; |
|
|
|
|
this.stockUpForm.deliveryWay="2"; |
|
|
|
|
this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
|
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){ |
|
|
|
|
let ids =this.reservationIds; |
|
|
|
|
console.log("》》》》》》》》》》》》》》》",this.reservationIds); |
|
|
|
|
let ids =this.reservationIds; |
|
|
|
|
getReservationAddr(ids).then(res => { |
|
|
|
|
console.log("------------->",res); |
|
|
|
|
const reservationData = res.data.data; |
|
|
|
|
@ -907,6 +938,14 @@
|
|
|
|
|
this.loading = false; |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
if (this.deliveryListId){ |
|
|
|
|
console.log("<<<<<<<<<<",this.deliveryListId); |
|
|
|
|
|
|
|
|
|
//市配计划编辑回显 |
|
|
|
|
getMarketDeliveryList(this.deliveryListId).then(res=>{ |
|
|
|
|
console.log(res.data.data); |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
this.loading = false; |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
|
0.0
2 years ago