|
|
|
|
@ -1,6 +1,79 @@
|
|
|
|
|
<template> |
|
|
|
|
<basic-container> |
|
|
|
|
<div class="avue-crud"> |
|
|
|
|
<el-row :hidden="!search" style="padding: 6px 18px"> |
|
|
|
|
<!-- 查询模块 --> |
|
|
|
|
<el-form :inline="true" :model="query"> |
|
|
|
|
<el-form-item label="配送车次:"> |
|
|
|
|
<el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="订单编号:"> |
|
|
|
|
<el-input v-model="query.stockArticleId" placeholder="请输入订单自编号"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<!-- <el-form-item label="商城名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.mallName" placeholder="请输入商城名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="门店名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.storeName" placeholder="请输入门店名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<el-form-item label="客户名称:"> |
|
|
|
|
<el-input v-model="query.consignee" placeholder="请输入客户名称"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="客户电话:"> |
|
|
|
|
<el-input v-model="query.deliveryPhone" placeholder="请输入客户电话"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="业务类型:"> |
|
|
|
|
<el-select v-model="query.businessType" placeholder="请选择业务类型"> |
|
|
|
|
<el-option |
|
|
|
|
:key="'1'" |
|
|
|
|
:value="'商配'">商配 |
|
|
|
|
</el-option> |
|
|
|
|
<el-option |
|
|
|
|
:key="'2'" |
|
|
|
|
:value="'市配'">市配 |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
<!-- <el-input v-model="query.deliveryType" placeholder="请选择业务类型"></el-input>--> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="配送司机:"> |
|
|
|
|
<!-- <el-select v-model="query.deliveryType" placeholder="请选择业务类型">--> |
|
|
|
|
<!-- </el-select>--> |
|
|
|
|
<el-select |
|
|
|
|
v-model="query.deliveryDriverName" |
|
|
|
|
multiple |
|
|
|
|
filterable |
|
|
|
|
placeholder="请输入司机名称" |
|
|
|
|
:loading="loading"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in driverData" |
|
|
|
|
:key="item.dictKey" |
|
|
|
|
:label="item.dictValue" |
|
|
|
|
:value="item.dictValue"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
<!-- <el-input v-model="query.deliveryType" placeholder="请选择业务类型"></el-input>--> |
|
|
|
|
</el-form-item> |
|
|
|
|
<!-- <el-form-item label="司机签收状态:">--> |
|
|
|
|
<!-- <el-select v-model="query.driverSigning" placeholder="请选择业务类型">--> |
|
|
|
|
<!-- <el-option--> |
|
|
|
|
<!-- :value="1">未签收--> |
|
|
|
|
<!-- </el-option>--> |
|
|
|
|
<!-- <el-option--> |
|
|
|
|
<!-- :value="2">已签收--> |
|
|
|
|
<!-- </el-option>--> |
|
|
|
|
<!-- </el-select>--> |
|
|
|
|
<!-- <!– <el-input v-model="query.querySigningStatus" placeholder="请选择签收状态"></el-input>–>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="顾客姓名:">--> |
|
|
|
|
<!-- <el-input v-model="query.customerName" placeholder="请输入服务类型"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- 查询按钮 --> |
|
|
|
|
<el-form-item> |
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button> |
|
|
|
|
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
</el-row> |
|
|
|
|
<!-- <tablecmt |
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="tableData" |
|
|
|
|
@ -158,6 +231,9 @@ import option from '@/option/distribution/distributionSignfor';
|
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
import { getVehicleList } from '@/api/basicdata/basicdataVehicle'; |
|
|
|
|
|
|
|
|
|
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; |
|
|
|
|
export default { |
|
|
|
|
|
|
|
|
|
data() { |
|
|
|
|
@ -184,8 +260,8 @@ export default {
|
|
|
|
|
// head: false, |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
prop: 'consignee', |
|
|
|
|
label: '收货人', |
|
|
|
|
prop: 'trainNumber', |
|
|
|
|
label: '配送车次', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
@ -195,67 +271,67 @@ export default {
|
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'deliveryPhone', |
|
|
|
|
label: '收货电话', |
|
|
|
|
prop: 'stockArticleId', |
|
|
|
|
label: '订单自编号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'deliveryAddress', |
|
|
|
|
label: '收货地址', |
|
|
|
|
prop: 'warehouseName', |
|
|
|
|
label: '配送仓库', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '300', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'deliveryType', |
|
|
|
|
label: '业务类型', |
|
|
|
|
type: 3, |
|
|
|
|
prop: 'consignee', |
|
|
|
|
label: '客户名称', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'trainNumber', |
|
|
|
|
label: '配送车次', |
|
|
|
|
prop: 'deliveryPhone', |
|
|
|
|
label: '客户电话', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'stockArticleId', |
|
|
|
|
label: '订单自编号', |
|
|
|
|
prop: 'deliveryAddress', |
|
|
|
|
label: '客户地址', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
width: '300', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'warehouseName', |
|
|
|
|
label: '配送仓库', |
|
|
|
|
type: 2, |
|
|
|
|
prop: 'deliveryType', |
|
|
|
|
label: '业务类型', |
|
|
|
|
type: 3, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'reservationNum', |
|
|
|
|
@ -419,6 +495,7 @@ export default {
|
|
|
|
|
option: option, |
|
|
|
|
// 表单列表 |
|
|
|
|
data: [], |
|
|
|
|
driverData: [], |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
@ -428,6 +505,7 @@ export default {
|
|
|
|
|
* 初始化获取本地缓存的编辑隐藏的列表 |
|
|
|
|
* 固定搭配，不能更改 |
|
|
|
|
*/ |
|
|
|
|
this.getMasterDriverData(); |
|
|
|
|
let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList'); |
|
|
|
|
let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList'); |
|
|
|
|
let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist'); |
|
|
|
|
@ -529,6 +607,25 @@ export default {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
//查询司机信息 |
|
|
|
|
getMasterDriverData() { |
|
|
|
|
return new Promise((rv, rev) => { |
|
|
|
|
getDriverList(1, 10, '').then(res => { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
let po = []; |
|
|
|
|
data.records.forEach(item=>{ |
|
|
|
|
let a = { |
|
|
|
|
dictKey: item.id, |
|
|
|
|
dictValue: item.name |
|
|
|
|
}; |
|
|
|
|
po.push(a); |
|
|
|
|
}) |
|
|
|
|
this.driverData = po; |
|
|
|
|
console.log('===============>', res.data.data); |
|
|
|
|
rv(res.data.data.records); |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
selectionsc(value) { |
|
|
|
|
console.log(value); |
|
|
|
|
}, |
|
|
|
|
@ -606,6 +703,17 @@ export default {
|
|
|
|
|
this.search = !this.search; |
|
|
|
|
}, |
|
|
|
|
searchChange() { |
|
|
|
|
if (this.query.businessType) { |
|
|
|
|
let businessType = this.query.businessType; |
|
|
|
|
switch (businessType) { |
|
|
|
|
case '商配': |
|
|
|
|
this.query.deliveryType = '1'; |
|
|
|
|
break; |
|
|
|
|
case '市配': |
|
|
|
|
this.query.deliveryType = '2'; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
searchReset() { |
|
|
|
|
|
kilo
2 years ago