java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复配送bug

dev-xx
qb 11 months ago
parent
ffabf37d9e
commit
4b0ea6dd18
3 changed files with 260 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 88
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  2. 175
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  3. 78
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue

88
src/views/distribution/deliverylist/distributionDeliveryList.vue
Unescape View File

@ -5,32 +5,42 @@
<!-- 查询模块 -->
<el-form class="header_search" :model="query">
<el-form-item label="配送车次:">
<el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
<el-input
v-model="query.trainNumbers"
placeholder="请输入配送车次"
clearable
></el-input>
</el-form-item>
<el-form-item label="配送日期:" class="el-times">
<el-date-picker
v-model="query.taskTime"
type="date"
placeholder="选择日期"
format="YYYY-MM-DD "
class="w100"
v-model="query.taskTimeArr"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
>
</el-date-picker>
</el-form-item>
<el-form-item label="配送类型:">
<el-select v-model="query.businessType" placeholder="请选择业务类型">
<el-select class="w100" v-model="query.businessType" placeholder="请选择业务类型">
<el-option :key="'1'" :value="'商配'">商配 </el-option>
<el-option :key="'2'" :value="'市配'">市配 </el-option>
</el-select>
</el-form-item>
<el-form-item label="配送种类:">
<el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
<el-select class="w100" v-model="query.deliveryKind" placeholder="请选择业务类型">
<el-option :key="'1'" :value="'自主配送'">自主配送 </el-option>
<el-option :key="'2'" :value="'外协配送'">外协配送 </el-option>
</el-select>
</el-form-item>
<el-form-item label="配送司机:">
<el-select
class="w100"
v-model="query.driverName"
filterable
placeholder="请输入司机名称"
@ -47,6 +57,7 @@
</el-form-item>
<el-form-item label="配送车辆:">
<el-select
class="w100"
v-model="query.vehicleName"
filterable
placeholder="请输入司机名称"
@ -318,7 +329,7 @@ import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
import print from '@/utils/print';
import { getBillLadingExport } from '@/api/distribution/distrilbutionBillLading';
import { downloadXls, setNodeHeight } from '@/utils/util';
import { downloadXls, getObjType, setNodeHeight } from '@/utils/util';
export default {
data() {
@ -359,6 +370,36 @@ export default {
form: {},
// 选择行
selectionList: [],
/** 时间快捷选择设置 */
shortcuts: [
{
text: '最近一周',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
},
},
{
text: '最近一个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
},
},
{
text: '最近三个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
},
},
],
columnList: [
{
prop: '',
@ -411,6 +452,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'typeName',
label: '配送类型',
@ -471,6 +522,17 @@ export default {
// fixed: false,
// sortable: true
// },
// clineName
{
prop: 'clineName',
label: '收货人',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'customersNumber',
label: '配送客户数',
@ -1109,6 +1171,12 @@ export default {
},
onLoad(page, params = {}) {
this.loading = true;
if (getObjType(this.query.taskTimeArr) === 'array') {
params.taskTimeStart = this.query.taskTimeArr[0];
params.taskTimeEnd = this.query.taskTimeArr[1];
}
getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
// eslint-disable-next-line no-empty
@ -1254,4 +1322,8 @@ export default {
display: flex;
align-items: flex-end;
}
.w100 {
width: 100% !important;
}
</style>

175
src/views/distribution/deliverylist/distributionDeliveryListdis.vue
Unescape View File

@ -1,83 +1,84 @@
<template>
<basic-container class="basic-container" v-loading="loadingObj.pageLoading">
<div class="avue-crud">
<el-row v-if="!search">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="fr-fm">
<div class="el-tb">
<el-form-item label="配送车次:">
<el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
</el-form-item>
<el-form-item label="配送日期:" class="el-times">
<el-date-picker
v-model="query.taskTime"
type="datetime"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择日期"
>
</el-date-picker>
</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-form-item>-->
<el-form-item label="配送种类:">
<el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
<el-option :key="'1'" :value="'自主配送'">自主配送 </el-option>
<el-option :key="'2'" :value="'外协配送'">外协配送 </el-option>
</el-select>
</el-form-item>
<el-form-item label="配送司机:">
<el-select
v-model="query.driverName"
filterable
clearable
placeholder="请输入司机名称"
:loading="loading"
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="配送车次:">
<el-input
v-model="query.trainNumbers"
placeholder="请输入配送车次"
clearable
></el-input>
</el-form-item>
<el-form-item label="配送日期:" class="el-times">
<el-date-picker
class="w100"
v-model="query.taskTimeArr"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
>
</el-date-picker>
</el-form-item>
<el-form-item label="配送种类:">
<el-select class="w100" v-model="query.deliveryKind" placeholder="请选择业务类型">
<el-option :key="'1'" :value="'自主配送'">自主配送 </el-option>
<el-option :key="'2'" :value="'外协配送'">外协配送 </el-option>
</el-select>
</el-form-item>
<el-form-item label="配送司机:">
<el-select
class="w100"
v-model="query.driverName"
filterable
clearable
placeholder="请输入司机名称"
:loading="loading"
>
<el-option
v-for="item in driverData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictValue"
>
<el-option
v-for="item in driverData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictValue"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="配送车辆:">
<el-select
v-model="query.vehicleName"
filterable
clearable
placeholder="请输入司机名称"
:loading="loading"
</el-option>
</el-select>
</el-form-item>
<el-form-item label="配送车辆:">
<el-select
class="w100"
v-model="query.vehicleName"
filterable
clearable
placeholder="请输入司机名称"
:loading="loading"
>
<el-option
v-for="item in vehicleData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictValue"
>
<el-option
v-for="item in vehicleData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictValue"
>
</el-option>
</el-select>
</el-form-item>
</div>
</el-option>
</el-select>
</el-form-item>
<!-- 查询按钮 -->
<el-form-item class="el-btn">
<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>
</div>
<!-- <el-row :gutter="24" class="rows"> -->
<!-- <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
@ -365,6 +366,36 @@ export default {
// 选择行
selectionList: [],
activeName: 'first',
/** 时间快捷选择设置 */
shortcuts: [
{
text: '最近一周',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
},
},
{
text: '最近一个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
},
},
{
text: '最近三个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
},
},
],
columnList: [
{
prop: 'serialNumber',
@ -1297,6 +1328,11 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
this.query.type = '1';
if (getObjType(this.query.taskTimeArr) === 'array') {
params.taskTimeStart = this.query.taskTimeArr[0];
params.taskTimeEnd = this.query.taskTimeArr[1];
}
getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
// eslint-disable-next-line no-empty
@ -1518,4 +1554,7 @@ export default {
// .el_tabBK {
// // height: 70%;
// }
.w100 {
width: 100% !important;
}
</style>

78
src/views/distribution/deliverylist/distributionDeliveryListmar.vue
Unescape View File

@ -5,23 +5,45 @@
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="配送车次:">
<el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
<el-input
v-model="query.trainNumbers"
placeholder="请输入配送车次"
clearable
></el-input>
</el-form-item>
<el-form-item label="客户名称:">
<el-input v-model="query.clineName" placeholder="请输入客户名称"></el-input>
<el-input v-model="query.clineName" placeholder="请输入客户名称" clearable></el-input>
</el-form-item>
<el-form-item label="配送日期:" class="el-times">
<el-date-picker v-model="query.taskTime" type="date" placeholder="选择日期">
<el-date-picker
class="w100"
v-model="query.taskTimeArr"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
>
</el-date-picker>
</el-form-item>
<el-form-item label="配送种类:">
<el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
<el-select
class="w100"
clearable
v-model="query.deliveryKind"
placeholder="请选择业务类型"
>
<el-option :key="'1'" :value="'自主配送'">自主配送</el-option>
<el-option :key="'2'" :value="'外协配送'">外协配送</el-option>
</el-select>
</el-form-item>
<el-form-item label="配送司机:">
<el-select
class="w100"
clearable
v-model="query.driverName"
filterable
placeholder="请输入司机名称"
@ -38,6 +60,8 @@
</el-form-item>
<el-form-item label="配送车辆:">
<el-select
class="w100"
clearable
v-model="query.vehicleName"
filterable
placeholder="请输入司机名称"
@ -209,7 +233,13 @@ import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
import print from '@/utils/print';
import { getBillLadingExport } from '@/api/distribution/distrilbutionBillLading';
import { downloadXls, getWinHeight, handleClearTableQuery, setNodeHeight } from '@/utils/util';
import {
downloadXls,
getWinHeight,
handleClearTableQuery,
setNodeHeight,
getObjType,
} from '@/utils/util';
export default {
data() {
@ -251,6 +281,36 @@ export default {
// 选择行
selectionList: [],
activeName: 'first',
/** 时间快捷选择设置 */
shortcuts: [
{
text: '最近一周',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
},
},
{
text: '最近一个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
},
},
{
text: '最近三个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
},
},
],
allColumnList: [
{
prop: '',
@ -1310,6 +1370,11 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
this.query.type = '2';
if (getObjType(this.query.taskTimeArr) === 'array') {
params.taskTimeStart = this.query.taskTimeArr[0];
params.taskTimeEnd = this.query.taskTimeArr[1];
}
getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
// eslint-disable-next-line no-empty
@ -1537,4 +1602,7 @@ export default {
align-items: center;
justify-content: center;
}
.w100 {
width: 100% !important;
}
</style>

Write Preview
Loading…
Cancel
Save