|
|
|
|
@ -1,16 +1,7 @@
|
|
|
|
|
<template> |
|
|
|
|
<basic-container> |
|
|
|
|
<div class="avue-crud"> |
|
|
|
|
<!-- <el-row :hidden="!search" style="padding:6px 18px">--> |
|
|
|
|
<!-- <!– 查询模块 –>--> |
|
|
|
|
<!-- <el-form :inline="true" :model="query">--> |
|
|
|
|
<!-- <!– 查询按钮 –>--> |
|
|
|
|
<!-- <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>--> |
|
|
|
|
|
|
|
|
|
<el-row :gutter="24" class="rows"> |
|
|
|
|
<el-col :xl="14" :lg="7" :md="8" :sm="24" > |
|
|
|
|
<span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总件数：{{statistics.deliveriesTotal}} </span> |
|
|
|
|
@ -20,54 +11,65 @@
|
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<el-row style="margin-top: 30px"> |
|
|
|
|
<!-- <el-button-group>--> |
|
|
|
|
<!-- <el-button type="primary" @click="deliverytype('')" >全部</el-button>--> |
|
|
|
|
<!-- <el-button type="primary" @click="deliverytype('2')">商配<i class="el-icon-arrow-right el-icon--right"></i></el-button>--> |
|
|
|
|
<!-- <el-button type="primary" @click="deliverytype('1')">市配</el-button>--> |
|
|
|
|
<!-- </el-button-group>--> |
|
|
|
|
<div class="avue-crud__header"> |
|
|
|
|
<!-- 头部左侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__left" style="margin-top: 20px"> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>--> |
|
|
|
|
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>--> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>--> |
|
|
|
|
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>--> |
|
|
|
|
</div> |
|
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__right"> |
|
|
|
|
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button> |
|
|
|
|
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button> |
|
|
|
|
<el-button icon="el-icon-search" @click="searchHide" circle></el-button> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</el-row> |
|
|
|
|
<el-row> |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
<el-table ref="table" v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="data" |
|
|
|
|
:height="height" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:border="option.border"> |
|
|
|
|
<!-- <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>--> |
|
|
|
|
<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="50" 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> |
|
|
|
|
<tablecmt |
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="data" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@btnCheck="btnsc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@selection="selectionsc" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-button size="small" @click="editsolt(slotProps.scope)">查看</el-button> |
|
|
|
|
|
|
|
|
|
</template> |
|
|
|
|
<!-- 操作栏模块 --> |
|
|
|
|
<el-table-column prop="menu" label="操作" :width="220" align="center"> |
|
|
|
|
<template #="{row}"> |
|
|
|
|
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>--> |
|
|
|
|
<el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button> |
|
|
|
|
<el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
</tablecmt> |
|
|
|
|
<!-- <el-table ref="table" v-loading="loading"--> |
|
|
|
|
<!-- @selection-change="selectionChange"--> |
|
|
|
|
<!-- :data="data"--> |
|
|
|
|
<!-- :height="height"--> |
|
|
|
|
<!-- style="width: 100%"--> |
|
|
|
|
<!-- :border="option.border">--> |
|
|
|
|
<!--<!– <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>–>--> |
|
|
|
|
<!-- <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="50" 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-column prop="menu" label="操作" :width="220" align="center">--> |
|
|
|
|
<!-- <template #="{row}">--> |
|
|
|
|
<!--<!– <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>–>--> |
|
|
|
|
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button>--> |
|
|
|
|
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
<!-- </el-table>--> |
|
|
|
|
</el-row> |
|
|
|
|
<el-row> |
|
|
|
|
<div class="avue-crud__pagination" style="width:100%"> |
|
|
|
|
@ -87,10 +89,16 @@
|
|
|
|
|
<!-- 表单模块 --> |
|
|
|
|
</div> |
|
|
|
|
</basic-container> |
|
|
|
|
<edittablehead |
|
|
|
|
@setcolum="setnewcolum" |
|
|
|
|
@closce="showdrawer" |
|
|
|
|
:drawerShow="drawerShow" |
|
|
|
|
:columnList="columnList" |
|
|
|
|
></edittablehead> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { getList, getDetail, add, update, remove, getstatistics } from '@/api/distribution/distributionDeliveryList'; |
|
|
|
|
import { getList, getDetail, add, update, remove,getPage,getstatistics } from "@/api/distribution/distributionDeliveryList"; |
|
|
|
|
import option from "@/option/distribution/distributionDeliveryList"; |
|
|
|
|
import { mapGetters } from "vuex"; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
@ -98,6 +106,7 @@ import { getDictionaryBiz } from '@/api/system/dict';
|
|
|
|
|
export default { |
|
|
|
|
data () { |
|
|
|
|
return { |
|
|
|
|
|
|
|
|
|
height: 0, |
|
|
|
|
// 弹框标题 |
|
|
|
|
title: '', |
|
|
|
|
@ -113,6 +122,7 @@ export default {
|
|
|
|
|
query: {}, |
|
|
|
|
//数据统计 |
|
|
|
|
statistics:{}, |
|
|
|
|
drawerShow: false, |
|
|
|
|
// 分页信息 |
|
|
|
|
page: { |
|
|
|
|
currentPage: 1, |
|
|
|
|
@ -129,6 +139,160 @@ export default {
|
|
|
|
|
form: {}, |
|
|
|
|
// 选择行 |
|
|
|
|
selectionList: [], |
|
|
|
|
columnList: [ |
|
|
|
|
// { |
|
|
|
|
// prop: '', |
|
|
|
|
// label: '序号', |
|
|
|
|
// type: 0, |
|
|
|
|
// values: '', |
|
|
|
|
// width: 55, |
|
|
|
|
// checkarr: [], |
|
|
|
|
// fixed: true, |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
prop: 'trainNumber', |
|
|
|
|
label: '车次', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: true, |
|
|
|
|
sortable: true, |
|
|
|
|
// head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'warehouseName', |
|
|
|
|
label: '仓库', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'kind', |
|
|
|
|
label: '配送种类', |
|
|
|
|
type: 3, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'vehicleName', |
|
|
|
|
label: '配送车辆', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'driverName', |
|
|
|
|
label: '配送司机', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'distributionCompany', |
|
|
|
|
label: '配送公司', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'state', |
|
|
|
|
label: '配送状态', |
|
|
|
|
type: 3, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
// head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'customersNumber', |
|
|
|
|
label: '配送客户数', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'price', |
|
|
|
|
label: '配送价格', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'orderNumber', |
|
|
|
|
label: '订单总数', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'deliveryNumber', |
|
|
|
|
label: '配送件数', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'scannedNumber', |
|
|
|
|
label: '扫描件数', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'loadingTeam', |
|
|
|
|
label: '装卸班组', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: '', |
|
|
|
|
label: '操作', |
|
|
|
|
type: 6, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed:'right', |
|
|
|
|
sortable: false, |
|
|
|
|
} |
|
|
|
|
// 更多列的配置... |
|
|
|
|
], |
|
|
|
|
// 表单配置 |
|
|
|
|
option: option, |
|
|
|
|
// 表单列表 |
|
|
|
|
@ -138,7 +302,23 @@ export default {
|
|
|
|
|
mounted () { |
|
|
|
|
this.queryDictionary(); |
|
|
|
|
this.init(); |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 初始化获取本地缓存的编辑隐藏的列表 |
|
|
|
|
* 固定搭配，不能更改 |
|
|
|
|
*/ |
|
|
|
|
let newarr = this.$functions.getStorage(window.location.pathname); |
|
|
|
|
if (newarr) { |
|
|
|
|
this.columnList.map(item => { |
|
|
|
|
item.head = false; |
|
|
|
|
}); |
|
|
|
|
newarr.map(ite => { |
|
|
|
|
this.columnList.map(item => { |
|
|
|
|
if (ite == item.label) { |
|
|
|
|
item.head = true; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
computed: { |
|
|
|
|
...mapGetters(["permission"]), |
|
|
|
|
@ -151,23 +331,84 @@ export default {
|
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
showdrawer(value){ |
|
|
|
|
this.drawerShow=value |
|
|
|
|
}, |
|
|
|
|
/** |
|
|
|
|
* 弹窗的勾选回调，用于更改头部数组 |
|
|
|
|
* 固定搭配，只需要更换 columnList |
|
|
|
|
*/ |
|
|
|
|
setnewcolum(newarr, headarr) { |
|
|
|
|
// console.log(newarr,'+++++++++++') |
|
|
|
|
this.columnList = newarr; |
|
|
|
|
this.$functions.setStorage(window.location.pathname, headarr); |
|
|
|
|
}, |
|
|
|
|
selectionsc(value) { |
|
|
|
|
console.log("进来了>>>>>>>>>>>>>",value); |
|
|
|
|
}, |
|
|
|
|
delectsolt(scope) { |
|
|
|
|
const { row } = scope; |
|
|
|
|
console.log(row); |
|
|
|
|
}, |
|
|
|
|
editsolt(scope) { |
|
|
|
|
const { row } = scope; |
|
|
|
|
console.log(row); |
|
|
|
|
this.$router.push({ |
|
|
|
|
path: '/distribution/deliverylist/distributionDeliveryListedt', |
|
|
|
|
query: { |
|
|
|
|
id: row.id, |
|
|
|
|
name: row.trainNumber +'-查看配送' |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
btnsc(index, row) { |
|
|
|
|
console.log(index, row); |
|
|
|
|
}, |
|
|
|
|
selectsc(index, row) { |
|
|
|
|
this.query[row.prop] =index |
|
|
|
|
if (!index){ |
|
|
|
|
delete this.query[row.prop] |
|
|
|
|
} |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
timesc(index, row) { |
|
|
|
|
console.log(index, row); |
|
|
|
|
}, |
|
|
|
|
inputsc(index, row) { |
|
|
|
|
this.query[row.prop] =index |
|
|
|
|
if (!index){ |
|
|
|
|
delete this.query[row.prop] |
|
|
|
|
} |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
queryDictionary() { |
|
|
|
|
getDictionaryBiz('delivery_type').then(res => { |
|
|
|
|
this.deliverytypeData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('distribution_deliverylist_kind').then(res => { |
|
|
|
|
this.deliverykindData = res.data.data; |
|
|
|
|
this.columnList[2].checkarr =res.data.data.map(item=>{ |
|
|
|
|
item.value=item.dictKey |
|
|
|
|
item.label=item.dictValue |
|
|
|
|
return item |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('distribution_deliverylist_state').then(res => { |
|
|
|
|
this.deliveryliststateData = res.data.data; |
|
|
|
|
this.columnList[6].checkarr =res.data.data.map(item=>{ |
|
|
|
|
item.value=item.dictKey |
|
|
|
|
item.label=item.dictValue |
|
|
|
|
return item |
|
|
|
|
}); |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
//类型切换 |
|
|
|
|
deliverytype(type){ |
|
|
|
|
this.query.type=type; |
|
|
|
|
this.onLoad(this.page) |
|
|
|
|
}, |
|
|
|
|
// deliverytype(type){ |
|
|
|
|
// this.query.type=type; |
|
|
|
|
// this.onLoad(this.page) |
|
|
|
|
// }, |
|
|
|
|
init () { |
|
|
|
|
this.height = this.setPx(document.body.clientHeight - 340); |
|
|
|
|
}, |
|
|
|
|
@ -281,7 +522,7 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
selectionClear () { |
|
|
|
|
this.selectionList = []; |
|
|
|
|
this.$refs.table.clearSelection(); |
|
|
|
|
// this.$refs.table.clearSelection(); |
|
|
|
|
}, |
|
|
|
|
currentChange (currentPage) { |
|
|
|
|
this.page.currentPage = currentPage; |
|
|
|
|
@ -293,8 +534,8 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
onLoad (page, params = {}) { |
|
|
|
|
this.loading = true; |
|
|
|
|
this.query.type='2' |
|
|
|
|
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
this.query.type = '2' |
|
|
|
|
getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|
for (let i = 0; i < data.records.length; i++) { |
|
|
|
|
@ -326,7 +567,9 @@ export default {
|
|
|
|
|
getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
this.statistics = res.data.data |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
// getDetail(row.id).then(res => { |
|
|
|
|
// this.form = res.data.data; |
|
|
|
|
// }); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
