0.0
2 years ago
25 changed files with 2842 additions and 1280 deletions
@ -1,935 +0,0 @@
|
||||
<template> |
||||
<div> |
||||
<el-row> |
||||
<el-button type="primary" plain style="margin-left: 15%;width: 200px;height: 70px" @click="ccc">自主配送 |
||||
</el-button> |
||||
<el-button type="primary" plain style="margin-left: 30%;width: 200px;height: 70px" @click="ddd">外协 |
||||
</el-button> |
||||
</el-row> |
||||
</div> |
||||
<div style="margin: 2%" v-if="aaa"> |
||||
<el-form ref="form" :model="form" label-width="100px" style="margin: 3px"> |
||||
<el-row> |
||||
<el-col :span="6"> |
||||
<el-form-item label="车辆信息:" prop="goodsShelfId"> |
||||
<el-select v-model="vehicleIds" multiple placeholder="请选择车辆" @change="changeVehicle"> |
||||
<el-option |
||||
v-for="item in vehicleData" |
||||
:key="item.id" |
||||
:label="item.vehicleNub" |
||||
:value="item.id"> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<!-- <el-col :span="8">--> |
||||
<!-- <el-form-item label="司机负责人:" prop="goodsShelfId" >--> |
||||
<!-- <el-select v-model="form.masterDriver" placeholder="请选择车辆" @change="changeMasterDriver">--> |
||||
<!-- <el-option--> |
||||
<!-- v-for="item in masterDriverData"--> |
||||
<!-- :key="item.id"--> |
||||
<!-- :label="item.name"--> |
||||
<!-- :value="item.id">--> |
||||
<!-- </el-option>--> |
||||
<!-- </el-select>--> |
||||
<!-- </el-form-item>--> |
||||
<!-- </el-col>--> |
||||
<el-col :span="6"> |
||||
<el-form-item label="配送司机信息:" prop="goodsShelfId"> |
||||
<!-- @change="changeSlaveDriver"--> |
||||
<el-select v-model="deliveryDriver" multiple placeholder="请选择司机" @change="changeDriver"> |
||||
<el-option |
||||
|
||||
v-for="item in driverData" |
||||
:key="item.id" |
||||
:label="item.name" |
||||
:value="item.id"> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<span> |
||||
<el-form-item label="主司机:" prop="forklift"> |
||||
<el-input v-model="form.masterDriverName" :disabled="true"> |
||||
</el-input> |
||||
</el-form-item> |
||||
<el-form-item label="主车辆:" prop="forklift"> |
||||
<el-input v-model="form.masterVehicleNub" :disabled="true"> |
||||
</el-input> |
||||
</el-form-item> |
||||
</span> |
||||
|
||||
|
||||
<!-- <span >主司机 :<strong> {{this.masterDriverName}}</strong></span><br/>--> |
||||
<!-- <span >主车辆 :<strong> {{this.masetervehictleName}}</strong></span>--> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-button round @click="viewDriverInfo" style="margin-left: 10%">查看司机配置</el-button> |
||||
</el-col> |
||||
</el-row> |
||||
<el-row> |
||||
<el-col :span="6"> |
||||
<el-form-item label="叉车司机:" prop="forklift"> |
||||
<el-select v-model="form.forklift" placeholder="请选择叉车司机"> |
||||
<el-option |
||||
v-for="item in this.forkliftData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictKey"> |
||||
</el-option> |
||||
<!-- {{this.forkliftData}}--> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="装卸班组:" prop="loader"> |
||||
<el-select v-model="form.loader" placeholder="请选择装卸班组"> |
||||
<el-option |
||||
v-for="item in loaderData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictKey"> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="3"> |
||||
<!-- <el-radio-group v-model="form.loadAndUnload" >--> |
||||
<!-- <el-radio v-for="item in this.loadAndUnloadData" :label="item.dictValue" :value="item.dictKey"></el-radio>--> |
||||
<!-- </el-radio-group>--> |
||||
<el-checkbox-group v-model="this.loadAndUnload"> |
||||
<el-checkbox v-for="item in loadAndUnloadData" :label="item.dictKey" :value="item.dictKey"> |
||||
{{item.dictValue}} |
||||
</el-checkbox> |
||||
</el-checkbox-group> |
||||
</el-col> |
||||
</el-row> |
||||
<el-row> |
||||
<el-col :span="6"> |
||||
<el-form-item label="备货区域:" prop="goodsAreaId"> |
||||
<el-select v-model="form.goodsAreaId" placeholder="请选择备货区域"> |
||||
<el-option |
||||
v-for="item in goodsAreaData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictKey"> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="备货时间:" prop="goodsShelfId"> |
||||
<el-date-picker |
||||
v-model="form.stockupDate" |
||||
type="date" |
||||
placeholder="请选择备货时间"> |
||||
</el-date-picker> |
||||
</el-form-item> |
||||
</el-col> |
||||
</el-row> |
||||
<el-row> |
||||
<el-col :span="24"> |
||||
<el-form-item label="备注:" prop="remarks"> |
||||
<el-input |
||||
type="textarea" |
||||
:rows="2" |
||||
placeholder="请输入内容" |
||||
v-model="form.remarks"> |
||||
</el-input> |
||||
</el-form-item> |
||||
</el-col> |
||||
</el-row> |
||||
|
||||
</el-form> |
||||
</div> |
||||
|
||||
<div style="margin: 2%" v-if="bbb"> |
||||
<el-form ref="form" :model="form" label-width="100px" style="margin: 3px"> |
||||
<el-row> |
||||
<el-col :span="6"> |
||||
<el-form-item label="外协来源:" prop="goodsShelfId"> |
||||
<el-select v-model="form.tripartiteSource" placeholder="请选择来源"> |
||||
<el-option |
||||
v-for="item in tripartiteSourceData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictValue"> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="司机名称:" prop="goodsShelfId"> |
||||
<el-input v-model="form.driverName" placeholder="请输入司机名称"></el-input> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="司机电话:" prop="goodsShelfId"> |
||||
<el-input v-model="form.driverPhone" placeholder="请输入本次费用"></el-input> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="车辆车牌:" prop="goodsShelfId"> |
||||
<el-input v-model="form.vehicleNum" placeholder="请输入本次费用"></el-input> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="配送费用:" prop="goodsShelfId"> |
||||
<el-input v-model="form.deliveryFee" placeholder="请输入本次费用"></el-input> |
||||
</el-form-item> |
||||
</el-col> |
||||
</el-row> |
||||
<el-row> |
||||
<el-col :span="6"> |
||||
<el-form-item label="叉车司机:" prop="forklift"> |
||||
<el-select v-model="form.forklift" placeholder="请选择叉车司机"> |
||||
<el-option |
||||
v-for="item in this.forkliftData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictKey"> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="装卸班组:" prop="loader"> |
||||
<el-select v-model="form.loader" placeholder="请选择装卸班组"> |
||||
<el-option |
||||
v-for="item in loaderData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictKey"> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="3"> |
||||
<!-- <el-radio-group v-model="form.loadAndUnload" >--> |
||||
<!-- <el-radio v-for="item in this.loadAndUnloadData" :label="item.dictValue" :value="item.dictKey"></el-radio>--> |
||||
<!-- </el-radio-group>--> |
||||
<el-checkbox-group v-model="form.loadAndUnload"> |
||||
<el-checkbox v-for="item in loadAndUnloadData" :label="item.dictKey" :value="item.dictKey"> |
||||
{{item.dictValue}} |
||||
</el-checkbox> |
||||
</el-checkbox-group> |
||||
</el-col> |
||||
</el-row> |
||||
<el-row> |
||||
<el-col :span="6"> |
||||
<el-form-item label="备货区域:" prop="goodsAreaId"> |
||||
<el-select v-model="form.goodsAreaId" placeholder="请选择备货区域"> |
||||
<el-option |
||||
v-for="item in goodsAreaData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictKey"> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="备货时间:" prop="goodsShelfId"> |
||||
<el-date-picker |
||||
v-model="form.stockupDate" |
||||
type="date" |
||||
placeholder="请选择备货时间"> |
||||
</el-date-picker> |
||||
</el-form-item> |
||||
</el-col> |
||||
</el-row> |
||||
<el-row> |
||||
<el-col :span="24"> |
||||
<el-form-item label="备注:" prop="remarks"> |
||||
<el-input |
||||
type="textarea" |
||||
:rows="2" |
||||
placeholder="请输入内容" |
||||
v-model="form.remarks"> |
||||
</el-input> |
||||
</el-form-item> |
||||
</el-col> |
||||
</el-row> |
||||
</el-form> |
||||
</div> |
||||
<div > |
||||
<el-row> |
||||
<!-- 列表模块 --> |
||||
<!-- <el-table--> |
||||
<!-- :data="data"--> |
||||
<!-- :height="height"--> |
||||
<!-- :border="option.border"--> |
||||
<!-- style="width: 100%">--> |
||||
<!-- <template v-for="(item,index) in option.column">--> |
||||
<!-- <!– table字段 –>--> |
||||
<!-- <el-table-column v-if="item.hide!==true"--> |
||||
<!-- :prop="item.prop"--> |
||||
<!-- :label="item.label"--> |
||||
<!-- :width="item.width"--> |
||||
<!-- :key="index">--> |
||||
<!-- </el-table-column>--> |
||||
<!-- </template>--> |
||||
<!-- </el-table>--> |
||||
<el-table ref="table" v-loading="loading" |
||||
:data="data" |
||||
style="width: 100%; height:100%" |
||||
:border="option.border"> |
||||
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column> |
||||
<el-table-column v-if="option.index" label="序号" type="index" width="80px" |
||||
align="center"></el-table-column> |
||||
|
||||
<template v-for="(item,index) in option.column"> |
||||
<!-- table字段 --> |
||||
<el-table-column v-if="item.hide!==true" |
||||
:prop="item.prop" |
||||
:label="item.label" |
||||
:width="item.width" |
||||
:key="index"> |
||||
</el-table-column> |
||||
</template> |
||||
<!-- 操作栏模块 --> |
||||
</el-table> |
||||
</el-row> |
||||
<el-form-item style="margin-left: 45%;margin-top: 10px"> |
||||
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder">提交(配送内容)</el-button> |
||||
<el-button icon="el-icon-circle-close" @click="this.$router.go(-1)">返 回</el-button> |
||||
</el-form-item> |
||||
</div> |
||||
|
||||
<el-dialog |
||||
title="司机配置" |
||||
v-model="isDriverShow" |
||||
width="50%" |
||||
|
||||
> |
||||
<div style="display: flex"> |
||||
<div style="flex:1;"> |
||||
<el-table ref="multipleTable" v-loading="loading" |
||||
:data="driverInfo" |
||||
style="width: 100%; " |
||||
:border="option.border" |
||||
@select-all="handleSelect" |
||||
@selection-change="selectionDriverChange" |
||||
@select="handleSelect"> |
||||
<!-- @selection-change="handleSelectionChange" |
||||
@selection-change="handleCurrentChange" |
||||
--> |
||||
<!-- <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>--> |
||||
<!-- <el-table-column v-if="option.index" label="序号" type="index" width="80px"--> |
||||
<!-- align="center"></el-table-column>--> |
||||
|
||||
<!-- <el-table-column label="预约数量" type="index" width="200px">--> |
||||
<!-- <template #="{row}">--> |
||||
<el-table-column type="selection" v-if="option.selection" width="55" |
||||
align="center"></el-table-column> |
||||
<!-- </template>--> |
||||
<!-- </el-table-column>--> |
||||
<template v-for="(item,index) in option.columnDriverInfo"> |
||||
<!-- table字段 --> |
||||
<el-table-column v-if="item.hide!==true" |
||||
:prop="item.prop" |
||||
:label="item.label" |
||||
:width="item.width" |
||||
:key="index"> |
||||
</el-table-column> |
||||
</template> |
||||
<!-- 操作栏模块 --> |
||||
</el-table> |
||||
</div> |
||||
<div style="flex:1;"> |
||||
<el-table ref="table" v-loading="loading" |
||||
:data="vehticleInfo" |
||||
style="width: 100%; " |
||||
:border="option.border"> |
||||
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column> |
||||
<template v-for="(item,index) in option.columnVehicleInfo"> |
||||
<!-- table字段 --> |
||||
<el-table-column v-if="item.hide!==true" |
||||
:prop="item.prop" |
||||
:label="item.label" |
||||
:width="item.width" |
||||
:key="index"> |
||||
</el-table-column> |
||||
</template> |
||||
<!-- 操作栏模块 --> |
||||
<el-table-column label="预约数量" type="index" width="200px"> |
||||
<template #="{row}"> |
||||
<span> |
||||
<!-- <el-button type="primary" text size="small" @click="MoveUpVehictle(row)">置顶--> |
||||
<!-- </el-button>--> |
||||
<el-button type="primary" text size="small" @click="moveUpVehictle(row)">上移 |
||||
</el-button> |
||||
</span> |
||||
</template> |
||||
</el-table-column> |
||||
</el-table> |
||||
</div> |
||||
</div> |
||||
|
||||
|
||||
<el-form-item style="margin-left: 45%;margin-top: 10px"> |
||||
<span slot="footer" class="dialog-footer"> |
||||
<el-button type="primary" @click="confirmDriver">确 定</el-button> |
||||
<el-button @click="isDriverShow = false">取 消</el-button> |
||||
</span> |
||||
</el-form-item> |
||||
</el-dialog> |
||||
|
||||
</template> |
||||
|
||||
|
||||
<script> |
||||
import { getDictionaryBiz } from '@/api/system/dict'; |
||||
import option from '@/option/distribution/distributionReservation'; |
||||
import { getListTeam } from '@/api/basicdata/basicdataTeamGroup'; |
||||
import { |
||||
getReservationAddr, |
||||
deliveryTask |
||||
} from '@/api/distribution/distributionReservation'; |
||||
import { getListUser } from '@/api/distribution/distributionStockup'; |
||||
import { getPostList } from '@/api/system/post'; |
||||
import { getListOwn } from '@/api/system/user'; |
||||
import { stockUp } from '@/api/basicdata/basicdataGoodsArea'; |
||||
import { getVehicleList } from '@/api/basicdata/basicdataVehicle'; |
||||
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; |
||||
// import { ref } from 'vue' |
||||
export default { |
||||
data() { |
||||
return { |
||||
height: 0, |
||||
loading: false, |
||||
ids: null, |
||||
error: null, |
||||
form: {}, |
||||
data: [], |
||||
page: { |
||||
currentPage: 1, |
||||
pageSize: 10, |
||||
total: 40 |
||||
}, |
||||
aaa: true, |
||||
bbb: false, |
||||
option: option, |
||||
deliveryTypeData: [], |
||||
//配送类型字典列表 |
||||
resvervationStatusData: [], |
||||
//备货状态 |
||||
stockupStatusData: [], |
||||
//订单来源 |
||||
orderSourceData: [], |
||||
//预约时段 |
||||
periodOfTimeData: [], |
||||
//配送方式 |
||||
deliveryWayData: [], |
||||
//服务内容 |
||||
addvalueServeTypeData: [], |
||||
//基础车辆信息 |
||||
vehicleData: [], |
||||
//叉车信息 |
||||
forkliftData: [], |
||||
//班组信息 |
||||
loaderData: [], |
||||
//备货区信息 |
||||
goodsAreaData: [], |
||||
//部门信息 |
||||
deptId: '', |
||||
//司机信息 |
||||
driverData: [], |
||||
//装卸班组 |
||||
loadAndUnloadData: [], |
||||
//装卸 |
||||
tripartiteSourceData: [], |
||||
//装卸只能 |
||||
loadAndUnload: [], |
||||
//车辆信息 |
||||
vehicleIds: [], |
||||
//配送司机信息 |
||||
deliveryDriver: [], |
||||
//司机配置 |
||||
isDriverShow: false, |
||||
//车辆表格信息 |
||||
driverInfo: [], |
||||
//司机表格信息 |
||||
vehticleInfo: [], |
||||
//主司机 |
||||
masterDriverName: '', |
||||
//主车辆 |
||||
masterVehictleName: '', |
||||
//司机配置选中行信息 |
||||
multipleSelection: [], |
||||
// |
||||
multipleTable: {}, |
||||
driverList: [], |
||||
vehticleList: [] |
||||
|
||||
}; |
||||
}, |
||||
created() { |
||||
this.$watch( |
||||
() => this.$route.params, |
||||
() => { |
||||
this.fetchData(); |
||||
}, |
||||
// 组件创建完后获取数据， |
||||
// 此时 data 已经被 observed 了 |
||||
{ immediate: true } |
||||
); |
||||
|
||||
|
||||
this.getDictionary(); |
||||
this.getFork(); |
||||
this.getTeam(); |
||||
this.getvehicleData(); |
||||
this.getMasterDriverData(); |
||||
}, |
||||
computed: {}, |
||||
|
||||
mounted() { |
||||
this.onLoad(); |
||||
}, |
||||
methods: { |
||||
fetchData() { |
||||
this.error = this.post = null; |
||||
this.loading = true; |
||||
if (this.$route.query.id) { |
||||
this.ids = this.$route.query.id; |
||||
} |
||||
}, |
||||
//查询叉车人员 |
||||
async getFork() { |
||||
let ides = ''; |
||||
let ide = {}; |
||||
await getListUser().then(res => { |
||||
console.log('res>>>', res.data.data); |
||||
ides = res.data.data.tenantId; |
||||
this.deptId = res.data.data.deptId; |
||||
}); |
||||
await getPostList(ides).then(res => { |
||||
console.log('>>>>', res.data.data); |
||||
// this.forkliftData = res.data.data; |
||||
res.data.data.forEach(i => { |
||||
if (i.postName == '叉车') { |
||||
ide = i; |
||||
} |
||||
}); |
||||
}); |
||||
// console.log("ied>>>>>",ide); |
||||
let params = { |
||||
postId: ide.id, //岗位 |
||||
deptId: this.deptId //部门 |
||||
// roleId: '', //角色 |
||||
}; |
||||
getListOwn(Object.assign(params, this.query)).then(res => { |
||||
// console.log(".............",res.data.data); |
||||
let fo = []; |
||||
res.data.data.forEach(i => { |
||||
let a = { |
||||
dictKey: i.id, |
||||
dictValue: i.name |
||||
}; |
||||
fo.push(a); |
||||
}); |
||||
this.forkliftData = fo; |
||||
}); |
||||
await this.getStorageArea(); |
||||
await this.getTeam(); |
||||
}, |
||||
//查询班组 |
||||
async getTeam() { |
||||
let params = { |
||||
department: this.deptId |
||||
}; |
||||
getListTeam(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => { |
||||
let fo = []; |
||||
res.data.data.records.forEach(i => { |
||||
let a = { |
||||
dictKey: i.id, |
||||
dictValue: i.name + '-' + i.groupName |
||||
}; |
||||
fo.push(a); |
||||
}); |
||||
this.loaderData = fo; |
||||
}); |
||||
}, |
||||
//备货区 |
||||
async getStorageArea() { |
||||
let params = { |
||||
department: this.deptId |
||||
}; |
||||
stockUp(params).then(res => { |
||||
let fo = []; |
||||
res.data.data.forEach(i => { |
||||
let v = { |
||||
dictKey: i.id, |
||||
dictValue: i.name + '-' + i.headline |
||||
}; |
||||
fo.push(v); |
||||
}); |
||||
this.goodsAreaData = fo; |
||||
}); |
||||
}, |
||||
//查询司机信息 |
||||
getMasterDriverData() { |
||||
getDriverList(1, 10, '').then(res => { |
||||
this.driverData = res.data.data.records; |
||||
}); |
||||
}, |
||||
//查询车辆信息 |
||||
getvehicleData() { |
||||
getVehicleList(1, 10, '').then(res => { |
||||
this.vehicleData = res.data.data.records; |
||||
console.log(res.data.data); |
||||
}); |
||||
}, |
||||
viewDriverInfo() { |
||||
console.log(this.driverInfo.length); |
||||
console.log(this.vehticleInfo.length); |
||||
if (this.driverList.length !== this.vehticleList.length) { |
||||
this.$message({ |
||||
message: '司机车辆数量有误!!!', |
||||
type: 'warning' |
||||
}); |
||||
return; |
||||
} |
||||
this.isDriverShow = true; |
||||
}, |
||||
handleClose(done) { |
||||
this.$confirm('确认关闭？') |
||||
.then(_ => { |
||||
done(); |
||||
}) |
||||
.catch(_ => { |
||||
}); |
||||
}, |
||||
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.form.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.form.masterDriverName = item.name; |
||||
} |
||||
}); |
||||
this.driverInfo = a; |
||||
} |
||||
|
||||
}, |
||||
//上移 |
||||
moveUpVehictle(row) { |
||||
console.log(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' |
||||
}); |
||||
} |
||||
}, |
||||
selectionDriverChange(list){ |
||||
this.multipleSelection = list; |
||||
}, |
||||
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 i = 0; |
||||
this.driverInfo.forEach((item,index)=> { |
||||
if (item.id === this.multipleSelection[0].id) { |
||||
i = index; |
||||
} |
||||
}); |
||||
this.form.masterDriverName = this.driverInfo[i].name; |
||||
this.form.masterVehicleNub = this.vehticleInfo[i].vehicleNub; |
||||
|
||||
}, |
||||
// //数据字典数据获取 |
||||
getDictionary() { |
||||
getDictionaryBiz('addvalue_serve_type').then(res => { |
||||
this.addvalueServeTypeData = res.data.data; |
||||
}); |
||||
getDictionaryBiz('distribution_type').then(res => { |
||||
this.deliveryTypeData = res.data.data; |
||||
}); |
||||
//订单来源 |
||||
getDictionaryBiz('order_source').then(res => { |
||||
this.orderSourceData = res.data.data; |
||||
console.log(this.deliveryTypeData); |
||||
}); |
||||
//预约状态 |
||||
getDictionaryBiz('resvervation_status').then(res => { |
||||
this.resvervationStatusData = res.data.data; |
||||
}); |
||||
//备货状态 |
||||
getDictionaryBiz('stockup_status').then(res => { |
||||
this.stockupStatusData = res.data.data; |
||||
}); |
||||
//时段 |
||||
getDictionaryBiz('period_of_time').then(res => { |
||||
this.periodOfTimeData = res.data.data; |
||||
}); |
||||
getDictionaryBiz('delivery_way').then(res => { |
||||
this.deliveryWayData = res.data.data; |
||||
}); |
||||
getDictionaryBiz('load_and_unload').then(res => { |
||||
this.loadAndUnloadData = res.data.data; |
||||
}); |
||||
//三方外协来源 |
||||
getDictionaryBiz('tripartite_source').then(res => { |
||||
this.tripartiteSourceData = res.data.data; |
||||
}); |
||||
}, |
||||
|
||||
ccc() { |
||||
this.aaa = true; |
||||
this.bbb = false; |
||||
this.form = {}; |
||||
this.loadAndUnload = []; |
||||
}, |
||||
ddd() { |
||||
this.aaa = false; |
||||
this.bbb = true; |
||||
this.form = {}; |
||||
this.loadAndUnload = []; |
||||
|
||||
}, |
||||
onSubmitOrder() { |
||||
const params = this.form; |
||||
let stockup = {}; |
||||
let tripartite = {}; |
||||
let data = {}; |
||||
|
||||
let allocationInfo = []; |
||||
//备货区数据构建 |
||||
if (params.loader) { |
||||
this.loaderData.forEach(a => { |
||||
if (params.loader === a.dictKey) { |
||||
stockup.loaderName = a.dictValue; |
||||
stockup.loaderId = a.dictKey; |
||||
} |
||||
}); |
||||
data.stockup = stockup; |
||||
} |
||||
if (params.forklift){ |
||||
this.forkliftData.forEach(b => { |
||||
if (params.forklift === b.dictKey) { |
||||
stockup.forkliftName = b.dictValue; |
||||
stockup.forkliftId = b.dictKey; |
||||
} |
||||
}); |
||||
data.stockup = stockup; |
||||
} |
||||
|
||||
if (params.goodsAreaId){ |
||||
|
||||
this.goodsAreaData.forEach(c => { |
||||
if (params.goodsAreaId === c.dictKey) { |
||||
stockup.goodsAreaId = c.dictKey; |
||||
stockup.goodsAreaName = c.dictValue; |
||||
} |
||||
|
||||
}); |
||||
data.stockup = stockup; |
||||
} |
||||
if (params.stockupDate) { |
||||
stockup.stockupDate = params.stockupDate; |
||||
data.stockup = stockup; |
||||
} |
||||
if (params.remarks) { |
||||
stockup.remarks = params.remarks; |
||||
data.stockup = stockup; |
||||
} |
||||
if (this.loadAndUnload.length>0){ |
||||
stockup.loadAndUnload = this.loadAndUnload.join(','); |
||||
data.stockup = stockup; |
||||
} |
||||
//判断是否是三方配送 |
||||
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; |
||||
} |
||||
}); |
||||
} |
||||
} else { |
||||
//自主配送数据构建 |
||||
if (this.driverList.length !== this.vehticleList.length) { |
||||
this.$message({ |
||||
message: '司机车辆数量有误!!!', |
||||
type: 'warning' |
||||
}); |
||||
return; |
||||
} else { |
||||
let info = []; |
||||
for (let i = 0; i < this.driverInfo.length; i++) { |
||||
let obj = {}; |
||||
obj.driver = this.driverInfo[i].name; |
||||
obj.driverId = this.driverInfo[i].id; |
||||
obj.driverPhone=this.driverInfo[i].phone; |
||||
obj.vehicleNub = this.vehticleInfo[i].vehicleNub; |
||||
obj.vehicleId = this.vehticleInfo[i].id; |
||||
info.push(obj); |
||||
this.driverInfo[i].name; |
||||
} |
||||
allocationInfo = info; |
||||
} |
||||
} |
||||
|
||||
// data.stockup = stockup; |
||||
data.masterDriverName = this.form.masterDriverName; |
||||
data.masterVehicleNub = this.form.masterVehicleNub; |
||||
data.allocationInfo = allocationInfo; |
||||
data.tripartite = tripartite; |
||||
data.reservationIds = this.ids; |
||||
console.log(data); |
||||
deliveryTask(data).then((res) => { |
||||
this.$router.push({ |
||||
path: '/distribution/deliverylist/distributionDeliveryListmar', |
||||
name:'配送市配列表' |
||||
}); |
||||
}); |
||||
}, |
||||
onLoad() { |
||||
this.loading = false; |
||||
if (this.ids){ |
||||
getReservationAddr(this.ids).then(res => { |
||||
const data = res.data.data; |
||||
data.forEach(item => { |
||||
// this.orderSourceData.forEach(a => { |
||||
// console.log("#######",a); |
||||
// if (item.orderSource === a.dictKey) { |
||||
// item.orderSource = a.dictValue; |
||||
// } |
||||
// }); |
||||
this.stockupStatusData.forEach(b => { |
||||
if (item.stockupStatus === b.dictKey) { |
||||
item.stockupStatus = b.dictValue; |
||||
} |
||||
}); |
||||
this.resvervationStatusData.forEach(e => { |
||||
if (item.reservationStatus === e.dictKey) { |
||||
item.reservationStatus = e.dictValue; |
||||
} |
||||
}); |
||||
this.deliveryTypeData.forEach(c => { |
||||
if (item.deliveryType === c.dictKey) { |
||||
item.deliveryType = c.dictValue; |
||||
} |
||||
}); |
||||
|
||||
this.deliveryWayData.forEach(c => { |
||||
if (item.deliveryWay === c.dictKey) { |
||||
item.deliveryWay = c.dictValue; |
||||
} |
||||
}); |
||||
this.periodOfTimeData.forEach(d => { |
||||
if (item.periodOfTime === d.dictKey) { |
||||
item.periodOfTime = d.dictValue; |
||||
} |
||||
}); |
||||
let pa = []; |
||||
if (item.serveType.length >= 1) { |
||||
pa = item.serveType.split(','); |
||||
} else { |
||||
pa.push(item.serveType); |
||||
} |
||||
this.addvalueServeTypeData.forEach(f => { |
||||
pa.forEach((p, index) => { |
||||
if (p === f.dictKey) { |
||||
pa[index] = f.dictValue; |
||||
} |
||||
}); |
||||
}); |
||||
item.serveType = pa; |
||||
}); |
||||
console.log('>>>>>>>>', data); |
||||
this.page.total = data.total; |
||||
this.data = data; |
||||
console.log('>>>>>>>>>>>', this.data); |
||||
this.loading = false; |
||||
}); |
||||
} |
||||
} |
||||
} |
||||
}; |
||||
</script> |
||||
|
||||
<style scoped> |
||||
|
||||
</style> |
||||
|
||||
@ -0,0 +1,947 @@
|
||||
<template> |
||||
<div class="head_top"> |
||||
<div @click="ccc" :class="aaa?'buts check':'buts'"> |
||||
自主配送 |
||||
</div> |
||||
<div @click="ddd" :class="bbb?'buts check':'buts'"> |
||||
外协 |
||||
</div> |
||||
</div> |
||||
<div style="margin: 2%;background-color: #ffffff;padding: 20px;box-sizing: border-box;" v-if="aaa"> |
||||
<el-form ref="form" :model="driverForm" label-width="100px" style="margin: 3px"> |
||||
<el-row> |
||||
<el-col :span="6"> |
||||
<el-form-item label="车辆信息:" prop="vehicleIds"> |
||||
<el-select |
||||
filterable |
||||
multiple |
||||
v-model="vehicleIds" |
||||
placeholder="请选择车辆" |
||||
@change="changeVehicle" |
||||
> |
||||
<el-option |
||||
v-for="item in vehicleData" |
||||
:key="item.id" |
||||
:label="item.vehicleNub" |
||||
:value="item.id" |
||||
> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="配送司机信息:" prop="goodsShelfId"> |
||||
<!-- @change="changeSlaveDriver"--> |
||||
<el-select |
||||
v-model="deliveryDriver" |
||||
multiple |
||||
filterable |
||||
@change="changeDriver" |
||||
|
||||
placeholder="请选择司机" |
||||
> |
||||
<el-option |
||||
v-for="item in driverData" |
||||
:key="item.id" |
||||
:label="item.name" |
||||
:value="item.id" |
||||
> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<span> |
||||
<el-form-item label="主司机:" prop="forklift"> |
||||
<el-input v-model="driverForm.masterDriverName" :disabled="true"> </el-input> |
||||
</el-form-item> |
||||
<el-form-item label="主车辆:" prop="forklift"> |
||||
<el-input v-model="driverForm.masterVehicleNub" :disabled="true"> </el-input> |
||||
</el-form-item> |
||||
</span> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-button round @click="viewDriverInfo" style="margin-left: 10%">查看司机配置</el-button> |
||||
</el-col> |
||||
</el-row> |
||||
</el-form> |
||||
</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-row> |
||||
<el-col :span="6"> |
||||
<el-form-item label="外协来源:" prop="goodsShelfId"> |
||||
<el-select filterable v-model="driverForm.tripartiteSource" placeholder="请选择来源"> |
||||
<el-option |
||||
v-for="item in tripartiteSourceData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictKey" |
||||
> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="司机名称:" prop="goodsShelfId"> |
||||
<el-input v-model="driverForm.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-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="车辆车牌:" prop="goodsShelfId"> |
||||
<el-input v-model="driverForm.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-form-item> |
||||
</el-col> |
||||
</el-row> |
||||
</el-form> |
||||
</div> |
||||
<div style="margin: 2%;background-color: #ffffff;padding: 20px;box-sizing: border-box;"> |
||||
<el-form ref="form" :model="stockUpForm" label-width="100px" style="margin: 3px"> |
||||
<el-row> |
||||
<el-col :span="6"> |
||||
<el-form-item label="叉车司机:" prop="forklift"> |
||||
<el-select filterable v-model="stockUpForm.forklift" placeholder="请选择叉车司机"> |
||||
<el-option |
||||
v-for="item in this.forkliftData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictKey" |
||||
:disabled="isDisable" |
||||
> |
||||
</el-option> |
||||
<!-- {{this.forkliftData}}--> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="装卸班组:" prop="loader"> |
||||
<el-select filterable v-model="stockUpForm.loader" placeholder="请选择装卸班组"> |
||||
<el-option |
||||
v-for="item in loaderData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictKey" |
||||
:disabled="isDisable" |
||||
> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="班组职能:" prop="goodsAreaId"> |
||||
<el-checkbox-group v-model="loadAndUnload"> |
||||
<el-checkbox |
||||
v-for="item in loadAndUnloadData" |
||||
:label="item.dictKey" |
||||
:value="item.dictKey" |
||||
:disabled="isDisable" |
||||
> |
||||
<span>{{ item.dictValue }}</span> |
||||
</el-checkbox> |
||||
</el-checkbox-group> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="配送类型:" prop="goodsAreaId"> |
||||
<el-radio-group v-model="stockUpForm.deliveryType"> |
||||
<el-radio :label="'2'" :value="'2'">市配  </el-radio> |
||||
</el-radio-group> |
||||
</el-form-item> |
||||
</el-col> |
||||
</el-row> |
||||
<el-row> |
||||
<el-col :span="6"> |
||||
<el-form-item label="备货区域:" prop="goodsAreaId"> |
||||
<el-select filterable v-model="stockUpForm.goodsAreaId" placeholder="请选择备货区域"> |
||||
<el-option |
||||
v-for="item in goodsAreaData" |
||||
:key="item.dictKey" |
||||
:label="item.dictValue" |
||||
:value="item.dictKey" |
||||
:disabled="isDisable" |
||||
> |
||||
</el-option> |
||||
</el-select> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="备货时间:" prop="goodsShelfId"> |
||||
<el-date-picker v-model="stockUpForm.stockupDate" type="datetime" placeholder="请选择备货时间" :disabled="isDisable"> |
||||
</el-date-picker> |
||||
</el-form-item> |
||||
</el-col> |
||||
<el-col :span="6"> |
||||
<el-form-item label="出库时间:" prop="outboundDate" 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="stockUpForm.outboundDate" value-format="YYYY-MM-DD HH:mm:ss" 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> |
||||
</el-col> |
||||
</el-row> |
||||
|
||||
<el-row> |
||||
<el-col :span="24"> |
||||
<el-form-item label="备注:" prop="remarks"> |
||||
<el-input type="textarea" :rows="1" placeholder="请输入内容" v-model="stockUpForm.remarks"> |
||||
</el-input> |
||||
</el-form-item> |
||||
</el-col> |
||||
</el-row> |
||||
</el-form> |
||||
</div> |
||||
<h3>预约列表</h3> |
||||
<div > |
||||
<el-row> |
||||
<el-table ref="table" v-loading="loading" |
||||
:data="data" |
||||
style="width: 100%; height:100%" |
||||
:border="option.border"> |
||||
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column> |
||||
<el-table-column v-if="option.index" label="序号" type="index" width="80px" |
||||
align="center"></el-table-column> |
||||
|
||||
<template v-for="(item,index) in option.column"> |
||||
<!-- table字段 --> |
||||
<el-table-column v-if="item.hide!==true" |
||||
:prop="item.prop" |
||||
:label="item.label" |
||||
:width="item.width" |
||||
:key="index"> |
||||
</el-table-column> |
||||
</template> |
||||
<!-- 操作栏模块 --> |
||||
</el-table> |
||||
</el-row> |
||||
<el-form-item style="margin-left: 45%;margin-top: 10px"> |
||||
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder">提交(配送内容)</el-button> |
||||
<el-button icon="el-icon-circle-close" @click="this.$router.go(-1)">返 回</el-button> |
||||
</el-form-item> |
||||
</div> |
||||
|
||||
<el-dialog title="司机配置" v-model="isDriverShow" width="50%"> |
||||
<div style="display: flex"> |
||||
<div style="flex: 1"> |
||||
<el-table |
||||
ref="multipleTable" |
||||
v-loading="loading" |
||||
:data="driverInfo" |
||||
style="width: 100%" |
||||
:border="option.border" |
||||
@select-all="handleSelect" |
||||
@select="handleSelect" |
||||
> |
||||
<el-table-column |
||||
type="selection" |
||||
v-if="option.selection" |
||||
width="55" |
||||
align="center" |
||||
|
||||
></el-table-column> |
||||
<template v-for="(item, index) in option.columnDriverInfo"> |
||||
<!-- table字段 --> |
||||
<el-table-column |
||||
v-if="item.hide !== true" |
||||
:prop="item.prop" |
||||
:label="item.label" |
||||
:width="item.width" |
||||
:key="index" |
||||
style="height: 50px" |
||||
|
||||
> |
||||
</el-table-column> |
||||
</template> |
||||
<!-- 操作栏模块 --> |
||||
</el-table> |
||||
</div> |
||||
<div style="flex: 1"> |
||||
<el-table |
||||
ref="table" |
||||
v-loading="loading" |
||||
:data="vehticleInfo" |
||||
style="width: 100%" |
||||
:border="option.border" |
||||
> |
||||
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column> |
||||
<template v-for="(item, index) in option.columnVehicleInfo"> |
||||
<!-- table字段 --> |
||||
<el-table-column |
||||
v-if="item.hide !== true" |
||||
:prop="item.prop" |
||||
:label="item.label" |
||||
:width="item.width" |
||||
:key="index" |
||||
style="height: 50px" |
||||
> |
||||
</el-table-column> |
||||
</template> |
||||
<!-- 操作栏模块 --> |
||||
<el-table-column label="预约数量" type="index" width="200px"> |
||||
<template #="{ row }"> |
||||
<span> |
||||
<el-button type="primary" text size="small" @click="moveUpVehictle(row)" |
||||
>上移 |
||||
</el-button> |
||||
</span> |
||||
</template> |
||||
</el-table-column> |
||||
</el-table> |
||||
</div> |
||||
</div> |
||||
|
||||
<el-form-item style="margin-left: 45%; margin-top: 10px"> |
||||
<span slot="footer" class="dialog-footer"> |
||||
<el-button type="primary" @click="confirmDriver">确 定</el-button> |
||||
<el-button @click="isDriverShow = false">取 消</el-button> |
||||
</span> |
||||
</el-form-item> |
||||
</el-dialog> |
||||
</template> |
||||
|
||||
<script> |
||||
import { getDictionaryBiz } from '@/api/system/dict'; |
||||
import option from '@/option/distribution/distributionReservation'; |
||||
import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup'; |
||||
import { deliveryTask, getReservationAddr } from '@/api/distribution/distributionReservation'; |
||||
import { getListUser } from '@/api/distribution/distributionStockup'; |
||||
import { getPostList } from '@/api/system/post'; |
||||
import { getListOwn } from '@/api/system/user'; |
||||
import { stockUpInfo } from '@/api/basicdata/basicdataGoodsArea'; |
||||
import { getVehicleList } from '@/api/basicdata/basicdataVehicle'; |
||||
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; |
||||
import { mapGetters } from 'vuex'; |
||||
import dayjs from 'dayjs'; |
||||
|
||||
export default { |
||||
data() { |
||||
return { |
||||
height: 0, |
||||
loading: false, |
||||
error: null, |
||||
form: {}, |
||||
driverForm:{}, |
||||
stockUpForm:{}, |
||||
data: [], |
||||
// 分页信息 |
||||
page: { |
||||
currentPage: 1, |
||||
pageSize: 10, |
||||
total: 40 |
||||
}, |
||||
|
||||
query:{}, |
||||
aaa: true, |
||||
bbb: false, |
||||
option: option, |
||||
deliveryTypeData: [], |
||||
//配送类型字典列表 |
||||
resvervationStatusData: [], |
||||
//备货状态 |
||||
stockupStatusData: [], |
||||
//订单来源 |
||||
orderSourceData: [], |
||||
//预约时段 |
||||
periodOfTimeData: [], |
||||
//配送方式 |
||||
deliveryWayData: [], |
||||
//服务内容 |
||||
addvalueServeTypeData: [], |
||||
//基础车辆信息 |
||||
vehicleData: [], |
||||
//叉车信息 |
||||
forkliftData: [], |
||||
//班组信息 |
||||
loaderData: [], |
||||
//备货区信息 |
||||
goodsAreaData: [], |
||||
//部门信息 |
||||
deptId: '', |
||||
//司机信息 |
||||
driverData: [], |
||||
//装卸班组 |
||||
loadAndUnloadData: [], |
||||
//装卸 |
||||
tripartiteSourceData: [], |
||||
//装卸只能 |
||||
loadAndUnload: [], |
||||
//车辆信息 |
||||
vehicleIds: [], |
||||
//配送司机信息 |
||||
deliveryDriver: [], |
||||
//司机配置 |
||||
isDriverShow: false, |
||||
//车辆表格信息 |
||||
driverInfo: [], |
||||
//司机表格信息 |
||||
vehticleInfo: [], |
||||
//主司机 |
||||
masterDriverName: '', |
||||
//主车辆 |
||||
masterVehictleName: '', |
||||
//司机配置选中行信息 |
||||
multipleSelection: [], |
||||
// |
||||
multipleTable: {}, |
||||
stockArticleTable: [], |
||||
stockArticleList:[], |
||||
driverList: [], |
||||
vehticleList: [], |
||||
packageList:[], |
||||
//订单数据 |
||||
orderData:[], |
||||
//库存品数据 |
||||
inventoryData:[], |
||||
// |
||||
selectionList:[], |
||||
addvalue: {}, |
||||
//订单弹窗 |
||||
orderShow:false, |
||||
//库存品弹窗 |
||||
stockListShow:false, |
||||
//在库订单数据 |
||||
stockArticleInfo:[], |
||||
//库存品信息列表 |
||||
inventoryInfo:[], |
||||
//包件弹窗控制 |
||||
isShowPackage:false, |
||||
//包件数据 |
||||
packageData:[], |
||||
//班组职能 |
||||
loadAndUnload:[], |
||||
//服务类型 |
||||
serveType:[], |
||||
//外协数据来源 |
||||
tripartiteSourceData:[], |
||||
deliveryListId:'', |
||||
isDisable:false, |
||||
checked:true, |
||||
reservationIds:'', |
||||
obj:{ |
||||
type:Object, |
||||
default:()=>({}) |
||||
}, |
||||
isInitialized:false, |
||||
isUpdate:false, |
||||
}; |
||||
}, |
||||
watch:{ |
||||
// obj:{ |
||||
// deep:true, |
||||
// handler(newVal,oldVal){ |
||||
// if (this.isInitialized){ |
||||
// console.log('输入框的值'+JSON.stringify(oldVal)+'从变成了'+JSON.stringify(newVal)); |
||||
// //这里就需要返回一个false; |
||||
// this.isUpdate = true; |
||||
// }else { |
||||
// this.isInitialized=true; |
||||
// } |
||||
// } |
||||
// } |
||||
}, |
||||
created() { |
||||
this.$watch( |
||||
() => this.$route.params, |
||||
() => { |
||||
this.fetchData(); |
||||
}, |
||||
// 组件创建完后获取数据， |
||||
// 此时 data 已经被 observed 了 |
||||
{ immediate: true } |
||||
); |
||||
this.getDictionary(); |
||||
this.getFork(); |
||||
this.getTeam(); |
||||
this.getvehicleData(); |
||||
this.getMasterDriverData(); |
||||
}, |
||||
computed: { |
||||
...mapGetters(['permission']), |
||||
ids() { |
||||
let ids = []; |
||||
this.selectionList.forEach(ele => { |
||||
ids.push(ele.id); |
||||
}); |
||||
return ids.join(','); |
||||
} |
||||
}, |
||||
|
||||
mounted() { |
||||
this.onLoad(this.page); |
||||
}, |
||||
methods: { |
||||
//查询叉车人员 |
||||
async getFork() { |
||||
let ides = ''; |
||||
let ide = {}; |
||||
await getListUser().then(res => { |
||||
console.log('res>>>', res.data.data); |
||||
ides = res.data.data.tenantId; |
||||
this.deptId = res.data.data.deptId; |
||||
}); |
||||
await getPostList(ides).then(res => { |
||||
console.log('>>>>', res.data.data); |
||||
// this.forkliftData = res.data.data; |
||||
res.data.data.forEach(i => { |
||||
if (i.postName == '叉车') { |
||||
ide = i; |
||||
} |
||||
}); |
||||
}); |
||||
// console.log("ied>>>>>",ide); |
||||
let params = { |
||||
postId: ide.id, //岗位 |
||||
deptId: this.deptId //部门 |
||||
// roleId: '', //角色 |
||||
}; |
||||
getListOwn(Object.assign(params, this.query)).then(res => { |
||||
// console.log(".............",res.data.data); |
||||
let fo = []; |
||||
res.data.data.forEach(i => { |
||||
let a = { |
||||
dictKey: i.id, |
||||
dictValue: i.name |
||||
}; |
||||
fo.push(a); |
||||
}); |
||||
this.forkliftData = fo; |
||||
}); |
||||
await this.getStorageArea(); |
||||
await this.getTeam(); |
||||
}, |
||||
//查询班组 |
||||
async getTeam() { |
||||
let params = this.deptId; |
||||
console.log("%%%%%%%%%",params); |
||||
getListTeamInfo(params).then(res => { |
||||
console.log("aaaaaaaaa",res.data.data); |
||||
let fo = []; |
||||
res.data.data.forEach(i => { |
||||
let a = { |
||||
dictKey: i.id, |
||||
dictValue: i.groupName |
||||
}; |
||||
fo.push(a); |
||||
}); |
||||
this.loaderData = fo; |
||||
}); |
||||
}, |
||||
//备货区 |
||||
async getStorageArea() { |
||||
let params = this.deptId ; |
||||
console.log("^^^^^^^^^^^^^",params); |
||||
stockUpInfo(params).then(res => { |
||||
console.log("=========================》",res); |
||||
let fo = []; |
||||
res.data.data.forEach(i => { |
||||
let v = { |
||||
dictKey: i.id, |
||||
dictValue: i.headline |
||||
}; |
||||
fo.push(v); |
||||
}); |
||||
this.goodsAreaData = fo; |
||||
}); |
||||
}, |
||||
//查询司机信息 |
||||
getMasterDriverData() { |
||||
return new Promise((rv,rev)=>{ |
||||
getDriverList(1, 10, '').then(res => { |
||||
this.driverData = res.data.data.records; |
||||
console.log("===============>",res.data.data); |
||||
rv(res.data.data.records) |
||||
}); |
||||
}) |
||||
}, |
||||
selectionChange(list) { |
||||
//只要这个触发就认定为该包件进行了重新勾选，不论数据是否发生变化 |
||||
this.selectionList = list; |
||||
console.log(" this.selectionList = list", this.selectionList); |
||||
this.orderData.forEach(item=>{ |
||||
if (item.id===this.obj.id){ |
||||
item.isUpdate = true; |
||||
} |
||||
}) |
||||
//这里就为当前选择的订单进行包件信息的添加 |
||||
// this.obj. |
||||
}, |
||||
selectionStockArticleChange(list) { |
||||
this.stockArticleList = list; |
||||
}, |
||||
|
||||
|
||||
//查询车辆信息 |
||||
getvehicleData() { |
||||
return new Promise((rv,rev)=>{ |
||||
getVehicleList(1, 10, '').then(res => { |
||||
this.vehicleData = res.data.data.records; |
||||
console.log("^^^^^^^^^^^^^^^^",res.data.data); |
||||
rv(res.data.data.records) |
||||
}); |
||||
}) |
||||
}, |
||||
fetchData() { |
||||
this.error = this.post = null; |
||||
this.loading = true; |
||||
if (this.$route.query.id) { |
||||
this.reservationIds = this.$route.query.id; |
||||
} |
||||
}, |
||||
viewDriverInfo() { |
||||
console.log(this.driverInfo.length); |
||||
console.log(this.vehticleInfo.length); |
||||
if (this.driverList.length !== this.vehticleList.length) { |
||||
this.$message({ |
||||
message: '司机车辆数量有误!!!', |
||||
type: 'warning' |
||||
}); |
||||
return; |
||||
} |
||||
this.isDriverShow = true; |
||||
}, |
||||
handleClose(done) { |
||||
this.$confirm('确认关闭？') |
||||
.then(_ => { |
||||
done(); |
||||
}) |
||||
.catch(_ => { |
||||
}); |
||||
}, |
||||
onSubmitOrder() { |
||||
let stockup = {}; |
||||
let tripartite = {}; |
||||
let data = {}; |
||||
let allocationInfo = []; |
||||
if (this.driverForm){ |
||||
//这里就表示司机信息存在，那么就需要构建司机的信息 |
||||
//自主配送数据构建 |
||||
if (this.driverList.length !== this.vehticleList.length) { |
||||
this.$message({ |
||||
message: '司机车辆数量有误!!!', |
||||
type: 'warning' |
||||
}); |
||||
return; |
||||
} else { |
||||
let info = []; |
||||
for (let i = 0; i < this.driverInfo.length; i++) { |
||||
let obj = {}; |
||||
obj.driver = this.driverInfo[i].name; |
||||
obj.driverId = this.driverInfo[i].id; |
||||
obj.driverPhone=this.driverInfo[i].phone; |
||||
obj.vehicleNub = this.vehticleInfo[i].vehicleNub; |
||||
obj.vehicleId = this.vehticleInfo[i].id; |
||||
info.push(obj); |
||||
this.driverInfo[i].name; |
||||
} |
||||
allocationInfo = info; |
||||
} |
||||
data.allocationInfo = allocationInfo; |
||||
data.masterDriverName = this.form.masterDriverName; |
||||
data.masterVehicleNub = this.form.masterVehicleNub; |
||||
} |
||||
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; |
||||
} |
||||
} |
||||
data.reservationIds = this.reservationIds; |
||||
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; |
||||
} |
||||
}); |
||||
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 (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); |
||||
} |
||||
} |
||||
}, |
||||
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; |
||||
}); |
||||
}, |
||||
|
||||
ccc() { |
||||
if (this.deliveryListId){ |
||||
//清空司机、车辆信息 |
||||
this.driverForm.tripartiteSource = ''; |
||||
this.driverForm.driverName = ''; |
||||
this.driverForm.driverPhone = ''; |
||||
this.driverForm.vehicleNum = ''; |
||||
this.driverForm.deliveryFee = ''; |
||||
}else { |
||||
this.loadAndUnload = []; |
||||
this.serveType=[]; |
||||
this.driverForm = {}; |
||||
} |
||||
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.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
||||
}, |
||||
ddd() { |
||||
if (this.deliveryListId){ |
||||
this.vehicleIds=[]; |
||||
this.deliveryDriver=[]; |
||||
this.driverForm.masterDriverName = ''; |
||||
this.driverForm.masterVehicleNub = ''; |
||||
}else { |
||||
this.loadAndUnload = []; |
||||
this.serveType=[]; |
||||
this.driverForm={}; |
||||
} |
||||
this.aaa = false; |
||||
this.bbb = true; |
||||
this.stockUpForm.deliveryType="2"; |
||||
this.stockUpForm.deliveryWay="2"; |
||||
this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
||||
this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
||||
}, |
||||
selectionClear() { |
||||
this.selectionList = []; |
||||
this.query={}; |
||||
}, |
||||
|
||||
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.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); |
||||
this.stockUpForm.otherFee = 0 ; |
||||
if (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; |
||||
}); |
||||
} |
||||
this.loading = false; |
||||
}, |
||||
}, |
||||
}; |
||||
</script> |
||||
|
||||
<style lang="scss" scoped> |
||||
.head_top { |
||||
width: 100%; |
||||
display: flex; |
||||
align-items: center; |
||||
background-color: #ffffff; |
||||
// border-bottom: 1px solid rgb(228, 228, 228); |
||||
padding-left: 10px; |
||||
|
||||
>.buts{ |
||||
padding: 10px 20px; |
||||
cursor: pointer; |
||||
margin-right: 10px; |
||||
font-size: 18px; |
||||
border-bottom: 4px solid #ffffff; |
||||
// background-color: #ffffff; |
||||
} |
||||
.check{ |
||||
color: #D3832A; |
||||
border-bottom: 4px solid #D3832A; |
||||
} |
||||
} |
||||
.minaxbox{ |
||||
display: flex; |
||||
flex-direction: column; |
||||
.tophed{ |
||||
display: flex; |
||||
flex-wrap: wrap; |
||||
|
||||
} |
||||
} |
||||
</style> |
||||
Loading…
Reference in new issue