Skip to content

C
cloud-platform-ui
Commit e938d74e authored by rencs's avatar rencs
Browse files
Options

9.14 排版，出车

parent 164c227e
Show whitespace changes
Inline Side-by-side
Showing with 1725 additions and 1437 deletions
src/views/vehicle/vehicleDepartureLog/index.vue
View file @ e938d74e
...@@ -94,7 +94,13 @@ ...@@ -94,7 +94,13 @@
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button
class="filter-item"
type="primary"
v-waves
icon="search"
@click="handleFilter"
>搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button> <el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -153,6 +159,16 @@ ...@@ -153,6 +159,16 @@
<span>{{scope.row.numberPlate}}</span> <span>{{scope.row.numberPlate}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="所属公司" width="120">
<template slot-scope="scope">
<span>{{scope.row.subordinateName}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="预计收车门店" width="120">
<template slot-scope="scope">
<span>{{scope.row.expectArrivalName}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="预约出/收车时间"> <el-table-column align="center" label="预约出/收车时间">
<template slot-scope="scope"> <template slot-scope="scope">
<p>出:{{scope.row.bookStartDate}}</p> <p>出:{{scope.row.bookStartDate}}</p>
...@@ -307,26 +323,26 @@ ...@@ -307,26 +323,26 @@
} }
</style> </style>
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from "vuex";
import { import {
page, page,
statistic, statistic,
findReserveType findReserveType,
} from '../../../api/vehicle/departureLog' } from "../../../api/vehicle/departureLog";
import { getAllCompany, getAll } from 'api/base_info/branch_company/' import { getAllCompany, getAll } from "api/base_info/branch_company/";
import { getAllZone } from 'api/base_info/constant/' import { getAllZone } from "api/base_info/constant/";
import { getAllBranchCompanyByZoneId } from 'api/order/rentVehicle' import { getAllBranchCompanyByZoneId } from "api/order/rentVehicle";
import { import {
toEast8Date, toEast8Date,
deepCopyDate, deepCopyDate,
newEast8Date, newEast8Date,
getYMD_date getYMD_date,
} from 'utils/dateUtils' } from "utils/dateUtils";
export default { export default {
name: 'vehicleDepartureLog', name: "vehicleDepartureLog",
data() { data() {
return { return {
purpose:null, purpose: null,
showMoreMoreCol: false, showMoreMoreCol: false,
form: { form: {
id: null, id: null,
...@@ -345,29 +361,29 @@ export default { ...@@ -345,29 +361,29 @@ export default {
mileageEnd: null, mileageEnd: null,
state: null, state: null,
allCompaniesArr: [], allCompaniesArr: [],
selectArry: [] selectArry: [],
}, },
rules: { rules: {
name: [ name: [
{ {
required: true, required: true,
message: '请输入用户', message: "请输入用户",
trigger: 'blur' trigger: "blur",
} },
] ],
}, },
list: null, list: null,
total: null, total: null,
listLoading: true, listLoading: true,
allBranchCompany: [], allBranchCompany: [],
baranchQuery: { baranchQuery: {
zoneId: null zoneId: null,
}, },
allZoneArr: [], //全部片区 allZoneArr: [], //全部片区
state1: '', state1: "",
arrivalBranchCompanyId:null, arrivalBranchCompanyId: null,
useArr:[],//用途 useArr: [], //用途
useData:null, useData: null,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 20, limit: 20,
...@@ -376,12 +392,12 @@ export default { ...@@ -376,12 +392,12 @@ export default {
numberPlate: undefined, numberPlate: undefined,
departureId: undefined, departureId: undefined,
arrivalBranchCompanyId: null, arrivalBranchCompanyId: null,
use:this.useData use: this.useData,
}, },
dialogStatus: '', dialogStatus: "",
textMap: { textMap: {
update: '编辑', update: "编辑",
create: '创建' create: "创建",
}, },
tableKey: 0, tableKey: 0,
dialogFormVisible: null, dialogFormVisible: null,
...@@ -389,64 +405,64 @@ export default { ...@@ -389,64 +405,64 @@ export default {
statisticData: { statisticData: {
departureCount: null, departureCount: null,
departureDay: null, departureDay: null,
departureMileage: null departureMileage: null,
} },
} };
}, },
created() { created() {
let t = this let t = this;
const numberPlate = this.$route.query.numberPlate const numberPlate = this.$route.query.numberPlate;
if (numberPlate) { if (numberPlate) {
this.listQuery.numberPlate = numberPlate this.listQuery.numberPlate = numberPlate;
} }
getAll().then(response => { getAll().then((response) => {
this.allCompaniesArr = response.data this.allCompaniesArr = response.data;
let query = localStorage.getItem('vehicleDepartureLog') let query = localStorage.getItem("vehicleDepartureLog");
if (query != 'null' && query && !numberPlate) { if (query != "null" && query && !numberPlate) {
this.listQuery = JSON.parse(query) this.listQuery = JSON.parse(query);
if (t.listQuery.departureId) { if (t.listQuery.departureId) {
t.allCompaniesArr.map(function(item) { t.allCompaniesArr.map(function (item) {
if (item.id == t.listQuery.departureId) { if (item.id == t.listQuery.departureId) {
t.state1 = item.name t.state1 = item.name;
} }
}) });
} }
} }
t.handleFilter() t.handleFilter();
}) });
findReserveType().then(data=>{ findReserveType().then((data) => {
this.useArr = JSON.parse(data.data).type this.useArr = JSON.parse(data.data).type;
}) });
}, },
computed: { computed: {
...mapGetters(['elements']), ...mapGetters(["elements"]),
//获取大区列表 //获取大区列表
getAllZoneList() { getAllZoneList() {
return getAllZone() return getAllZone();
} },
}, },
methods: { methods: {
//收车公司筛选 //收车公司筛选
putCompanyChange(val) { putCompanyChange(val) {
if (val) { if (val) {
this.listQuery.arrivalBranchCompanyId = val.id this.listQuery.arrivalBranchCompanyId = val.id;
} else { } else {
this.listQuery.arrivalBranchCompanyId = null this.listQuery.arrivalBranchCompanyId = null;
} }
}, },
changeUse(val){ changeUse(val) {
if(!val){ if (!val) {
this.listQuery.use = null this.listQuery.use = null;
}else{ } else {
this.listQuery.use = val this.listQuery.use = val;
} }
}, },
/** /**
* 重置 * 重置
* */ * */
reloadPage() { reloadPage() {
this.state1 = '' this.state1 = "";
this.arrivalBranchCompanyId = null this.arrivalBranchCompanyId = null;
this.listQuery = { this.listQuery = {
page: 1, page: 1,
limit: 20, limit: 20,
...@@ -455,125 +471,123 @@ export default { ...@@ -455,125 +471,123 @@ export default {
numberPlate: undefined, numberPlate: undefined,
departureId: undefined, departureId: undefined,
arrivalBranchCompanyId: undefined, arrivalBranchCompanyId: undefined,
use:undefined use: undefined,
} };
if (this.listQuery) { if (this.listQuery) {
localStorage.setItem( localStorage.setItem(
'vehicleDepartureLog', "vehicleDepartureLog",
JSON.stringify(this.listQuery) JSON.stringify(this.listQuery)
) );
} }
this.handleFilter() this.handleFilter();
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1 this.listQuery.page = 1;
if (this.listQuery) { if (this.listQuery) {
localStorage.setItem( localStorage.setItem(
'vehicleDepartureLog', "vehicleDepartureLog",
JSON.stringify(this.listQuery) JSON.stringify(this.listQuery)
) );
} }
this.getList() this.getList();
if (this.listQuery.numberPlate) { if (this.listQuery.numberPlate) {
statistic({ numberPlate: this.listQuery.numberPlate }).then( statistic({ numberPlate: this.listQuery.numberPlate }).then(
response => { (response) => {
if (response.status == 200) { if (response.status == 200) {
this.statisticData = response.data this.statisticData = response.data;
this.statisticVisiable = true this.statisticVisiable = true;
} else { } else {
this.$message(response.message) this.$message(response.message);
} }
} }
) );
} }
}, },
dateToString: function(date) { dateToString: function (date) {
var year = date.getFullYear() var year = date.getFullYear();
var month = (date.getMonth() + 1).toString() var month = (date.getMonth() + 1).toString();
var day = date.getDate().toString() var day = date.getDate().toString();
if (month.length == 1) { if (month.length == 1) {
month = '0' + month month = "0" + month;
} }
if (day.length == 1) { if (day.length == 1) {
day = '0' + day day = "0" + day;
} }
var dateTime = year + '-' + month + '-' + day var dateTime = year + "-" + month + "-" + day;
return dateTime return dateTime;
}, },
getList() { getList() {
this.listLoading = true this.listLoading = true;
if (!this.listQuery.numberPlate) { if (!this.listQuery.numberPlate) {
this.statisticVisiable = false this.statisticVisiable = false;
} }
if (this.listQuery.startTime) { if (this.listQuery.startTime) {
this.listQuery.startTime = getYMD_date( this.listQuery.startTime = getYMD_date(
new Date(this.listQuery.startTime) new Date(this.listQuery.startTime)
) );
} }
if (this.listQuery.endTime) { if (this.listQuery.endTime) {
this.listQuery.endTime = getYMD_date( this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime));
new Date(this.listQuery.endTime)
)
} }
if (!this.state1) { if (!this.state1) {
this.listQuery.departureId = undefined this.listQuery.departureId = undefined;
} }
page(this.listQuery).then(response => { page(this.listQuery).then((response) => {
this.list = response.data.list this.list = response.data.list;
this.total = response.data.total this.total = response.data.total;
this.listLoading = false this.listLoading = false;
}) });
}, },
querySearch(queryString, cb) { querySearch(queryString, cb) {
let selectArry = [] let selectArry = [];
let iitem = { let iitem = {
value: '全部', value: "全部",
name: '全部' name: "全部",
} };
selectArry.push(iitem) selectArry.push(iitem);
this.allCompaniesArr.map(function(item) { this.allCompaniesArr.map(function (item) {
item.value = item.name item.value = item.name;
selectArry.push(item) selectArry.push(item);
}) });
this.selectArry = selectArry this.selectArry = selectArry;
var results = queryString var results = queryString
? selectArry.filter(this.createFilter(queryString)) ? selectArry.filter(this.createFilter(queryString))
: selectArry : selectArry;
// 调用 callback 返回建议列表的数据 // 调用 callback 返回建议列表的数据
cb(results) cb(results);
}, },
createFilter(queryString) { createFilter(queryString) {
return restaurant => { return (restaurant) => {
return restaurant.name.indexOf(queryString.toLowerCase()) != -1 return restaurant.name.indexOf(queryString.toLowerCase()) != -1;
} };
}, },
handleSelect(item) { handleSelect(item) {
if (item.value == '全部') { if (item.value == "全部") {
this.listQuery.departureId = undefined this.listQuery.departureId = undefined;
} else { } else {
this.listQuery.departureId = item.id this.listQuery.departureId = item.id;
} }
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.listQuery.limit = val this.listQuery.limit = val;
if (this.listQuery) { if (this.listQuery) {
localStorage.setItem( localStorage.setItem(
'vehicleDepartureLog', "vehicleDepartureLog",
JSON.stringify(this.listQuery) JSON.stringify(this.listQuery)
) );
} }
this.getList() this.getList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.listQuery.page = val this.listQuery.page = val;
if (this.listQuery) { if (this.listQuery) {
localStorage.setItem( localStorage.setItem(
'vehicleDepartureLog', "vehicleDepartureLog",
JSON.stringify(this.listQuery) JSON.stringify(this.listQuery)
) );
}
this.getList()
}
} }
} this.getList();
},
},
};
</script> </script>
src/views/vehicle/vehicleSchedulManage/index.vue
View file @ e938d74e
<template> <template>
<div class="app-container calendar-list-container" v-loading.body="showLoadingBody"> <div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
<div > <div>
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
<el-row> <el-row>
...@@ -12,33 +12,80 @@ ...@@ -12,33 +12,80 @@
:value="val.code"></el-option> :value="val.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col>-->
<el-form-item label="车牌"> <el-form-item label="车牌">
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input> <el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="车辆编码"> <el-form-item label="车辆编码">
<el-input type="number" style="width: 200px;" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input> <el-input
type="number"
style="width: 200px;"
v-model.number="listQuery.code"
placeholder="请输入车辆编码"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="用途"> <el-form-item label="用途">
<el-select class="filter-item" v-model="listQuery.useType" placeholder="请选择用途"> <el-select class="filter-item" v-model="listQuery.useType" placeholder="请选择用途">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="item in useTypeList" :key="item.code" :label="item.val" <el-option
:value="item.code"></el-option> v-for="item in useTypeList"
:key="item.code"
:label="item.val"
:value="item.code"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="车型"> <el-form-item label="车型">
<el-select class="filter-item" v-model="listQuery.modelId" placeholder="请选择车型"> <el-select class="filter-item" v-model="listQuery.modelId" placeholder="请选择车型">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="item in allVehicleList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option
v-for="item in allVehicleList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属地区" prop="zoneId"> </el-row>
<el-row>
<el-form-item label="所属公司">
<el-select
v-model="listQuery.branchId"
placeholder="请选择"
@change="change_query_branch"
>
<el-option label="全部" :key="undefined" :value="undefined"></el-option>
<el-option
v-for="val in companys_list"
:key="val.id"
:label="val.name"
:value="val.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属门店">
<el-select
class="filter-item"
v-model="listQuery.parkBranchCompanyId"
clearable
placeholder="请选择"
>
<el-option label="全部" :key="undefined" :value="undefined"></el-option>
<el-option
v-for="val in branchCompany_list"
:key="val.id"
:label="val.name"
:value="val.id"
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属地区" prop="zoneId">
<el-select class="filter-item" v-model="listQuery.zoneId" placeholder="请选择" @change="getProvinceRegions"> <el-select class="filter-item" v-model="listQuery.zoneId" placeholder="请选择" @change="getProvinceRegions">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option> <el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item label="当前停放公司" prop="parkBranchCompanyId"> <!-- <el-form-item label="当前停放公司" prop="parkBranchCompanyId">
<el-autocomplete <el-autocomplete
class="inline-input" class="inline-input"
v-model="listQuery.parkBranchCompanyName" v-model="listQuery.parkBranchCompanyName"
...@@ -46,8 +93,14 @@ ...@@ -46,8 +93,14 @@
placeholder="请输入内容" placeholder="请输入内容"
@select="handleSelectPark" @select="handleSelectPark"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>-->
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button
class="filter-item"
type="primary"
v-waves
icon="search"
@click="handleFilter"
>搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button> <el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
</el-row> </el-row>
<!-- <el-row> --> <!-- <el-row> -->
...@@ -58,7 +111,7 @@ ...@@ -58,7 +111,7 @@
<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"> </el-option> <el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col>-->
<!-- <el-col :span="8"> <!-- <el-col :span="8">
<el-form-item label="时间"> <el-form-item label="时间">
<el-date-picker <el-date-picker
...@@ -76,7 +129,7 @@ ...@@ -76,7 +129,7 @@
placeholder="选择日期" placeholder="选择日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> --> </el-col>-->
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="当前停放公司" prop="parkBranchCompanyId"> <el-form-item label="当前停放公司" prop="parkBranchCompanyId">
<el-autocomplete <el-autocomplete
...@@ -87,15 +140,20 @@ ...@@ -87,15 +140,20 @@
@select="handleSelectPark" @select="handleSelectPark"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
</el-col> --> </el-col>-->
<!-- </el-row> --> <!-- </el-row> -->
</el-form> </el-form>
</div> </div>
<el-form label-width="100px" v-if="countTJ" style="margin: 10px 0;"> <el-form label-width="100px" v-if="countTJ" style="margin: 10px 0;">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="2"><el-form-item label="车辆概况"></el-form-item></el-col> <el-col :span="2">
<el-form-item label="车辆概况"></el-form-item>
</el-col>
<el-col :span="5" v-for="(item, index) in countTJ" :key="item.id"> <el-col :span="5" v-for="(item, index) in countTJ" :key="item.id">
<div class="grid-content bg-purple" v-if="item.travelStatus == 0 || item.travelStatus == 1 || item.travelStatus == 4 || item.travelStatus == 2"> <div
class="grid-content bg-purple"
v-if="item.travelStatus == 0 || item.travelStatus == 1 || item.travelStatus == 4 || item.travelStatus == 2"
>
<div class="text" style="color: #171413;">{{item.total}}</div> <div class="text" style="color: #171413;">{{item.total}}</div>
<div class="text" v-if="item.travelStatus == 0">车辆总额（辆）</div> <div class="text" v-if="item.travelStatus == 0">车辆总额（辆）</div>
<div class="text" v-if="item.travelStatus == 4">出行中车辆（辆）</div> <div class="text" v-if="item.travelStatus == 4">出行中车辆（辆）</div>
...@@ -106,41 +164,89 @@ ...@@ -106,41 +164,89 @@
</el-row> </el-row>
</el-form> </el-form>
<!--车辆预警--> <!--车辆预警-->
<div class="marquee_box" v-if="marqueeList.length>0" @mouseenter="handelOver" @mouseleave="handelOut"> <div
class="marquee_box"
v-if="marqueeList.length>0"
@mouseenter="handelOver"
@mouseleave="handelOut"
>
<ul class="marquee_list" :class="{marquee_top:animate}"> <ul class="marquee_list" :class="{marquee_top:animate}">
<li v-for="(item,index) in marqueeList" @click="toVehicleWarningMsg" :class="item.color">{{item.msg}} >>立即处理</li> <li
v-for="(item,index) in marqueeList"
@click="toVehicleWarningMsg"
:class="item.color"
>{{item.msg}} >>立即处理</li>
</ul> </ul>
</div> </div>
<!--车辆排班--> <!--车辆排班-->
<!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他--> <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
<div style="display: flex;margin-bottom: 20px;"> <div style="display: flex;margin-bottom: 20px;">
<span class="tip-co bg-1"></span><span>租房车/客户用车</span> <span class="tip-co bg-1"></span>
<span class="tip-co bg-5"></span><span>房车游</span> <span>租房车/客户用车</span>
<span class="tip-co bg-4"></span><span>展览</span> <span class="tip-co bg-5"></span>
<span class="tip-co bg-6"></span><span>保养/维修</span> <span>房车游</span>
<span class="tip-co bg-10"></span><span>其他</span> <span class="tip-co bg-4"></span>
<span class="tip-co bg-7"></span><span>预约中</span> <span>展览</span>
<span class="tip-co bg-8"></span><span>禁用</span> <span class="tip-co bg-6"></span>
<span>保养/维修</span>
<span class="tip-co bg-10"></span>
<span>其他</span>
<span class="tip-co bg-7"></span>
<span>预约中</span>
<span class="tip-co bg-8"></span>
<span>禁用</span>
</div> </div>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row <el-table
style="width: 100%;cursor: pointer;" class="schedul-tb"> :key="tableKey"
:data="list"
v-loading.body="listLoading"
border
fit
highlight-current-row
style="width: 100%;cursor: pointer;"
class="schedul-tb"
>
<el-table-column width="220" align="center" :label="firstTime" fixed> <el-table-column width="220" align="center" :label="firstTime" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<div @click="toVehicleRecords(scope.row)"> <div @click="toVehicleRecords(scope.row)">
<div style="color: #bfcbd9;font-size: 14px;"> <div style="color: #bfcbd9;font-size: 14px;">现在位置：{{scope.row.parkCompanyName}}</div>
现在位置：{{scope.row.parkCompanyName}} <div>
{{scope.row.numberPlate}}
<span style="color:red">({{scope.row.code}})</span>
<img src="../../../assets/images/detail.png" style="width: 15px;margin-left: 10px;" />
</div> </div>
<div>{{scope.row.numberPlate}}<span style='color:red'>({{scope.row.code}})</span><img src="../../../assets/images/detail.png" style="width: 15px;margin-left: 10px;"/></div> <div
<div style="color: #bfcbd9;font-size: 14px;">{{scope.row.vehicleModel?scope.row.vehicleModel.name:''}}</div> style="color: #bfcbd9;font-size: 14px;"
>{{scope.row.vehicleModel?scope.row.vehicleModel.name:''}}</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="60" align="center" :label="item.day" v-for="item in tempDayList" :key="item.day"> <el-table-column
width="60"
align="center"
:label="item.day"
v-for="item in tempDayList"
:key="item.day"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="iitem in scope.row.temp" :key="iitem.day" v-if="iitem.time == item.time"> <div v-for="iitem in scope.row.temp" :key="iitem.day" v-if="iitem.time == item.time">
<div v-for="ii in iitem.children" :key="ii.time" :data-ii="ii.time" :data-endhour="ii.endhour" class="ii-day" :class="ii.bg" @click="toShowDialog(scope.row, iitem, ii)"> <div
<span v-if="ii.timeEtr == '00'" style="position: absolute;color: #fff;left: -20px;bottom: 0">{{ii.timeEtr}}</span> v-for="ii in iitem.children"
<span v-else style="position: relative;color: #fff;top: -24px;right: -20px;">{{ii.timeEtr}}</span> :key="ii.time"
:data-ii="ii.time"
:data-endhour="ii.endhour"
class="ii-day"
:class="ii.bg"
@click="toShowDialog(scope.row, iitem, ii)"
>
<span
v-if="ii.timeEtr == '00'"
style="position: absolute;color: #fff;left: -20px;bottom: 0"
>{{ii.timeEtr}}</span>
<span
v-else
style="position: relative;color: #fff;top: -24px;right: -20px;"
>{{ii.timeEtr}}</span>
<span style="position: absolute;color: #fff;z-index: 11;left: 0;">{{ii.timeStr}}</span> <span style="position: absolute;color: #fff;z-index: 11;left: 0;">{{ii.timeStr}}</span>
</div> </div>
</div> </div>
...@@ -148,121 +254,151 @@ ...@@ -148,121 +254,151 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination
:current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" @size-change="handleSizeChange"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> @current-change="handleCurrentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10,20,30, 50]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination>
</div> </div>
</div> </div>
<!--保养弹框--> <!--保养弹框-->
<vehicleMaintenanceModal v-if="baoyang" :currentItem="currentItem" v-on:baoyangDialogEvent = "baoyangDialogEvent"></vehicleMaintenanceModal> <vehicleMaintenanceModal
v-if="baoyang"
:currentItem="currentItem"
v-on:baoyangDialogEvent="baoyangDialogEvent"
></vehicleMaintenanceModal>
<!--展览、预定用车弹框--> <!--展览、预定用车弹框-->
<vehicleExhibitionModal v-if="zhanlan" :currentItem="currentItem" v-on:zhanlanDialogEvent = "zhanlanDialogEvent"></vehicleExhibitionModal> <vehicleExhibitionModal
v-if="zhanlan"
:currentItem="currentItem"
v-on:zhanlanDialogEvent="zhanlanDialogEvent"
></vehicleExhibitionModal>
<!--安排用车弹框--> <!--安排用车弹框-->
<vehiclePlanModal v-if="anpai" :currentItem="currentItem" v-on:anpaiDialogEvent = "anpaiDialogEvent"></vehiclePlanModal> <vehiclePlanModal
v-if="anpai"
:currentItem="currentItem"
v-on:anpaiDialogEvent="anpaiDialogEvent"
></vehiclePlanModal>
<!--租车详情弹框--> <!--租车详情弹框-->
<!--rentOrder--> <!--rentOrder-->
<rentOrderDetailModal :orderDetailInfo="orderDetailInfo" v-if="rentOrder" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal> <rentOrderDetailModal
:orderDetailInfo="orderDetailInfo"
v-if="rentOrder"
v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"
></rentOrderDetailModal>
<!--旅游订单详情--> <!--旅游订单详情-->
<tourOrderDetailModal :tourRow="tourRow" v-if="tourDialogVisible" v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"></tourOrderDetailModal> <tourOrderDetailModal
:tourRow="tourRow"
v-if="tourDialogVisible"
v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"
></tourOrderDetailModal>
<!--禁用弹框--> <!--禁用弹框-->
<disableModal v-if="jinyong" :currentItem="currentItem" v-on:jinyongDialogEvent = "jinyongDialogEvent"></disableModal> <disableModal
v-if="jinyong"
:currentItem="currentItem"
v-on:jinyongDialogEvent="jinyongDialogEvent"
></disableModal>
</div> </div>
</template> </template>
<style> <style>
.flex-jca-fdc{ .flex-jca-fdc {
display: flex !important; display: flex !important;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
} }
.schedul-tb .el-table .cell{ .schedul-tb .el-table .cell {
padding: 0; padding: 0;
} }
.tip-co{ .tip-co {
padding: 10px; padding: 10px;
margin-right: 10px; margin-right: 10px;
margin-left: 20px; margin-left: 20px;
} }
.tip-co:first-child{ .tip-co:first-child {
margin-left: 0; margin-left: 0;
} }
/* 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他 */ /* 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他 */
.bg-1{ .bg-1 {
background: #20a0ff; background: #20a0ff;
} }
.bg-9{ .bg-9 {
background: #20a0ff; background: #20a0ff;
} }
.bg-5{ .bg-5 {
background: #6633cc; background: #6633cc;
} }
.bg-4{ .bg-4 {
background: #00cc66; background: #00cc66;
} }
.bg-3{ .bg-3 {
background: #ff6633; background: #ff6633;
} }
.bg-6{ .bg-6 {
background: #ff6633; background: #ff6633;
} }
.bg-7{ .bg-7 {
background: #ffcc00; background: #ffcc00;
} }
.bg-8{ .bg-8 {
background: #868686; background: #868686;
} }
.bg-10{ .bg-10 {
background: #ff6699; background: #ff6699;
} }
.ii-day{ .ii-day {
height: 3px; height: 3px;
width: 60px; width: 60px;
margin-left: -19px; margin-left: -19px;
} }
.day-title{ .day-title {
border-right:1px solid #bfcbd9; border-right: 1px solid #bfcbd9;
border-bottom:1px solid #bfcbd9; border-bottom: 1px solid #bfcbd9;
padding: 10px; padding: 10px;
min-width: 45px; min-width: 45px;
max-width: 45px; max-width: 45px;
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
} }
.v-list{ .v-list {
padding: 10px; padding: 10px;
min-width: 200px; min-width: 200px;
max-width: 200px; max-width: 200px;
border-bottom:1px solid #bfcbd9; border-bottom: 1px solid #bfcbd9;
border-right:1px solid #bfcbd9; border-right: 1px solid #bfcbd9;
} }
.zzui-broadcast-window{ .zzui-broadcast-window {
height: 180px !important; height: 180px !important;
background: #ccc; background: #ccc;
} }
.el-col { .el-col {
border-radius: 4px; border-radius: 4px;
} }
.bg-purple-dark { .bg-purple-dark {
background: #99a9bf; background: #99a9bf;
} }
.bg-purple { .bg-purple {
background: #eef1f6; background: #eef1f6;
} }
.bg-purple-light { .bg-purple-light {
background: #e5e9f2; background: #e5e9f2;
} }
.grid-content { .grid-content {
border-radius: 4px; border-radius: 4px;
min-height: 36px; min-height: 36px;
} }
.grid-content .text{ .grid-content .text {
text-align: center; text-align: center;
line-height: 35px; line-height: 35px;
} }
.row-bg { .row-bg {
padding: 10px 0; padding: 10px 0;
background-color: #f9fafc; background-color: #f9fafc;
} }
.marquee { .marquee {
width: 100%; width: 100%;
height: 50px; height: 50px;
...@@ -278,9 +414,9 @@ ...@@ -278,9 +414,9 @@
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
} }
.marquee_title { .marquee_title {
padding: 0 20px; padding: 0 20px;
height: 21px; height: 21px;
...@@ -290,9 +426,9 @@ ...@@ -290,9 +426,9 @@
border-right: 1px solid #d8d8d8; border-right: 1px solid #d8d8d8;
align-items: center; align-items: center;
} }
.marquee_box { .marquee_box {
display: block; display: block;
position: relative; position: relative;
width: 100%; width: 100%;
...@@ -300,9 +436,9 @@ ...@@ -300,9 +436,9 @@
overflow: hidden; overflow: hidden;
margin: 10px 0; margin: 10px 0;
background: #eef1f6; background: #eef1f6;
} }
.marquee_list { .marquee_list {
display: block; display: block;
position: absolute; position: absolute;
...@@ -310,64 +446,54 @@ ...@@ -310,64 +446,54 @@
top: 0; top: 0;
left: 0; left: 0;
} }
.marquee_top { .marquee_top {
transition: all 0.5s; transition: all 0.5s;
} }
.marquee_list li { .marquee_list li {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
font-size: 14px; font-size: 14px;
list-style-type:none; list-style-type: none;
} }
.marquee_list li span { .marquee_list li span {
padding: 0 2px; padding: 0 2px;
} }
.warn-1{ .warn-1 {
color: red; color: red;
} }
.warn-2{ .warn-2 {
color: #20a0ff; color: #20a0ff;
} }
.warn-3{ .warn-3 {
color: #ff9900; color: #ff9900;
} }
</style> </style>
<script> <script>
import 'static/css/uploadImg.css';// 引入图片上传组件对话框 import "static/css/uploadImg.css"; // 引入图片上传组件对话框
import vehicleMaintenanceModal from './vehicleMaintenanceModal';//车辆保养弹框 import vehicleMaintenanceModal from "./vehicleMaintenanceModal"; //车辆保养弹框
import vehicleExhibitionModal from './vehicleExhibitionModal';//车辆展览弹框 import vehicleExhibitionModal from "./vehicleExhibitionModal"; //车辆展览弹框
import vehiclePlanModal from './vehiclePlanModal';//安排用车 import vehiclePlanModal from "./vehiclePlanModal"; //安排用车
import rentOrderDetailModal from "../../order/modal/rentOrderDetailModal";//租车订单详情 import rentOrderDetailModal from "../../order/modal/rentOrderDetailModal"; //租车订单详情
import tourOrderDetailModal from "../../order/modal/tourOrderDetailModal";//房车游订单详情 import tourOrderDetailModal from "../../order/modal/tourOrderDetailModal"; //房车游订单详情
import disableModal from "./disableModal";//禁用弹框 import disableModal from "./disableModal"; //禁用弹框
import { import { getSysRegionByIds } from "api/vehicle/vehicleInfo/";
getSysRegionByIds import { getAllZone } from "api/base_info/constant/";
} from 'api/vehicle/vehicleInfo/'; import { getAllCompany, getAll } from "api/base_info/branch_company/";
import { import {
getAllZone
} from 'api/base_info/constant/';
import {
getAllCompany,
getAll
} from 'api/base_info/branch_company/';
import {
getAllBranchCompanyByZoneId, getAllBranchCompanyByZoneId,
orderDetail orderDetail,
} from 'api/order/rentVehicle'; } from "api/order/rentVehicle";
import { import { formatDate } from "utils/dateFormattor";
formatDate import { getAllVehicleList } from "api/vehicleType";
} from 'utils/dateFormattor'; import { company_all_list, branchCompany_all_list } from "api/company.js";
import { import {
getAllVehicleList
} from 'api/vehicleType';
import {
toEast8Date, toEast8Date,
deepCopyDate, deepCopyDate,
newEast8Date, newEast8Date,
...@@ -377,26 +503,24 @@ ...@@ -377,26 +503,24 @@
getCurrentMonth, getCurrentMonth,
getMonth, getMonth,
getymdTimeByDay, getymdTimeByDay,
getCurrentYearMonth getCurrentYearMonth,
} from 'utils/dateUtils'; } from "utils/dateUtils";
import rsCode from '../../../utils/rsCode'; import rsCode from "../../../utils/rsCode";
import {mapGetters} from 'vuex'; import { mapGetters } from "vuex";
import { import { getToken } from "utils/auth";
getToken import {
} from 'utils/auth';
import {
getVehiclePlanList, getVehiclePlanList,
getVehicleOrderDetail, getVehicleOrderDetail,
getTourInfor getTourInfor,
} from 'api/vehicle/vehicleSchedulManage'; } from "api/vehicle/vehicleSchedulManage";
import Element1 from "../../admin/menu/components/element"; import Element1 from "../../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row"; import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col"; import ElCol from "element-ui/packages/col/src/col";
export default { export default {
name: 'vehicleSchedulManage', name: "vehicleSchedulManage",
components: { components: {
ElCol, ElCol,
ElRow, ElRow,
...@@ -406,76 +530,81 @@ ...@@ -406,76 +530,81 @@
vehiclePlanModal, vehiclePlanModal,
rentOrderDetailModal, rentOrderDetailModal,
tourOrderDetailModal, tourOrderDetailModal,
disableModal disableModal,
}, },
data() { data() {
return { return {
allVehicleList: [],//全部车型 companys_list: [],
branchCompany_list: [],
branchCompany_list_copy: [],
allVehicleList: [], //全部车型
animate: false, animate: false,
firstTime: "",//排期表-第一个字段名称 firstTime: "", //排期表-第一个字段名称
marqueeList: [], marqueeList: [],
modalTitle: "创建", modalTitle: "创建",
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
oneCampsiteDialogVisible: false,//添加、编辑弹框 oneCampsiteDialogVisible: false, //添加、编辑弹框
showLoadingBody: false, showLoadingBody: false,
countTJ: undefined,//车辆概况 countTJ: undefined, //车辆概况
form: { form: {
tagNames:"",//标签 tagNames: "", //标签
name: undefined,//旅游名称 name: undefined, //旅游名称
saleCount: undefined,//销量 saleCount: undefined, //销量
stock: undefined,//总数量 stock: undefined, //总数量
status: undefined, status: undefined,
}, },
list: null, list: null,
total: null, total: null,
listLoading: true, listLoading: true,
endTime: "",//结束时间为0点时有值 endTime: "", //结束时间为0点时有值
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10, limit: 10,
parkBranchCompanyId: undefined,//停靠分公司id parkBranchCompanyId: undefined, //停靠分公司id
parkBranchCompanyName: undefined,//停靠分公司名称 parkBranchCompanyName: undefined, //停靠分公司名称
subordinateBranch: undefined,//所属分公司 subordinateBranch: undefined, //所属分公司
subordinateBranchName: undefined,//所属分公司名称 subordinateBranchName: undefined, //所属分公司名称
zoneId: undefined,//所属片区 zoneId: undefined, //所属片区
startTime: undefined, startTime: undefined,
endTime:undefined, endTime: undefined,
status: undefined,//车辆状态 status: undefined, //车辆状态
useType:undefined,//用途 useType: undefined, //用途
modelId:undefined,//车型 modelId: undefined, //车型
branchId: undefined, //企业
// parkBranchCompanyId: undefined, //门店
}, },
inline: true, inline: true,
mar: null,//滚屏 mar: null, //滚屏
textMap: { textMap: {
update: '编辑', update: "编辑",
create: '创建' create: "创建",
}, },
tableKey: 0, tableKey: 0,
tempDayList: [],//日期 tempDayList: [], //日期
currentMonth: undefined,//当前月份 currentMonth: undefined, //当前月份
nextMonth: undefined,//下月 nextMonth: undefined, //下月
allBranchCompany: [],//所有分公司列表 allBranchCompany: [], //所有分公司列表
baoyang: false,//保养弹框, baoyang: false, //保养弹框,
zhanlan: false,//展览弹框 zhanlan: false, //展览弹框
rentOrder: false,//租车订单详情 rentOrder: false, //租车订单详情
anpai: false,//安排用车弹框 anpai: false, //安排用车弹框
jinyong: false,//禁用弹框 jinyong: false, //禁用弹框
currentItem: {},//待操作数据 currentItem: {}, //待操作数据
orderDetailInfo: {},//租车订单详情 orderDetailInfo: {}, //租车订单详情
rentCostDetail: {},//租车订单费用明细 rentCostDetail: {}, //租车订单费用明细
tourDialogVisible: false,//旅游订单弹框 tourDialogVisible: false, //旅游订单弹框
tourRow: {},//旅游订单详情-当前行 tourRow: {}, //旅游订单详情-当前行
useTypeList:[ useTypeList: [
{ {
code:1, code: 1,
val:'租赁' val: "租赁",
}, },
{ {
code:2, code: 2,
val:'自用' val: "自用",
} },
] ],
} };
}, },
created() { created() {
let t = this; let t = this;
...@@ -486,22 +615,22 @@ ...@@ -486,22 +615,22 @@
let currentMonth = getCurrentMonth(); let currentMonth = getCurrentMonth();
this.currentMonth = parseInt(currentMonth); this.currentMonth = parseInt(currentMonth);
if(this.currentMonth < 12){ if (this.currentMonth < 12) {
this.nextMonth = this.currentMonth + 1; this.nextMonth = this.currentMonth + 1;
} else { } else {
this.nextMonth = 1; this.nextMonth = 1;
} }
this.firstTime = "日期("+this.currentMonth+"~"+this.nextMonth+")" this.firstTime = "日期(" + this.currentMonth + "~" + this.nextMonth + ")";
this.getTempDayList(); this.getTempDayList();
this.mar = setInterval(this.showMarquee, 2000); this.mar = setInterval(this.showMarquee, 2000);
getAll().then(response => { getAll().then((response) => {
this.allCompaniesArr = response.data; this.allCompaniesArr = response.data;
let query = localStorage.getItem("vehicleSchedulManage"); let query = localStorage.getItem("vehicleSchedulManage");
if(query !="null" && query){ if (query != "null" && query) {
this.listQuery = JSON.parse(query); this.listQuery = JSON.parse(query);
if(t.listQuery.parkBranchCompanyId){ if (t.listQuery.parkBranchCompanyId) {
t.allCompaniesArr.map(function (item) { t.allCompaniesArr.map(function (item) {
if(item.id == t.listQuery.parkBranchCompanyId){ if (item.id == t.listQuery.parkBranchCompanyId) {
t.listQuery.parkBranchCompanyName = item.name; t.listQuery.parkBranchCompanyName = item.name;
} }
}); });
...@@ -509,43 +638,75 @@ ...@@ -509,43 +638,75 @@
} }
this.getAllVehicleType(); this.getAllVehicleType();
}); });
getAllCompany(codeAndBranchCompany => { getAllCompany((codeAndBranchCompany) => {
this.allCompanies = codeAndBranchCompany; this.allCompanies = codeAndBranchCompany;
}); });
this.get_all_companys();
this.get_all_branchCompany();
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(["elements", "vehicleStatus"]),
'elements',
'vehicleStatus'
]),
//获取大区列表 //获取大区列表
getAllZoneList(){ getAllZoneList() {
this.allZoneArr = getAllZone(); this.allZoneArr = getAllZone();
return getAllZone(); return getAllZone();
}, },
}, },
methods: { methods: {
change_query_branch(val) {
if (val) {
this.branchCompany_list = this.branchCompany_list_copy.filter(
(item) => {
return item.companyId == val;
}
);
} else {
this.branchCompany_list = this.branchCompany_list_copy;
}
},
//所有公司
get_all_companys() {
company_all_list().then((res) => {
if (res.status == 200) {
this.companys_list = res.data;
}
});
},
//所有门店
get_all_branchCompany() {
branchCompany_all_list({ state: 1 }).then((res) => {
if (res.status == 200) {
this.branchCompany_list = res.data;
this.branchCompany_list_copy = res.data;
}
});
},
/** /**
* 重置 * 重置
* */ * */
reloadPage() { reloadPage() {
this.state1=''; this.state1 = "";
this.listQuery = { this.listQuery = {
page: 1, page: 1,
limit: 10, limit: 10,
parkBranchCompanyId: undefined,//停靠分公司id parkBranchCompanyId: undefined, //停靠分公司id
parkBranchCompanyName: undefined,//停靠分公司名称 parkBranchCompanyName: undefined, //停靠分公司名称
subordinateBranch: undefined,//所属分公司 subordinateBranch: undefined, //所属分公司
subordinateBranchName: undefined,//所属分公司名称 subordinateBranchName: undefined, //所属分公司名称
zoneId: undefined,//所属片区 zoneId: undefined, //所属片区
startTime: undefined, startTime: undefined,
endTime:undefined, endTime: undefined,
status: undefined,//车辆状态 status: undefined, //车辆状态
useType:undefined,//用途 useType: undefined, //用途
modelId:undefined,//车型 modelId: undefined, //车型
branchId: undefined, //企业
// parkBranchCompanyId: undefined, //门店
}; };
if(this.listQuery){ if (this.listQuery) {
localStorage.setItem("vehicleSchedulManage", JSON.stringify(this.listQuery)); localStorage.setItem(
"vehicleSchedulManage",
JSON.stringify(this.listQuery)
);
} }
this.getList(); this.getList();
}, },
...@@ -554,18 +715,18 @@ ...@@ -554,18 +715,18 @@
* */ * */
getAllVehicleType() { getAllVehicleType() {
let t = this; let t = this;
getAllVehicleList().then(response => { getAllVehicleList().then((response) => {
let listRs = undefined; let listRs = undefined;
if (!this.$utils.isEmpty(response.data)) { if (!this.$utils.isEmpty(response.data)) {
listRs = response.data; listRs = response.data;
} }
this.allVehicleList = listRs; this.allVehicleList = listRs;
let query = localStorage.getItem("vehicleSchedulManage"); let query = localStorage.getItem("vehicleSchedulManage");
if(query !="null" && query){ if (query != "null" && query) {
let queryJson = JSON.parse(query); let queryJson = JSON.parse(query);
if(queryJson.modelId){ if (queryJson.modelId) {
t.allVehicleList.map(function (item) { t.allVehicleList.map(function (item) {
if(item.id == queryJson.modelId){ if (item.id == queryJson.modelId) {
t.vehicleArr = item.name; t.vehicleArr = item.name;
} }
}); });
...@@ -577,87 +738,135 @@ ...@@ -577,87 +738,135 @@
/** /**
* 旅游订单详情弹框关闭 * 旅游订单详情弹框关闭
* */ * */
tourOrderDetailDialogEvent(e){ tourOrderDetailDialogEvent(e) {
this.tourDialogVisible = false; this.tourDialogVisible = false;
}, },
/** /**
* 点击事件 * 点击事件
* */ * */
toShowDialog(item, iitem, ii){ toShowDialog(item, iitem, ii) {
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他--> // <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
if (!item.mileageLastUpdate) { if (!item.mileageLastUpdate) {
item.mileageLastUpdate = 0 item.mileageLastUpdate = 0;
} }
if(!ii.bg){ if (!ii.bg) {
//空白-可安排用车 //空白-可安排用车
if(item.vehicleModel==undefined){ if (item.vehicleModel == undefined) {
this.$notify({ this.$notify({
title: '警告', title: "警告",
message: '车型未配置，请先配置', message: "车型未配置，请先配置",
type: 'warning', type: "warning",
duration: 2000 duration: 2000,
}); });
return false return false;
if(item.vehicleModel.keyword==undefined){ if (item.vehicleModel.keyword == undefined) {
this.$notify({ this.$notify({
title: '警告', title: "警告",
message: '车型未配置，请先配置', message: "车型未配置，请先配置",
type: 'warning', type: "warning",
duration: 2000 duration: 2000,
}); });
return false return false;
} }
} }
let arr = item.vehicleModel.keyword.split(","); let arr = item.vehicleModel.keyword.split(",");
item.vehicleModel.keyword = arr.join(" | "); item.vehicleModel.keyword = arr.join(" | ");
this.currentItem = {item: item, iitem: iitem, ii: ii}; this.currentItem = { item: item, iitem: iitem, ii: ii };
this.anpai = true; this.anpai = true;
} else { } else {
if(ii.vehicleBookRecord.status == 1){//审核中的显示预约弹框 if (ii.vehicleBookRecord.status == 1) {
//审核中的显示预约弹框
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车"}; this.currentItem = {
} else{ item: item,
if(ii.bookType == 6){ iitem: iitem,
ii: ii,
title: "预定用车",
};
} else {
if (ii.bookType == 6) {
//保养 //保养
this.baoyang = true; this.baoyang = true;
this.currentItem = {item: item, iitem: iitem, ii: ii}; this.currentItem = { item: item, iitem: iitem, ii: ii };
} else if(ii.bookType == 3){ } else if (ii.bookType == 3) {
//维修 //维修
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "维修",upkeepName:'维修'}; this.currentItem = {
} else if(ii.bookType == 4){ item: item,
iitem: iitem,
ii: ii,
title: "维修",
upkeepName: "维修",
};
} else if (ii.bookType == 4) {
//展览 //展览
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'}; this.currentItem = {
} else if(ii.bookType == 1){ item: item,
if(!ii.vehicleBookRecord.orderNo){ iitem: iitem,
ii: ii,
title: "展览用车",
upkeepName: "展览",
};
} else if (ii.bookType == 1) {
if (!ii.vehicleBookRecord.orderNo) {
this.$notify({ this.$notify({
title: '警告', title: "警告",
message: '订单号缺失', message: "订单号缺失",
type: 'warning', type: "warning",
duration: 2000 duration: 2000,
}); });
return false; return false;
} else{ } else {
this.getOneVechi(ii.vehicleBookRecord.orderNo); this.getOneVechi(ii.vehicleBookRecord.orderNo);
} }
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"}; this.currentItem = {
}else if(ii.bookType == 9){ item: item,
iitem: iitem,
ii: ii,
title: "租车订单",
};
} else if (ii.bookType == 9) {
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'}; this.currentItem = {
} else if(ii.bookType == 5) { item: item,
iitem: iitem,
ii: ii,
title: "客户用车",
upkeepName: "客户用车",
};
} else if (ii.bookType == 5) {
//房车游订单详情 //房车游订单详情
var str = '' var str = "";
getTourInfor(ii.vehicleBookRecord.orderNo).then(response => { getTourInfor(ii.vehicleBookRecord.orderNo).then((response) => {
if(response.status==200){ if (response.status == 200) {
str = '旅游路线：' + response.data.goodName +' 出发时间：' +response.data.time+' 出发地：' +response.data.siteName str =
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游',str:str}; "旅游路线：" +
response.data.goodName +
" 出发时间：" +
response.data.time +
" 出发地：" +
response.data.siteName;
this.currentItem = {
item: item,
iitem: iitem,
ii: ii,
title: "房车游",
upkeepName: "房车游",
str: str,
};
this.zhanlan = true; this.zhanlan = true;
}else{ } else {
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游'}; this.currentItem = {
item: item,
iitem: iitem,
ii: ii,
title: "房车游",
upkeepName: "房车游",
};
this.zhanlan = true; this.zhanlan = true;
} }
}) });
// if(!ii.vehicleBookRecord.orderNo){ // if(!ii.vehicleBookRecord.orderNo){
// this.$notify({ // this.$notify({
// title: '警告', // title: '警告',
...@@ -670,81 +879,96 @@ ...@@ -670,81 +879,96 @@
// this.tourRow = {no: ii.vehicleBookRecord.orderNo}; // this.tourRow = {no: ii.vehicleBookRecord.orderNo};
// this.tourDialogVisible = true // this.tourDialogVisible = true
// } // }
} else if(ii.bookType == 8) { } else if (ii.bookType == 8) {
//禁用 //禁用
this.jinyong = true; this.jinyong = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "禁用"}; this.currentItem = {
} else if(ii.bookType == 10) { item: item,
iitem: iitem,
ii: ii,
title: "禁用",
};
} else if (ii.bookType == 10) {
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "其他",upkeepName:'其他'}; this.currentItem = {
item: item,
iitem: iitem,
ii: ii,
title: "其他",
upkeepName: "其他",
};
} }
} }
} }
}, },
/** /**
* 根据订单号获取订单详情 * 根据订单号获取订单详情
* */ * */
getOneVechi: function(orderNo) { getOneVechi: function (orderNo) {
var param = { var param = {
"orderNo":orderNo, orderNo: orderNo,
"flag" : true flag: true,
} };
orderDetail(param).then(response => { orderDetail(param).then((response) => {
this.orderDetailInfo = response.data this.orderDetailInfo = response.data;
if(this.orderDetailInfo && this.orderDetailInfo.memberLevel) { if (this.orderDetailInfo && this.orderDetailInfo.memberLevel) {
if(this.orderDetailInfo.memberLevel == 1) { if (this.orderDetailInfo.memberLevel == 1) {
this.orderDetailInfo.memberName = "普通会员" this.orderDetailInfo.memberName = "普通会员";
} }
if(this.orderDetailInfo.memberLevel == 2) { if (this.orderDetailInfo.memberLevel == 2) {
this.orderDetailInfo.memberName = "黄金会员" this.orderDetailInfo.memberName = "黄金会员";
} }
if(this.orderDetailInfo.memberLevel == 3) { if (this.orderDetailInfo.memberLevel == 3) {
this.orderDetailInfo.memberName = "钻石会员" this.orderDetailInfo.memberName = "钻石会员";
} }
if(this.orderDetailInfo.orderRentVehicleDetail.costDetail) { if (this.orderDetailInfo.orderRentVehicleDetail.costDetail) {
this.orderDetailInfo.costDetail = JSON.parse(this.orderDetailInfo.orderRentVehicleDetail.costDetail) this.orderDetailInfo.costDetail = JSON.parse(
this.orderDetailInfo.orderRentVehicleDetail.costDetail
);
} }
if(this.orderDetailInfo.costDetail.paramJson) { if (this.orderDetailInfo.costDetail.paramJson) {
this.orderDetailInfo.rentVehiclePriceVO = JSON.parse(this.orderDetailInfo.costDetail.paramJson) this.orderDetailInfo.rentVehiclePriceVO = JSON.parse(
this.orderDetailInfo.costDetail.paramJson
);
} }
if(this.orderDetailInfo.items) { if (this.orderDetailInfo.items) {
for (var i = 0;i< this.orderDetailInfo.items.length;i++) { for (var i = 0; i < this.orderDetailInfo.items.length; i++) {
if(this.orderDetailInfo.items[i].type == 104) { if (this.orderDetailInfo.items[i].type == 104) {
this.orderDetailInfo.carArticlesJson = this.orderDetailInfo.items[i].detail this.orderDetailInfo.carArticlesJson = this.orderDetailInfo.items[
i
].detail;
} }
} }
} }
if (this.orderDetailInfo.status == 2) { if (this.orderDetailInfo.status == 2) {
this.orderDetailInfo.ststusName = '取消' this.orderDetailInfo.ststusName = "取消";
} }
if (this.orderDetailInfo.status == -1) { if (this.orderDetailInfo.status == -1) {
this.orderDetailInfo.ststusName = '定损中' this.orderDetailInfo.ststusName = "定损中";
} }
if (this.orderDetailInfo.status == 3) { if (this.orderDetailInfo.status == 3) {
this.orderDetailInfo.ststusName = '待付款' this.orderDetailInfo.ststusName = "待付款";
} }
if (this.orderDetailInfo.status == 4) { if (this.orderDetailInfo.status == 4) {
this.orderDetailInfo.ststusName = '待出行' this.orderDetailInfo.ststusName = "待出行";
} }
if (this.orderDetailInfo.status == 5) { if (this.orderDetailInfo.status == 5) {
this.orderDetailInfo.ststusName = '出行中' this.orderDetailInfo.ststusName = "出行中";
} }
if (this.orderDetailInfo.status == 6) { if (this.orderDetailInfo.status == 6) {
this.orderDetailInfo.ststusName = '已完成' this.orderDetailInfo.ststusName = "已完成";
} }
} }
this.rentOrder = true this.rentOrder = true;
}) });
}, },
/** /**
* 关闭保养弹框后逻辑处理 * 关闭保养弹框后逻辑处理
* */ * */
baoyangDialogEvent(e){ baoyangDialogEvent(e) {
this.baoyang = false; this.baoyang = false;
if(e){//关闭编辑 if (e) {
//关闭编辑
//编辑成功-重新加载列表 //编辑成功-重新加载列表
this.getList(); this.getList();
} }
...@@ -752,9 +976,10 @@ ...@@ -752,9 +976,10 @@
/** /**
* 关闭展览弹框后逻辑处理 * 关闭展览弹框后逻辑处理
* */ * */
zhanlanDialogEvent(e){ zhanlanDialogEvent(e) {
this.zhanlan = false; this.zhanlan = false;
if(e){//关闭编辑 if (e) {
//关闭编辑
//编辑成功-重新加载列表 //编辑成功-重新加载列表
this.getList(); this.getList();
} }
...@@ -762,9 +987,10 @@ ...@@ -762,9 +987,10 @@
/** /**
* 禁用弹框关闭后逻辑处理 * 禁用弹框关闭后逻辑处理
* */ * */
jinyongDialogEvent(e){ jinyongDialogEvent(e) {
this.jinyong = false; this.jinyong = false;
if(e){//关闭编辑 if (e) {
//关闭编辑
//编辑成功-重新加载列表 //编辑成功-重新加载列表
this.getList(); this.getList();
} }
...@@ -772,9 +998,10 @@ ...@@ -772,9 +998,10 @@
/** /**
* 安排用车弹框关闭逻辑处理 * 安排用车弹框关闭逻辑处理
* */ * */
anpaiDialogEvent(e){ anpaiDialogEvent(e) {
this.anpai = false; this.anpai = false;
if(e){//关闭编辑 if (e) {
//关闭编辑
//编辑成功-重新加载列表 //编辑成功-重新加载列表
this.getList(); this.getList();
} }
...@@ -782,7 +1009,7 @@ ...@@ -782,7 +1009,7 @@
/** /**
* 租车订单详情弹框关闭 * 租车订单详情弹框关闭
* */ * */
rentOrderDetailDialogEvent(e){ rentOrderDetailDialogEvent(e) {
this.rentOrder = false; this.rentOrder = false;
}, },
/** /**
...@@ -792,36 +1019,35 @@ ...@@ -792,36 +1019,35 @@
// debugger // debugger
this.listQuery.zoneId = item; this.listQuery.zoneId = item;
this.listQuery.subordinateBranch = undefined; this.listQuery.subordinateBranch = undefined;
getAllBranchCompanyByZoneId({zoneId: item}) getAllBranchCompanyByZoneId({ zoneId: item }).then((response) => {
.then(response => {
this.allBranchCompany = response.data; this.allBranchCompany = response.data;
}) });
}, },
/** /**
* 选择分公司 * 选择分公司
* */ * */
getAllBranchCompanyChange(item) { getAllBranchCompanyChange(item) {
this.listQuery.subordinateBranch = item this.listQuery.subordinateBranch = item;
}, },
/** /**
* 鼠标移入 * 鼠标移入
* */ * */
handelOver(){ handelOver() {
clearInterval(this.mar); clearInterval(this.mar);
}, },
/** /**
* 鼠标移出 * 鼠标移出
* */ * */
handelOut(){ handelOut() {
this.mar = setInterval(this.showMarquee, 2000); this.mar = setInterval(this.showMarquee, 2000);
}, },
/** /**
* 立即处理 * 立即处理
* */ * */
toVehicleWarningMsg(){ toVehicleWarningMsg() {
this.$router.push({path: '/vehicle/vehicleWarningMsg'}); this.$router.push({ path: "/vehicle/vehicleWarningMsg" });
}, },
showMarquee: function() { showMarquee: function () {
this.animate = true; this.animate = true;
setTimeout(() => { setTimeout(() => {
this.marqueeList.push(this.marqueeList[0]); this.marqueeList.push(this.marqueeList[0]);
...@@ -835,8 +1061,8 @@ ...@@ -835,8 +1061,8 @@
/** /**
* 所属分公司 * 所属分公司
* */ * */
handleSelectSubordinate(item){ handleSelectSubordinate(item) {
if(item.value == "无"){ if (item.value == "无") {
this.listQuery.subordinateBranch = undefined; this.listQuery.subordinateBranch = undefined;
this.listQuery.subordinateBranchName = "无"; this.listQuery.subordinateBranchName = "无";
} else { } else {
...@@ -847,8 +1073,8 @@ ...@@ -847,8 +1073,8 @@
/** /**
* 停靠分公司 * 停靠分公司
* */ * */
handleSelectPark(item){ handleSelectPark(item) {
if(item.value == "无"){ if (item.value == "无") {
this.listQuery.parkBranchCompanyId = undefined; this.listQuery.parkBranchCompanyId = undefined;
this.listQuery.parkBranchCompanyName = "无"; this.listQuery.parkBranchCompanyName = "无";
} else { } else {
...@@ -860,21 +1086,23 @@ ...@@ -860,21 +1086,23 @@
let selectArry = []; let selectArry = [];
let iitem = { let iitem = {
value: "无", value: "无",
name: "无" name: "无",
}; };
selectArry.push(iitem); selectArry.push(iitem);
this.allCompaniesArr.map(function(item){ this.allCompaniesArr.map(function (item) {
item.value = item.name; item.value = item.name;
selectArry.push(item); selectArry.push(item);
}); });
this.selectArry = selectArry; this.selectArry = selectArry;
var results = queryString ? selectArry.filter(this.createFilter(queryString)) : selectArry; var results = queryString
? selectArry.filter(this.createFilter(queryString))
: selectArry;
// 调用 callback 返回建议列表的数据 // 调用 callback 返回建议列表的数据
cb(results); cb(results);
}, },
createFilter(queryString) { createFilter(queryString) {
return (restaurant) => { return (restaurant) => {
return (restaurant.name.indexOf(queryString.toLowerCase()) != -1); return restaurant.name.indexOf(queryString.toLowerCase()) != -1;
}; };
}, },
/** /**
...@@ -883,67 +1111,73 @@ ...@@ -883,67 +1111,73 @@
getList() { getList() {
let _this = this; let _this = this;
this.listLoading = true; this.listLoading = true;
if(this.listQuery.startTime && (typeof this.listQuery.startTime == "object")){ if (
this.listQuery.startTime &&
typeof this.listQuery.startTime == "object"
) {
this.listQuery.startTime = this.listQuery.startTime.getTime(); this.listQuery.startTime = this.listQuery.startTime.getTime();
} }
if(this.listQuery.endTime && (typeof this.listQuery.endTime == "object")){ if (this.listQuery.endTime && typeof this.listQuery.endTime == "object") {
this.listQuery.endTime = this.listQuery.endTime.getTime(); this.listQuery.endTime = this.listQuery.endTime.getTime();
} }
getVehiclePlanList(this.listQuery).then(response => { getVehiclePlanList(this.listQuery).then((response) => {
this.countTJ = response.data.vehicleCountVos; this.countTJ = response.data.vehicleCountVos;
let totalCountRs = undefined; let totalCountRs = undefined;
let listRs = undefined; let listRs = undefined;
if (!this.$utils.isEmpty(response.data.vehicleAndModelInfoVo) && this.$utils.isInteger(response.data.vehicleAndModelInfoVo.totalCount)) { if (
!this.$utils.isEmpty(response.data.vehicleAndModelInfoVo) &&
this.$utils.isInteger(response.data.vehicleAndModelInfoVo.totalCount)
) {
listRs = response.data.vehicleAndModelInfoVo.data; listRs = response.data.vehicleAndModelInfoVo.data;
totalCountRs = response.data.vehicleAndModelInfoVo.totalCount; totalCountRs = response.data.vehicleAndModelInfoVo.totalCount;
listRs.map(function(item){ listRs.map(function (item) {
item.visible2 = false; item.visible2 = false;
item.crtTimeStr = timestamp2Date(item.crtTime); item.crtTimeStr = timestamp2Date(item.crtTime);
if(item.storeTypeName){ if (item.storeTypeName) {
item.storeTypeName = item.storeTypeName.join("|"); item.storeTypeName = item.storeTypeName.join("|");
} }
// 解析开始时间-结束时间 // 解析开始时间-结束时间
// item.vehicleBookRecord.map(function (iitem) { // item.vehicleBookRecord.map(function (iitem) {
// let bookStartDate = iitem.bookStartDate.substring(0,10); // let bookStartDate = iitem.bookStartDate.substring(0,10);
// let bookEndDate = iitem.bookEndDate.substring(0,10); // let bookEndDate = iitem.bookEndDate.substring(0,10);
// iitem.startHourList = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"]; // iitem.startHourList = ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
// if(iitem.startHour){ // if(iitem.startHour){
// for(let i = 0; i < iitem.startHour.length;i++){ // for(let i = 0; i < iitem.startHour.length;i++){
// iitem.startHourList[i] = iitem.startHour[i] // iitem.startHourList[i] = iitem.startHour[i]
// } // }
// } // }
// iitem.startHourList = iitem.startHourList?iitem.startHourList.reverse(): ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"]; // iitem.startHourList = iitem.startHourList?iitem.startHourList.reverse(): ["0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"];
// let flag = false;//开始时间标识，查找第一个1 // let flag = false;//开始时间标识，查找第一个1
// let flagE = false;//结束时间标识，查找第一个0 // let flagE = false;//结束时间标识，查找第一个0
// let sStart = "00";//开始时间 // let sStart = "00";//开始时间
// let sEnd= "00";//结束时间 // let sEnd= "00";//结束时间
// iitem.startHourList.map(function(ic, index){ // iitem.startHourList.map(function(ic, index){
// let c = index +1; // let c = index +1;
// if(ic == 1 && !flag){ // if(ic == 1 && !flag){
// if(c<10){ // if(c<10){
// sStart = "0"+c; // sStart = "0"+c;
// } else { // } else {
// sStart = c // sStart = c
// } // }
// flag = true; // flag = true;
// } // }
// }); // });
// if(iitem.endHour){ // if(iitem.endHour){
// if(iitem.endHour.length>=10){ // if(iitem.endHour.length>=10){
// sEnd = iitem.endHour.length; // sEnd = iitem.endHour.length;
// } else { // } else {
// sEnd = "0" + iitem.endHour.length; // sEnd = "0" + iitem.endHour.length;
// } // }
// } // }
// iitem.bookStartDate = iitem.bookStartDate.substring(0,10) + " " +sStart + ":00:00"; // iitem.bookStartDate = iitem.bookStartDate.substring(0,10) + " " +sStart + ":00:00";
// iitem.bookEndDate = iitem.bookEndDate.substring(0,10) + " " +sEnd + ":00:00"; // iitem.bookEndDate = iitem.bookEndDate.substring(0,10) + " " +sEnd + ":00:00";
// }); // });
// item.temp = _this.getDayList(item);//获取车辆30天排期 // item.temp = _this.getDayList(item);//获取车辆30天排期
item.temp = _this.getMonthDayList(item);//获取车辆30天排期 item.temp = _this.getMonthDayList(item); //获取车辆30天排期
}); });
} }
if (!this.$utils.isEmpty(response.data.vehicleWarningMsgs)) { if (!this.$utils.isEmpty(response.data.vehicleWarningMsgs)) {
response.data.vehicleWarningMsgs.map(function(ii){ response.data.vehicleWarningMsgs.map(function (ii) {
ii.color = "warn-" + ii.colorType; ii.color = "warn-" + ii.colorType;
}); });
this.marqueeList = response.data.vehicleWarningMsgs; this.marqueeList = response.data.vehicleWarningMsgs;
...@@ -953,17 +1187,20 @@ ...@@ -953,17 +1187,20 @@
//渲染颜色 //渲染颜色
this.setColor(); this.setColor();
this.total = totalCountRs; this.total = totalCountRs;
}) });
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1; this.listQuery.page = 1;
if(this.listQuery.numberPlate==''){ if (this.listQuery.numberPlate == "") {
this.listQuery.numberPlate = null; this.listQuery.numberPlate = null;
} }
this.$refs.queryForm.validate(valid => { this.$refs.queryForm.validate((valid) => {
if (valid) { if (valid) {
if(this.listQuery){ if (this.listQuery) {
localStorage.setItem("vehicleSchedulManage", JSON.stringify(this.listQuery)); localStorage.setItem(
"vehicleSchedulManage",
JSON.stringify(this.listQuery)
);
} }
this.getList(); this.getList();
} else { } else {
...@@ -973,47 +1210,53 @@ ...@@ -973,47 +1210,53 @@
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.listQuery.limit = val; this.listQuery.limit = val;
if(this.listQuery){ if (this.listQuery) {
localStorage.setItem("vehicleSchedulManage", JSON.stringify(this.listQuery)); localStorage.setItem(
"vehicleSchedulManage",
JSON.stringify(this.listQuery)
);
} }
this.getList(); this.getList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.listQuery.page = val; this.listQuery.page = val;
if(this.listQuery){ if (this.listQuery) {
localStorage.setItem("vehicleSchedulManage", JSON.stringify(this.listQuery)); localStorage.setItem(
"vehicleSchedulManage",
JSON.stringify(this.listQuery)
);
} }
this.getList(); this.getList();
}, },
/** /**
* 获取未来30天日历表 * 获取未来30天日历表
* */ * */
getMonthDayList(item){ getMonthDayList(item) {
let temp = []; let temp = [];
let list = this.list; let list = this.list;
for(let i = 0; i < 30; i++){ for (let i = 0; i < 30; i++) {
let t = []; let t = [];
let tymd = getymdTimeByDay(i); let tymd = getymdTimeByDay(i);
temp.push({day: getTimeByDay(i), month: getMonth(i), time: tymd}); temp.push({ day: getTimeByDay(i), month: getMonth(i), time: tymd });
} }
return temp; return temp;
}, },
/** /**
* 渲染颜色 * 渲染颜色
* */ * */
getDayList(item){ getDayList(item) {
let temp = []; let temp = [];
let list = this.list; let list = this.list;
for(let i = 0; i < 30; i++){ for (let i = 0; i < 30; i++) {
let t = []; let t = [];
let tymd = getymdTimeByDay(i); let tymd = getymdTimeByDay(i);
let children = []; let children = [];
let tt = "";//yyyy-MM-dd hh:mm:ss let tt = ""; //yyyy-MM-dd hh:mm:ss
let h = ""; let h = "";
let bookType = undefined;//当前车辆状态 let bookType = undefined; //当前车辆状态
let vehicleBookRecord = {};//车辆排班信息 let vehicleBookRecord = {}; //车辆排班信息
for(let ii = 0; ii < 24; ii ++) { for (let ii = 0; ii < 24; ii++) {
if (ii < 10) { if (ii < 10) {
h = "0" + ii; h = "0" + ii;
tt = tymd + " 0" + ii + ":00:00"; tt = tymd + " 0" + ii + ":00:00";
...@@ -1021,21 +1264,31 @@ ...@@ -1021,21 +1264,31 @@
tt = tymd + " " + ii + ":00:00"; tt = tymd + " " + ii + ":00:00";
h = ii; h = ii;
} }
let bg = "";//背景色 let bg = ""; //背景色
let pp = {}; let pp = {};
pp.time = tt; pp.time = tt;
pp.h = h; pp.h = h;
item.vehicleBookRecord.map(function (iitem) { item.vehicleBookRecord.map(function (iitem) {
if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) { if (iitem.bookStartDate <= tt && iitem.bookEndDate >= tt) {
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他--> // <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4)){//租车、旅游、展览显示起止时间 if (
iitem.bookStartDate == tt &&
(iitem.bookType == 1 ||
iitem.bookType == 5 ||
iitem.bookType == 4)
) {
//租车、旅游、展览显示起止时间
pp.timeStr = h; pp.timeStr = h;
} }
pp.bg = "bg-"+ iitem.bookType; pp.bg = "bg-" + iitem.bookType;
pp.vehicleBookRecord = iitem; pp.vehicleBookRecord = iitem;
pp.bookType = iitem.bookType; pp.bookType = iitem.bookType;
if(iitem.bookEndDate == tt){ if (iitem.bookEndDate == tt) {
if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){ if (
iitem.bookType == 1 ||
iitem.bookType == 5 ||
iitem.bookType == 4
) {
pp.timeEtr = h; pp.timeEtr = h;
} }
pp.bg = ""; pp.bg = "";
...@@ -1044,25 +1297,29 @@ ...@@ -1044,25 +1297,29 @@
}); });
children.push(pp); children.push(pp);
} }
temp.push({day: getTimeByDay(i), month: getMonth(i), children: children}); temp.push({
day: getTimeByDay(i),
month: getMonth(i),
children: children,
});
} }
return temp; return temp;
}, },
/** /**
* 获取日期数组 * 获取日期数组
* */ * */
setColor(){ setColor() {
let temp = []; let temp = [];
this.list.map(function(item){ this.list.map(function (item) {
let endTime = ''; let endTime = "";
item.temp.map(function(ttemp){ item.temp.map(function (ttemp) {
let children = []; let children = [];
let tt = "";//yyyy-MM-dd hh:mm:ss let tt = ""; //yyyy-MM-dd hh:mm:ss
let h = ""; let h = "";
let bookType = undefined;//当前车辆状态 let bookType = undefined; //当前车辆状态
let vehicleBookRecord = {};//车辆排班信息 let vehicleBookRecord = {}; //车辆排班信息
for(let ii = 0; ii < 24; ii ++) { for (let ii = 0; ii < 24; ii++) {
if (ii < 10) { if (ii < 10) {
h = "0" + ii; h = "0" + ii;
tt = ttemp.time + " 0" + ii + ":00:00"; tt = ttemp.time + " 0" + ii + ":00:00";
...@@ -1070,32 +1327,43 @@ ...@@ -1070,32 +1327,43 @@
tt = ttemp.time + " " + ii + ":00:00"; tt = ttemp.time + " " + ii + ":00:00";
h = ii; h = ii;
} }
let bg = "";//背景色 let bg = ""; //背景色
let pp = {}; let pp = {};
pp.time =tt; pp.time = tt;
pp.h = h; pp.h = h;
item.vehicleBookRecord.map(function (iitem) { item.vehicleBookRecord.map(function (iitem) {
if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) { if (iitem.bookStartDate <= tt && iitem.bookEndDate >= tt) {
// <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用--> // <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4) && iitem.status == 2){//租车、旅游、展览显示起止时间 if (
iitem.bookStartDate == tt &&
(iitem.bookType == 1 ||
iitem.bookType == 5 ||
iitem.bookType == 4) &&
iitem.status == 2
) {
//租车、旅游、展览显示起止时间
pp.timeStr = h; pp.timeStr = h;
} }
if(iitem.status == 1){ if (iitem.status == 1) {
//审核中 //审核中
pp.bg = "bg-7"; pp.bg = "bg-7";
} else { } else {
pp.bg = "bg-"+ iitem.bookType; pp.bg = "bg-" + iitem.bookType;
} }
pp.vehicleBookRecord = iitem; pp.vehicleBookRecord = iitem;
pp.bookType = iitem.bookType; pp.bookType = iitem.bookType;
if(iitem.bookEndDate == tt && iitem.status == 2){ if (iitem.bookEndDate == tt && iitem.status == 2) {
if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){ if (
iitem.bookType == 1 ||
iitem.bookType == 5 ||
iitem.bookType == 4
) {
pp.timeEtr = h; pp.timeEtr = h;
if(h == "00"){ if (h == "00") {
let cc = new Date(tt); let cc = new Date(tt);
console.log(cc); console.log(cc);
let te = cc.getTime()-24*60*60; let te = cc.getTime() - 24 * 60 * 60;
endTime = timestamp2Date(te).substring(0, 13) +":00:00"; endTime = timestamp2Date(te).substring(0, 13) + ":00:00";
console.log(endTime); console.log(endTime);
} }
} }
...@@ -1105,7 +1373,7 @@ ...@@ -1105,7 +1373,7 @@
}); });
children.push(pp); children.push(pp);
} }
ttemp.children = children ttemp.children = children;
}); });
}); });
console.log(this.list); console.log(this.list);
...@@ -1113,22 +1381,28 @@ ...@@ -1113,22 +1381,28 @@
/** /**
* tempDayList * tempDayList
**/ **/
getTempDayList(){ getTempDayList() {
let temp = []; let temp = [];
for(let i = 0; i < 30; i++){ for (let i = 0; i < 30; i++) {
let t = []; let t = [];
let tymd = getymdTimeByDay(i); let tymd = getymdTimeByDay(i);
temp.push({day: getTimeByDay(i), month: getMonth(i), time: tymd}); temp.push({ day: getTimeByDay(i), month: getMonth(i), time: tymd });
} }
this.tempDayList = temp; this.tempDayList = temp;
}, },
/** /**
* 排版记录 * 排版记录
*/ */
toVehicleRecords(item){ toVehicleRecords(item) {
let selectedMonth = getCurrentYearMonth(); let selectedMonth = getCurrentYearMonth();
this.$router.push({path: '/vehicle/vehicleRecords?selectedMonth='+selectedMonth+"&numberPlate="+item.numberPlate}); this.$router.push({
} path:
} "/vehicle/vehicleRecords?selectedMonth=" +
} selectedMonth +
"&numberPlate=" +
item.numberPlate,
});
},
},
};
</script> </script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment