Skip to content

C
cloud-platform-ui
Commit e13b129b authored by guoyou's avatar guoyou
Browse files
Options

员工录入操作权限

parent bd5a94e1
Show whitespace changes
Inline Side-by-side
Showing with 1166 additions and 1022 deletions
src/views/userManagement/employeesInput.vue
View file @ e13b129b
...@@ -66,11 +66,13 @@ ...@@ -66,11 +66,13 @@
size="small" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="editorStaff(scope.row)" @click="editorStaff(scope.row)"
v-if="scope.row.status != 1"
>编辑</el-button> >编辑</el-button>
<el-button <el-button
size="small" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="deleteStaff(scope.row)" @click="deleteStaff(scope.row)"
v-if="scope.row.status != 1"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/vehicle/bookRecord/index.vue
View file @ e13b129b
...@@ -5,8 +5,14 @@ ...@@ -5,8 +5,14 @@
<el-form-item label="申请状态"> <el-form-item label="申请状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择申请状态"> <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择申请状态">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in statusList " :key="val.code" :label="val.val" <!-- <el-option v-for="(val, key, index) in statusList " :key="val.code" :label="val.val"
:value="val.code"></el-option> :value="val.code"></el-option>-->
<el-option
v-for="(val, index) in statusList "
:key="index"
:label="val.val"
:value="val.code"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="车辆编码"> <el-form-item label="车辆编码">
...@@ -18,21 +24,41 @@ ...@@ -18,21 +24,41 @@
<el-form-item label="用途"> <el-form-item label="用途">
<el-select class="filter-item" v-model="listQuery.bookType" placeholder="请选择"> <el-select class="filter-item" v-model="listQuery.bookType" placeholder="请选择">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="val in bookTypeList" :key="val.id" :label="val.name" :value="val.id"> </el-option> <el-option v-for="val in bookTypeList" :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="所属大区"> <el-form-item label="所属大区">
<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="提车公司"> <el-form-item label="提车公司">
<el-select class="filter-item" v-model="listQuery.liftCompany" placeholder="请选择" @change="getAllBranchCompanyChange"> <el-select
class="filter-item"
v-model="listQuery.liftCompany"
placeholder="请选择"
@change="getAllBranchCompanyChange"
>
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<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-form-item label="预订月份" prop="selectedMonth4Query"> <el-form-item label="预订月份" prop="selectedMonth4Query">
...@@ -41,16 +67,22 @@ ...@@ -41,16 +67,22 @@
type="month" type="month"
:editable="true" :editable="true"
format="yyyy-MM" format="yyyy-MM"
placeholder="请选择预订月份"> placeholder="请选择预订月份"
</el-date-picker> ></el-date-picker>
</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-form> </el-form>
</div> </div>
<el-table
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row :key="tableKey"
style="width: 100%"> :data="list"
v-loading.body="listLoading"
border
fit
highlight-current-row
style="width: 100%"
>
<el-table-column align="center" label="车牌号" width="120"> <el-table-column align="center" label="车牌号" width="120">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.numberPlate}}</span> <span>{{scope.row.numberPlate}}</span>
...@@ -97,7 +129,7 @@ ...@@ -97,7 +129,7 @@
<span v-else>{{getDatePeriodStr([scope.row.bookStartDate, scope.row.bookEndDate])}}</span> <span v-else>{{getDatePeriodStr([scope.row.bookStartDate, scope.row.bookEndDate])}}</span>
</template> </template>
</el-table-column> --> </el-table-column>-->
<!-- <el-table-column align="center" label="提车地址" width="200">--> <!-- <el-table-column align="center" label="提车地址" width="200">-->
<!-- <template scope="scope">--> <!-- <template scope="scope">-->
...@@ -127,7 +159,7 @@ ...@@ -127,7 +159,7 @@
<template scope="scope"> <template scope="scope">
<span>{{scope.row.reviewerNameCancel}}</span> <span>{{scope.row.reviewerNameCancel}}</span>
</template> </template>
</el-table-column> --> </el-table-column>-->
<el-table-column align="center" label="提车公司" width="200"> <el-table-column align="center" label="提车公司" width="200">
<template scope="scope"> <template scope="scope">
...@@ -143,7 +175,7 @@ ...@@ -143,7 +175,7 @@
<template scope="scope"> <template scope="scope">
<span>{{scope.row.actualStartDate}}</span> <span>{{scope.row.actualStartDate}}</span>
</template> </template>
</el-table-column> --> </el-table-column>-->
<el-table-column align="center" label="还车公司" width="200"> <el-table-column align="center" label="还车公司" width="200">
<template scope="scope"> <template scope="scope">
...@@ -184,7 +216,7 @@ ...@@ -184,7 +216,7 @@
<template scope="scope"> <template scope="scope">
<span>{{scope.row.haveViolation?'是':'否'}}</span> <span>{{scope.row.haveViolation?'是':'否'}}</span>
</template> </template>
</el-table-column> --> </el-table-column>-->
<el-table-column align="center" label="详情" width="100" fixed="right"> <el-table-column align="center" label="详情" width="100" fixed="right">
<template scope="scope"> <template scope="scope">
<span style="color: #13CE66;cursor: pointer;" @click="handleDetail(scope.row)">订单详情</span> <span style="color: #13CE66;cursor: pointer;" @click="handleDetail(scope.row)">订单详情</span>
...@@ -193,26 +225,64 @@ ...@@ -193,26 +225,64 @@
<el-table-column align="center" label="操作" width="200" fixed="right"> <el-table-column align="center" label="操作" width="200" fixed="right">
<template scope="scope"> <template scope="scope">
<!-- <el-button size="small" type="success" @click="handleBookInfo(scope.row)">预订信息</el-button> --> <!-- <el-button size="small" type="success" @click="handleBookInfo(scope.row)">预订信息</el-button> -->
<el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.status==3" @click="illegalInquiry(scope.row)">违章记录</el-button> <el-button
<el-button v-if="bookRecord_btn_prove&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small" @click="handleProve(scope.row)">通过</el-button> size="small"
<el-button v-if="bookRecord_btn_reject&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small" style="color: red;" @click="handleReject(scope.row)">驳回</el-button> class="el-button el-button--text el-button--small"
v-if="scope.row.status==3"
@click="illegalInquiry(scope.row)"
>违章记录</el-button>
<el-button
v-if="bookRecord_btn_prove&&scope.row.status==1"
size="small"
class="el-button el-button--text el-button--small"
@click="handleProve(scope.row)"
>通过</el-button>
<el-button
v-if="bookRecord_btn_reject&&scope.row.status==1"
size="small"
class="el-button el-button--text el-button--small"
style="color: red;"
@click="handleReject(scope.row)"
>驳回</el-button>
<template v-if="scope.row.vehicleDepartureLogVo==undefined"> <template v-if="scope.row.vehicleDepartureLogVo==undefined">
<el-button v-if="bookRecord_btn_lift&&scope.row.liftStatus==1&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small" @click="handleLift(scope.row)">出车</el-button> <el-button
v-if="bookRecord_btn_lift&&scope.row.liftStatus==1&&scope.row.status==2"
size="small"
class="el-button el-button--text el-button--small"
@click="handleLift(scope.row)"
>出车</el-button>
</template> </template>
<template v-if="scope.row.vehicleDepartureLogVo!=undefined"> <template v-if="scope.row.vehicleDepartureLogVo!=undefined">
<el-button v-if="bookRecord_btn_ret&&scope.row.vehicleDepartureLogVo.state==0&&scope.row.retStatus==1" size="small" class="el-button el-button--text el-button--small" @click="handleRet(scope.row)">收车</el-button> <el-button
v-if="bookRecord_btn_ret&&scope.row.vehicleDepartureLogVo.state==0&&scope.row.retStatus==1"
size="small"
class="el-button el-button--text el-button--small"
@click="handleRet(scope.row)"
>收车</el-button>
</template> </template>
<template v-if="scope.row.vehicleDepartureLogVo==undefined"> <template v-if="scope.row.vehicleDepartureLogVo==undefined">
<el-button v-if="bookRecord_btn_unbook&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small" style="color: red;" @click="handleUnbook(scope.row)">取消预定</el-button> <el-button
v-if="bookRecord_btn_unbook&&scope.row.status==2"
size="small"
class="el-button el-button--text el-button--small"
style="color: red;"
@click="handleUnbook(scope.row)"
>取消预定</el-button>
</template> </template>
</template> </template>
</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,40,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,40,50]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination>
</div> </div>
<book-info-viewer ref="bookInfoViewer"></book-info-viewer> <book-info-viewer ref="bookInfoViewer"></book-info-viewer>
...@@ -220,7 +290,6 @@ ...@@ -220,7 +290,6 @@
<!-- 查看详情 --> <!-- 查看详情 -->
<el-dialog title="预约详情" :visible.sync="dialogDetailVisible" class="order-details"> <el-dialog title="预约详情" :visible.sync="dialogDetailVisible" class="order-details">
<el-form label-width="100px"> <el-form label-width="100px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
...@@ -249,7 +318,7 @@ ...@@ -249,7 +318,7 @@
<el-form-item label="当前停靠公司"> <el-form-item label="当前停靠公司">
<span>{{detailItem.liftCompanyName}}</span> <span>{{detailItem.liftCompanyName}}</span>
</el-form-item> </el-form-item>
</el-col> --> </el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
...@@ -259,7 +328,7 @@ ...@@ -259,7 +328,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<hr> <hr />
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="使用人"> <el-form-item label="使用人">
...@@ -271,7 +340,8 @@ ...@@ -271,7 +340,8 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="预定时间"> <el-form-item label="预定时间">
<span>{{detailItem.bookStartDate}}</span> 至 <span>{{detailItem.bookEndDate}}</span> <span>{{detailItem.bookStartDate}}</span> 至
<span>{{detailItem.bookEndDate}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -303,7 +373,7 @@ ...@@ -303,7 +373,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<hr> <hr />
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="提车分公司"> <el-form-item label="提车分公司">
...@@ -312,30 +382,42 @@ ...@@ -312,30 +382,42 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="操作人"> <el-form-item label="操作人">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.checkMan}}</span> <span
v-if="detailItem.vehicleDepartureLogVo"
>{{detailItem.vehicleDepartureLogVo.checkMan}}</span>
</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="操作时间">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.departureTime}}</span> <span
v-if="detailItem.vehicleDepartureLogVo"
>{{detailItem.vehicleDepartureLogVo.departureTime}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="提车公里数"> <el-form-item label="提车公里数">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageStart?detailItem.vehicleDepartureLogVo.mileageStart+'KM':''}}</span> <span
v-if="detailItem.vehicleDepartureLogVo"
>{{detailItem.vehicleDepartureLogVo.mileageStart?detailItem.vehicleDepartureLogVo.mileageStart+'KM':''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin-left: 20px;" v-if="departurePicList.length>0"> <el-row style="margin-left: 20px;" v-if="departurePicList.length>0">
<el-col :span="3" v-for="(item, index) in departurePicList" :key="index" :offset="index%6 > 0 ? 1 : 0" style="margin-bottom:10px"> <el-col
:span="3"
v-for="(item, index) in departurePicList"
:key="index"
:offset="index%6 > 0 ? 1 : 0"
style="margin-bottom:10px"
>
<el-card> <el-card>
<img :src="item" class="image"> <img :src="item" class="image" />
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<hr> <hr />
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="还车分公司"> <el-form-item label="还车分公司">
...@@ -344,30 +426,42 @@ ...@@ -344,30 +426,42 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="操作人"> <el-form-item label="操作人">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.recycleMan}}</span> <span
v-if="detailItem.vehicleDepartureLogVo"
>{{detailItem.vehicleDepartureLogVo.recycleMan}}</span>
</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="操作时间">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.arrivalTime}}</span> <span
v-if="detailItem.vehicleDepartureLogVo"
>{{detailItem.vehicleDepartureLogVo.arrivalTime}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="还车公里数"> <el-form-item label="还车公里数">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageEnd?detailItem.vehicleDepartureLogVo.mileageEnd+'KM':''}}</span> <span
v-if="detailItem.vehicleDepartureLogVo"
>{{detailItem.vehicleDepartureLogVo.mileageEnd?detailItem.vehicleDepartureLogVo.mileageEnd+'KM':''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin-left: 20px;" v-if="arrivalPicList.length>0"> <el-row style="margin-left: 20px;" v-if="arrivalPicList.length>0">
<el-col :span="3" v-for="(item, index) in arrivalPicList" :key="index" :offset="index%6 > 0 ? 1 : 0" style="margin-bottom:10px"> <el-col
:span="3"
v-for="(item, index) in arrivalPicList"
:key="index"
:offset="index%6 > 0 ? 1 : 0"
style="margin-bottom:10px"
>
<el-card> <el-card>
<img :src="item" class="image"> <img :src="item" class="image" />
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<hr> <hr />
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="审核人操作"> <el-form-item label="审核人操作">
...@@ -400,13 +494,23 @@ ...@@ -400,13 +494,23 @@
<!-- 出车对话框相关html元素 --> <!-- 出车对话框相关html元素 -->
<el-dialog title="出车" :visible.sync="dialogForm4LiftVisible"> <el-dialog title="出车" :visible.sync="dialogForm4LiftVisible">
<el-form :model="departureForm" :rules="departureFormrules" ref="departureForm" label-width="120px"> <el-form
:model="departureForm"
:rules="departureFormrules"
ref="departureForm"
label-width="120px"
>
<el-form-item label="车牌号"> <el-form-item label="车牌号">
<el-input v-model="departureForm.numberPlate" disabled></el-input> <el-input v-model="departureForm.numberPlate" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="出车时间"> <el-form-item label="出车时间">
<el-date-picker v-model="departureForm.departureDate" type="date" disabled <el-date-picker
format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker> v-model="departureForm.departureDate"
type="date"
disabled
format="yyyy-MM-dd"
placeholder="选择日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="出车分公司"> <el-form-item label="出车分公司">
<el-autocomplete <el-autocomplete
...@@ -457,7 +561,8 @@ ...@@ -457,7 +561,8 @@
:on-remove="handleDepartureRemove" :on-remove="handleDepartureRemove"
:file-list="departurePicList" :file-list="departurePicList"
:on-success="handleDepartureSuccess" :on-success="handleDepartureSuccess"
list-type="picture-card"> list-type="picture-card"
>
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
...@@ -477,8 +582,13 @@ ...@@ -477,8 +582,13 @@
<el-input v-model="arrivalForm.numberPlate" disabled></el-input> <el-input v-model="arrivalForm.numberPlate" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收车时间"> <el-form-item label="收车时间">
<el-date-picker v-model="arrivalForm.arrivalDate" type="date" disabled <el-date-picker
format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker> v-model="arrivalForm.arrivalDate"
type="date"
disabled
format="yyyy-MM-dd"
placeholder="选择日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="还车分公司"> <el-form-item label="还车分公司">
<el-autocomplete <el-autocomplete
...@@ -511,7 +621,8 @@ ...@@ -511,7 +621,8 @@
:on-remove="handleArrivalRemove" :on-remove="handleArrivalRemove"
:file-list="arrivalPicList" :file-list="arrivalPicList"
:on-success="handleArrivalSuccess" :on-success="handleArrivalSuccess"
list-type="picture-card"> list-type="picture-card"
>
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
...@@ -536,7 +647,8 @@ ...@@ -536,7 +647,8 @@
:on-remove="handleRemove" :on-remove="handleRemove"
:file-list="fileList2" :file-list="fileList2"
:on-success="handleSuccess" :on-success="handleSuccess"
list-type="picture-card"> list-type="picture-card"
>
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
...@@ -545,7 +657,12 @@ ...@@ -545,7 +657,12 @@
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="违章罚款"> <el-form-item label="违章罚款">
<el-input v-model="price" type="number" placeholder="请输入违章罚款金额" style="width: 50%;margin-right:10px"></el-input>元 <el-input
v-model="price"
type="number"
placeholder="请输入违章罚款金额"
style="width: 50%;margin-right:10px"
></el-input>元
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -555,12 +672,11 @@ ...@@ -555,12 +672,11 @@
<el-button type="primary" @click="okHandler('form')">确 定</el-button> <el-button type="primary" @click="okHandler('form')">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
page, page,
prove, prove,
reject, reject,
...@@ -572,59 +688,43 @@ ...@@ -572,59 +688,43 @@
saveOrderViolation, saveOrderViolation,
departureVehicle, departureVehicle,
arrivalVehicle arrivalVehicle
} from 'api/vehicle/bookRecord'; } from "api/vehicle/bookRecord";
import { import { getAllCompany, getAll } from "api/base_info/branch_company/";
getAllCompany, import { getAllZone } from "api/base_info/constant/";
getAll import { getAllBranchCompanyByZoneId } from "api/order/rentVehicle";
} from 'api/base_info/branch_company/'; import { formatDate } from "utils/dateFormattor";
import {
getAllZone
} from 'api/base_info/constant/';
import {
getAllBranchCompanyByZoneId
} from 'api/order/rentVehicle';
import {
formatDate
} from 'utils/dateFormattor';
import rsCode from '../../../utils/rsCode'; import rsCode from "../../../utils/rsCode";
import {mapGetters} from 'vuex'; import { mapGetters } from "vuex";
import { import { toEast8Date, deepCopyDate, newEast8Date } from "utils/dateUtils";
toEast8Date, import { getToken } from "../../../utils/auth";
deepCopyDate, import {
newEast8Date
} from 'utils/dateUtils';
import {
getToken
} from '../../../utils/auth';
import {
BOOK_RECORD_STATUS_APPLY, BOOK_RECORD_STATUS_APPLY,
BOOK_RECORD_STATUS_PROVED, BOOK_RECORD_STATUS_PROVED,
BOOK_RECORD_STATUS_LIFT BOOK_RECORD_STATUS_LIFT
} from '../../../store/modules/baseInfo'; } from "../../../store/modules/baseInfo";
import bookInfoViewer from '../bookInfoViewer'; import bookInfoViewer from "../bookInfoViewer";
import accItemSelector from '../accompanyingItem/accItemSelector.vue'; import accItemSelector from "../accompanyingItem/accItemSelector.vue";
export default { export default {
name: 'bookRecord', name: "bookRecord",
components: { components: {
bookInfoViewer, bookInfoViewer,
accItemSelector accItemSelector
}, },
data() { data() {
return { return {
rejectVisible:false, rejectVisible: false,
rejectFrom:{ rejectFrom: {
vehicleBookRecordId:'', vehicleBookRecordId: "",
rejectRemark:'' rejectRemark: ""
}, },
rejectRules:{ rejectRules: {
rejectRemark:{ rejectRemark: {
type: "string", type: "string",
required: true, required: true,
message: "请输入拒绝原因", message: "请输入拒绝原因",
...@@ -632,34 +732,34 @@ ...@@ -632,34 +732,34 @@
} }
}, },
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
departureFormrules:{ departureFormrules: {
checkMan:{ checkMan: {
required: true, required: true,
message: '请输入验车人', message: "请输入验车人",
trigger: 'blur' trigger: "blur"
}, },
checkManTel:[ checkManTel: [
{ {
required: true, required: true,
message: '请输入验车人联系方式', message: "请输入验车人联系方式",
trigger: 'blur' trigger: "blur"
}, },
{ {
pattern: /^1[3456789]\d{9}$/, pattern: /^1[3456789]\d{9}$/,
message: '请输入正确的手机号' message: "请输入正确的手机号"
} }
], ],
mileage:{ mileage: {
type:"number", type: "number",
required: true, required: true,
message: '请输入公里数', message: "请输入公里数",
trigger: 'blur' trigger: "blur"
} }
}, },
departureForm:{ departureForm: {
vehicleId: null, vehicleId: null,
departureBranchCompanyId: null,//出发地分公司id departureBranchCompanyId: null, //出发地分公司id
departureBranchCompanyName: '',//出发地分公司名称 departureBranchCompanyName: "", //出发地分公司名称
use: null, use: null,
user: null, user: null,
userTel: null, userTel: null,
...@@ -667,16 +767,16 @@ ...@@ -667,16 +767,16 @@
checkManTel: null, checkManTel: null,
mileage: null, mileage: null,
numberPlate: null, numberPlate: null,
expectArrivalBranchCompanyId: null,//目的地分公司id expectArrivalBranchCompanyId: null, //目的地分公司id
expectArrivalBranchCompanyName: '',//目的地分公司名称 expectArrivalBranchCompanyName: "", //目的地分公司名称
bookRecordId:null, bookRecordId: null,
departurePic:'', departurePic: "",
remark:null, remark: null,
bookStartDate: null, bookStartDate: null
}, },
departurePicList:[], departurePicList: [],
arrivalPicList:[], arrivalPicList: [],
arrivalForm:{ arrivalForm: {
vehicleId: null, vehicleId: null,
numberPlate: null, numberPlate: null,
arrivalDate: null, arrivalDate: null,
...@@ -684,118 +784,116 @@ ...@@ -684,118 +784,116 @@
recycleManTel: null, recycleManTel: null,
mileage: null, mileage: null,
arrivalBranchCompanyId: null, arrivalBranchCompanyId: null,
arrivalBranchCompanyName: '', arrivalBranchCompanyName: "",
arrivalPic:'', arrivalPic: "",
remark:'', remark: "",
bookRecordId:null, bookRecordId: null
}, },
arrivalFormrules:{ arrivalFormrules: {
recycleMan:{ recycleMan: {
required: true, required: true,
message: '请输入收车人', message: "请输入收车人",
trigger: 'blur' trigger: "blur"
}, },
recycleManTel:[ recycleManTel: [
{ {
required: true, required: true,
message: '请输入收车人联系方式', message: "请输入收车人联系方式",
trigger: 'blur' trigger: "blur"
}, },
{ {
pattern: /^1[3456789]\d{9}$/, pattern: /^1[3456789]\d{9}$/,
message: '请输入正确的手机号' message: "请输入正确的手机号"
} }
], ],
mileage:{ mileage: {
type:"number", type: "number",
required: true, required: true,
message: '请输入收车公里数', message: "请输入收车公里数",
trigger: 'blur' trigger: "blur"
} }
}, },
statusList:[ statusList: [
{ {
code:'1', code: "1",
val:'申请中' val: "申请中"
}, },
{ {
code:'3', code: "3",
val:'待出行' val: "待出行"
}, },
{ {
code:'4', code: "4",
val:'驳回' val: "驳回"
}, },
{ {
code:'5', code: "5",
val:'出行中' val: "出行中"
}, },
{ {
code:'6', code: "6",
val:'取消预订' val: "取消预订"
}, },
{ {
code:'7', code: "7",
val:'已完成' val: "已完成"
}, }
], ],
bookTypeList:[ bookTypeList: [
{ {
id:'1', id: "1",
name:'租车' name: "租车"
}, },
{ {
id:'2', id: "2",
name:'用户租赁' name: "用户租赁"
}, },
{ {
id:'3', id: "3",
name:'维修' name: "维修"
}, },
{ {
id:'4', id: "4",
name:'展览' name: "展览"
}, },
{ {
id:'5', id: "5",
name:'旅游' name: "旅游"
}, },
{ {
id:'6', id: "6",
name:'保养' name: "保养"
}, },
{ {
id:'7', id: "7",
name:'预约中' name: "预约中"
}, },
{ {
id:'8', id: "8",
name:'禁用' name: "禁用"
}, },
{ {
id:'9', id: "9",
name:'客户用车' name: "客户用车"
}, },
{ {
id:'10', id: "10",
name:'其他' name: "其他"
} }
], ],
detailId:'', detailId: "",
illegalVisible:false, illegalVisible: false,
price: undefined,//违章罚款金额 price: undefined, //违章罚款金额
fileList2:[],//违章截图 fileList2: [], //违章截图
detailItem:{}, detailItem: {},
dialogDetailVisible:false, dialogDetailVisible: false,
baranchQuery: { baranchQuery: {
zoneId:null zoneId: null
},
allZoneArr:[],//全部片区
allBranchCompany:[],
state2: '',//搜索-分公司名称
rules4Query: {
}, },
allZoneArr: [], //全部片区
allBranchCompany: [],
state2: "", //搜索-分公司名称
rules4Query: {},
list: null, list: null,
total: null, total: null,
listLoading: true, listLoading: true,
...@@ -803,16 +901,16 @@ ...@@ -803,16 +901,16 @@
page: 1, page: 1,
limit: 20, limit: 20,
flag: false, flag: false,
zoneId:undefined, zoneId: undefined,
liftCompany: undefined, liftCompany: undefined,
numberPlate: undefined, numberPlate: undefined,
selectedMonth: undefined, selectedMonth: undefined,
status: undefined, status: undefined,
bookType:undefined bookType: undefined
}, },
inline: true, inline: true,
dialogFormVisible: false, dialogFormVisible: false,
dialogStatus: '', dialogStatus: "",
bookRecord_btn_prove: false, bookRecord_btn_prove: false,
bookRecord_btn_unbook: false, bookRecord_btn_unbook: false,
bookRecord_btn_reject: false, bookRecord_btn_reject: false,
...@@ -824,7 +922,7 @@ ...@@ -824,7 +922,7 @@
allCompaniesArr: [], allCompaniesArr: [],
tableKey: 0, tableKey: 0,
form4Lift: { form4Lift: {
state1: '', state1: "",
id: undefined, id: undefined,
mileageLift: undefined, mileageLift: undefined,
liftCompany: undefined, liftCompany: undefined,
...@@ -834,17 +932,17 @@ ...@@ -834,17 +932,17 @@
liftCompany: [ liftCompany: [
{ {
required: true, required: true,
message: '请选择提车分公司', message: "请选择提车分公司",
trigger: 'blur', trigger: "blur",
type: 'integer' type: "integer"
} }
], ],
mileageLift: [ mileageLift: [
{ {
required: true, required: true,
message: '请输入当前里程数', message: "请输入当前里程数",
trigger: 'blur', trigger: "blur",
type: 'integer' type: "integer"
}, },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
...@@ -852,22 +950,22 @@ ...@@ -852,22 +950,22 @@
return callback(); return callback();
} }
if (!this.$utils.isInteger(value)) { if (!this.$utils.isInteger(value)) {
return callback(new Error('里程数必须为整数')); return callback(new Error("里程数必须为整数"));
} }
if (value < 0 || value > 9999999999) { if (value < 0 || value > 9999999999) {
return callback(new Error('里程数合法范围：[0 - 9999999999]')); return callback(new Error("里程数合法范围：[0 - 9999999999]"));
} }
callback(); callback();
}, },
trigger: 'blur' trigger: "blur"
} }
], ],
retRemark: [ retRemark: [
{ {
min: 0, min: 0,
max: 2000, max: 2000,
message: '长度小于 2000 个字符', message: "长度小于 2000 个字符",
trigger: 'blur' trigger: "blur"
} }
] ]
}, },
...@@ -882,17 +980,17 @@ ...@@ -882,17 +980,17 @@
retCompany: [ retCompany: [
{ {
required: true, required: true,
message: '请选择提车分公司', message: "请选择提车分公司",
trigger: 'blur', trigger: "blur",
type: 'integer' type: "integer"
} }
], ],
mileageRet: [ mileageRet: [
{ {
required: true, required: true,
message: '请输入当前里程数', message: "请输入当前里程数",
trigger: 'blur', trigger: "blur",
type: 'integer' type: "integer"
}, },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
...@@ -900,65 +998,65 @@ ...@@ -900,65 +998,65 @@
return callback(); return callback();
} }
if (!this.$utils.isInteger(value)) { if (!this.$utils.isInteger(value)) {
return callback(new Error('里程数必须为整数')); return callback(new Error("里程数必须为整数"));
} }
if (value < 0 || value > 9999999999) { if (value < 0 || value > 9999999999) {
return callback(new Error('里程数合法范围：[0 - 9999999999]')); return callback(new Error("里程数合法范围：[0 - 9999999999]"));
} }
callback(); callback();
}, },
trigger: 'blur' trigger: "blur"
} }
], ],
retRemark: [ retRemark: [
{ {
min: 0, min: 0,
max: 2000, max: 2000,
message: '长度小于 2000 个字符', message: "长度小于 2000 个字符",
trigger: 'blur' trigger: "blur"
} }
] ]
}, },
selectedAccItem: undefined selectedAccItem: undefined
} };
}, },
created() { created() {
this.getList(); this.getList();
getAll() getAll().then(response => {
.then(response => {
this.allCompaniesArr = response.data; this.allCompaniesArr = response.data;
}) });
getAllCompany(codeAndBranchCompany => {//初始化公司列表 getAllCompany(codeAndBranchCompany => {
//初始化公司列表
this.allCompanies = codeAndBranchCompany; this.allCompanies = codeAndBranchCompany;
}); });
this.bookRecord_btn_prove = this.elements['bookRecord:btn_prove']; this.bookRecord_btn_prove = this.elements["bookRecord:btn_prove"];
this.bookRecord_btn_reject = this.elements['bookRecord:btn_reject']; this.bookRecord_btn_reject = this.elements["bookRecord:btn_reject"];
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook']; this.bookRecord_btn_unbook = this.elements["bookRecord:btn_unbook"];
this.bookRecord_btn_lift = this.elements['bookRecord:btn_lift']; this.bookRecord_btn_lift = this.elements["bookRecord:btn_lift"];
this.bookRecord_btn_ret = this.elements['bookRecord:btn_ret']; this.bookRecord_btn_ret = this.elements["bookRecord:btn_ret"];
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(["elements", "bookRecordStatus"]),
'elements',
'bookRecordStatus'
]),
getHeaderWithToken() { getHeaderWithToken() {
return {Authorization: getToken()}; return { Authorization: getToken() };
}, },
//获取大区列表 //获取大区列表
getAllZoneList(){ getAllZoneList() {
return getAllZone(); return getAllZone();
}, },
selectedMonth4Query: { selectedMonth4Query: {
get: function () { get: function() {
if (this.$utils.isString(this.listQuery.selectedMonth) && this.listQuery.selectedMonth !== '') { if (
this.$utils.isString(this.listQuery.selectedMonth) &&
this.listQuery.selectedMonth !== ""
) {
return toEast8Date(this.listQuery.selectedMonth); return toEast8Date(this.listQuery.selectedMonth);
} }
return undefined; return undefined;
}, },
set: function (date) { set: function(date) {
if (this.$utils.isDate(date)) { if (this.$utils.isDate(date)) {
this.listQuery.selectedMonth = formatDate(date, 'yyyy-MM'); this.listQuery.selectedMonth = formatDate(date, "yyyy-MM");
} else { } else {
this.listQuery.selectedMonth = undefined; this.listQuery.selectedMonth = undefined;
} }
...@@ -971,29 +1069,29 @@ ...@@ -971,29 +1069,29 @@
* */ * */
okHandler() { okHandler() {
let arr = []; let arr = [];
this.fileList2.map(function(item){ this.fileList2.map(function(item) {
arr.push(item.url); arr.push(item.url);
}); });
let params = { let params = {
illegalPic:arr.join(","), illegalPic: arr.join(","),
illegalAmount:this.price, illegalAmount: this.price,
id: this.detailId, id: this.detailId
}; };
saveOrderViolation(params).then(response => { saveOrderViolation(params).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.$notify({ this.$notify({
title: '成功', title: "成功",
message: '创建成功', message: "创建成功",
type: 'success', type: "success",
duration: 2000 duration: 2000
}); });
this.illegalVisible = false; this.illegalVisible = false;
this.getList(); this.getList();
} else { } else {
this.$notify({ this.$notify({
title: '创建失败', title: "创建失败",
message: '操作失败！', message: "操作失败！",
type: 'error', type: "error",
duration: 2000 duration: 2000
}); });
} }
...@@ -1003,56 +1101,56 @@ ...@@ -1003,56 +1101,56 @@
* 上传成功 * 上传成功
* */ * */
handleSuccess(res, file) { handleSuccess(res, file) {
let c = {url: res.data}; let c = { url: res.data };
this.fileList2.push(c); this.fileList2.push(c);
this.showLoadingBody = false; this.showLoadingBody = false;
}, },
/** /**
* 删除违章图片 * 删除违章图片
* */ * */
handleRemove(file, fileList1){ handleRemove(file, fileList1) {
this.fileList2 = fileList1; this.fileList2 = fileList1;
}, },
/** /**
* 出车上传成功 * 出车上传成功
* */ * */
handleDepartureSuccess(res, file) { handleDepartureSuccess(res, file) {
let c = {url: res.data}; let c = { url: res.data };
this.departurePicList.push(c); this.departurePicList.push(c);
this.showLoadingBody = false; this.showLoadingBody = false;
}, },
/** /**
* 删除出车图片 * 删除出车图片
* */ * */
handleDepartureRemove(file, fileList2){ handleDepartureRemove(file, fileList2) {
this.departurePicList = fileList2; this.departurePicList = fileList2;
}, },
/** /**
* 上传成功 * 上传成功
* */ * */
handleArrivalSuccess(res, file) { handleArrivalSuccess(res, file) {
let c = {url: res.data}; let c = { url: res.data };
this.arrivalPicList.push(c); this.arrivalPicList.push(c);
this.showLoadingBody = false; this.showLoadingBody = false;
}, },
/** /**
* 删除违章图片 * 删除违章图片
* */ * */
handleArrivalRemove(file, fileList3){ handleArrivalRemove(file, fileList3) {
this.arrivalPicList = fileList3; this.arrivalPicList = fileList3;
}, },
/** /**
* 操作-违章查询按钮，显示违章弹框 * 操作-违章查询按钮，显示违章弹框
*/ */
illegalInquiry(row){ illegalInquiry(row) {
var t = this; var t = this;
this.fileList2 = []; this.fileList2 = [];
this.price = ''; this.price = "";
if(row.vehicleDepartureLogVo.illegalPic){ if (row.vehicleDepartureLogVo.illegalPic) {
let arr = row.vehicleDepartureLogVo.illegalPic.split(","); let arr = row.vehicleDepartureLogVo.illegalPic.split(",");
let fileList2 = []; let fileList2 = [];
let p = {}; let p = {};
arr.map(function(item){ arr.map(function(item) {
p = { p = {
url: item url: item
}; };
...@@ -1060,7 +1158,7 @@ ...@@ -1060,7 +1158,7 @@
}); });
t.fileList2 = fileList2; t.fileList2 = fileList2;
} }
if(row.vehicleDepartureLogVo.illegalAmount){ if (row.vehicleDepartureLogVo.illegalAmount) {
t.price = parseFloat(row.vehicleDepartureLogVo.illegalAmount); t.price = parseFloat(row.vehicleDepartureLogVo.illegalAmount);
} }
this.detailId = row.vehicleDepartureLogVo.id; this.detailId = row.vehicleDepartureLogVo.id;
...@@ -1072,33 +1170,39 @@ ...@@ -1072,33 +1170,39 @@
cancel() { cancel() {
this.illegalVisible = false; this.illegalVisible = false;
}, },
handleDetail(row){ handleDetail(row) {
var t = this var t = this;
this.detailItem = row; this.detailItem = row;
if(row.vehicleDepartureLogVo!= undefined){ if (row.vehicleDepartureLogVo != undefined) {
if(row.vehicleDepartureLogVo.departurePic!= undefined&&row.vehicleDepartureLogVo.departurePic!=''){ if (
row.vehicleDepartureLogVo.departurePic != undefined &&
row.vehicleDepartureLogVo.departurePic != ""
) {
let arr = row.vehicleDepartureLogVo.departurePic.split(","); let arr = row.vehicleDepartureLogVo.departurePic.split(",");
let departurePicList = []; let departurePicList = [];
let p = {}; let p = {};
arr.map(function(item){ arr.map(function(item) {
departurePicList.push(item); departurePicList.push(item);
}); });
t.departurePicList = departurePicList; t.departurePicList = departurePicList;
}else{ } else {
t.departurePicList = []; t.departurePicList = [];
} }
if(row.vehicleDepartureLogVo.arrivalPic!= undefined&&row.vehicleDepartureLogVo.arrivalPic!=''){ if (
row.vehicleDepartureLogVo.arrivalPic != undefined &&
row.vehicleDepartureLogVo.arrivalPic != ""
) {
let Arr = row.vehicleDepartureLogVo.arrivalPic.split(","); let Arr = row.vehicleDepartureLogVo.arrivalPic.split(",");
let arrivalPicList = []; let arrivalPicList = [];
let p = {}; let p = {};
Arr.map(function(item){ Arr.map(function(item) {
arrivalPicList.push(item); arrivalPicList.push(item);
}); });
t.arrivalPicList = arrivalPicList; t.arrivalPicList = arrivalPicList;
}else{ } else {
t.arrivalPicList = []; t.arrivalPicList = [];
} }
}else{ } else {
t.departurePicList = []; t.departurePicList = [];
t.arrivalPicList = []; t.arrivalPicList = [];
} }
...@@ -1106,16 +1210,15 @@ ...@@ -1106,16 +1210,15 @@
}, },
//监听change事件 //监听change事件
getProvinceRegions(item) { getProvinceRegions(item) {
this.listQuery.zoneId = item this.listQuery.zoneId = item;
this.baranchQuery.zoneId = item this.baranchQuery.zoneId = item;
this.listQuery.liftCompany = undefined; this.listQuery.liftCompany = undefined;
getAllBranchCompanyByZoneId(this.baranchQuery) getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
.then(response => {
this.allBranchCompany = response.data; this.allBranchCompany = response.data;
}) });
}, },
getAllBranchCompanyChange(item) { getAllBranchCompanyChange(item) {
this.listQuery.liftCompany = item this.listQuery.liftCompany = item;
}, },
querySearch(queryString, cb) { querySearch(queryString, cb) {
let selectArry = []; let selectArry = [];
...@@ -1124,31 +1227,33 @@ ...@@ -1124,31 +1227,33 @@
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;
}; };
}, },
/** /**
* 分公司搜索 * 分公司搜索
* */ * */
handleSelect2(item){ handleSelect2(item) {
this.listQuery.subordinateBranch = item.id; this.listQuery.subordinateBranch = item.id;
console.log(item); console.log(item);
}, },
/** /**
* 提车分公司 * 提车分公司
* */ * */
handleSelect1(item){ handleSelect1(item) {
this.form4Lift.liftCompany = item.id; this.form4Lift.liftCompany = item.id;
console.log(item); console.log(item);
}, },
...@@ -1167,36 +1272,36 @@ ...@@ -1167,36 +1272,36 @@
const set = this.$refs; const set = this.$refs;
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
if(Number(this.departureForm.mileage)>999999){ if (Number(this.departureForm.mileage) > 999999) {
this.$notify({ this.$notify({
title: '警告', title: "警告",
message: '公里数不能大于999999', message: "公里数不能大于999999",
type: 'warning', type: "warning",
duration: 2000 duration: 2000
}); });
return false; return false;
} }
var arr = []; var arr = [];
this.departurePicList.map(function(item){ this.departurePicList.map(function(item) {
arr.push(item.url); arr.push(item.url);
}); });
this.departureForm.departurePic=arr.join(","); this.departureForm.departurePic = arr.join(",");
departureVehicle(this.departureForm).then(response => { departureVehicle(this.departureForm).then(response => {
if (response.status == 200) { if (response.status == 200) {
this.dialogForm4LiftVisible = false; this.dialogForm4LiftVisible = false;
this.$notify({ this.$notify({
title: '成功', title: "成功",
message: '出车成功', message: "出车成功",
type: 'success', type: "success",
duration: 2000 duration: 2000
}); });
this.cleanDepartureForm(); this.cleanDepartureForm();
this.getList(); this.getList();
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: "失败",
message: response.message, message: response.message,
type: 'error', type: "error",
duration: 2000 duration: 2000
}); });
} }
...@@ -1214,13 +1319,21 @@ ...@@ -1214,13 +1319,21 @@
this.$refs.accItemSelector.show(); this.$refs.accItemSelector.show();
}, },
checkIfBooked(bookedDate, [startDateStr, endDateStr]) { checkIfBooked(bookedDate, [startDateStr, endDateStr]) {
if (this.$utils.isInteger(bookedDate) && if (
this.$utils.isString(startDateStr) && startDateStr !== '' && this.$utils.isInteger(bookedDate) &&
this.$utils.isString(endDateStr) && endDateStr !== '') { this.$utils.isString(startDateStr) &&
startDateStr !== "" &&
this.$utils.isString(endDateStr) &&
endDateStr !== ""
) {
let startDate = toEast8Date(startDateStr); let startDate = toEast8Date(startDateStr);
let endDate = toEast8Date(endDateStr); let endDate = toEast8Date(endDateStr);
for (; this.$utils.toDateString(startDate, 'yyyy-MM-dd') <= this.$utils.toDateString(endDate, 'yyyy-MM-dd'); for (
startDate.setDate(startDate.getDate() + 1)) { ;
this.$utils.toDateString(startDate, "yyyy-MM-dd") <=
this.$utils.toDateString(endDate, "yyyy-MM-dd");
startDate.setDate(startDate.getDate() + 1)
) {
if ((bookedDate & (1 << (startDate.getDate() - 1))) !== 0) { if ((bookedDate & (1 << (startDate.getDate() - 1))) !== 0) {
return true; return true;
} }
...@@ -1239,51 +1352,72 @@ ...@@ -1239,51 +1352,72 @@
}, },
getList() { getList() {
this.listLoading = true; this.listLoading = true;
for(var key in this.listQuery){ for (var key in this.listQuery) {
if(this.listQuery[key]===''){ if (this.listQuery[key] === "") {
this.listQuery[key]=undefined this.listQuery[key] = undefined;
} }
} }
page(this.listQuery) page(this.listQuery).then(response => {
.then(response => {
this.list = response.data.data; this.list = response.data.data;
this.total = response.data.totalCount; this.total = response.data.totalCount;
this.listLoading = false; this.listLoading = false;
}) });
}, },
getBookRecordStatus: function (data) { getBookRecordStatus: function(data) {
this.bookRecordStatus['3'].val = '待出行' this.bookRecordStatus["3"].val = "待出行";
this.bookRecordStatus['4'].val = '驳回' this.bookRecordStatus["4"].val = "驳回";
this.bookRecordStatus['5'].val = '出行中' this.bookRecordStatus["5"].val = "出行中";
this.bookRecordStatus['7'].val = '已完成' this.bookRecordStatus["7"].val = "已完成";
if(data) { if (data) {
if (!this.$utils.isInteger(data.status)) { if (!this.$utils.isInteger(data.status)) {
return '未知'; return "未知";
} }
if(data.status == 2 && (data.vehicleDepartureLogVo == undefined || data.vehicleDepartureLogVo == null)) { if (
return this.bookRecordStatus['3'].val; data.status == 2 &&
(data.vehicleDepartureLogVo == undefined ||
data.vehicleDepartureLogVo == null)
) {
return this.bookRecordStatus["3"].val;
} }
if(data.status == 2 && data.vehicleDepartureLogVo != undefined && data.vehicleDepartureLogVo != null && data.vehicleDepartureLogVo.state == 0) { if (
return this.bookRecordStatus['5'].val; data.status == 2 &&
data.vehicleDepartureLogVo != undefined &&
data.vehicleDepartureLogVo != null &&
data.vehicleDepartureLogVo.state == 0
) {
return this.bookRecordStatus["5"].val;
} }
if(data.status == 2 && data.vehicleDepartureLogVo != undefined && data.vehicleDepartureLogVo != null && data.vehicleDepartureLogVo.state == 1) { if (
return this.bookRecordStatus['7'].val; data.status == 2 &&
data.vehicleDepartureLogVo != undefined &&
data.vehicleDepartureLogVo != null &&
data.vehicleDepartureLogVo.state == 1
) {
return this.bookRecordStatus["7"].val;
} }
return this.bookRecordStatus[data.status + ''].val; return this.bookRecordStatus[data.status + ""].val;
} }
return ''; return "";
}, },
getAllBookRecordStatus: function () { getAllBookRecordStatus: function() {
console.log(this.bookRecordStatus) console.log(this.bookRecordStatus);
return this.bookRecordStatus; return this.bookRecordStatus;
}, },
getDatePeriodStr([startDate, endDate]) { getDatePeriodStr([startDate, endDate]) {
if (this.$utils.isString(startDate) && startDate !== '' && if (
this.$utils.isString(endDate) && endDate !== '') { this.$utils.isString(startDate) &&
return formatDate(toEast8Date(startDate), 'yyyy-MM-dd') + ' 至 ' + formatDate(toEast8Date(endDate), 'yyyy-MM-dd'); startDate !== "" &&
this.$utils.isString(endDate) &&
endDate !== ""
) {
return (
formatDate(toEast8Date(startDate), "yyyy-MM-dd") +
" 至 " +
formatDate(toEast8Date(endDate), "yyyy-MM-dd")
);
} }
return '未知'; return "未知";
}, },
/** /**
* 清空出车弹框数据 * 清空出车弹框数据
...@@ -1291,8 +1425,8 @@ ...@@ -1291,8 +1425,8 @@
cleanDepartureForm() { cleanDepartureForm() {
this.departureForm = { this.departureForm = {
vehicleId: null, vehicleId: null,
departureBranchCompanyId: null,//出发地分公司id departureBranchCompanyId: null, //出发地分公司id
departureBranchCompanyName: '',//出发地分公司名称 departureBranchCompanyName: "", //出发地分公司名称
use: null, use: null,
user: null, user: null,
userTel: null, userTel: null,
...@@ -1300,15 +1434,15 @@ ...@@ -1300,15 +1434,15 @@
checkManTel: null, checkManTel: null,
mileage: null, mileage: null,
numberPlate: null, numberPlate: null,
expectArrivalBranchCompanyId: null,//目的地分公司id expectArrivalBranchCompanyId: null, //目的地分公司id
expectArrivalBranchCompanyName: '',//目的地分公司名称 expectArrivalBranchCompanyName: "", //目的地分公司名称
bookRecordId:null, bookRecordId: null,
departurePic:'', departurePic: "",
remark:null, remark: null,
bookStartDate: null, bookStartDate: null
}; };
}, },
cleanArrivalForm(){ cleanArrivalForm() {
this.arrivalForm = { this.arrivalForm = {
vehicleId: null, vehicleId: null,
numberPlate: null, numberPlate: null,
...@@ -1317,11 +1451,11 @@ ...@@ -1317,11 +1451,11 @@
recycleManTel: null, recycleManTel: null,
mileage: null, mileage: null,
arrivalBranchCompanyId: null, arrivalBranchCompanyId: null,
arrivalBranchCompanyName: '', arrivalBranchCompanyName: "",
arrivalPic:'', arrivalPic: "",
remark:'', remark: "",
bookRecordId:null bookRecordId: null
} };
}, },
/** /**
* 搜索按钮 * 搜索按钮
...@@ -1345,36 +1479,41 @@ ...@@ -1345,36 +1479,41 @@
this.getList(); this.getList();
}, },
handleProve(row) { handleProve(row) {
this.$confirm('确定批准申请?', '提示', { this.$confirm("确定批准申请?", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning"
}).then(() => { }).then(() => {
prove(row.id) prove(row.id).then(response => {
.then(response => { if (
if (response.code === rsCode.code.VEHICLE_BOOKED_INFO_ALREADY_CHANGED) { response.code === rsCode.code.VEHICLE_BOOKED_INFO_ALREADY_CHANGED
) {
this.$notify({ this.$notify({
title: '失败', title: "失败",
message: rsCode.msg[rsCode.code.VEHICLE_BOOKED_INFO_ALREADY_CHANGED], message:
type: 'error', rsCode.msg[rsCode.code.VEHICLE_BOOKED_INFO_ALREADY_CHANGED],
type: "error",
duration: 2000 duration: 2000
}); });
} else if (response.code === rsCode.code.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED) { } else if (
response.code === rsCode.code.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED
) {
this.$notify({ this.$notify({
title: '失败', title: "失败",
message: rsCode.msg[rsCode.code.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED], message:
type: 'error', rsCode.msg[rsCode.code.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED],
type: "error",
duration: 2000 duration: 2000
}); });
} else if (response.code === rsCode.RS_CODE_SUC) { } else if (response.code === rsCode.RS_CODE_SUC) {
this.$notify({ this.$notify({
title: '成功', title: "成功",
message: '操作成功', message: "操作成功",
type: 'success', type: "success",
duration: 2000 duration: 2000
}); });
if(this.dialogDetailVisible){ if (this.dialogDetailVisible) {
this.dialogDetailVisible = false this.dialogDetailVisible = false;
} }
} }
this.getList(); this.getList();
...@@ -1385,27 +1524,26 @@ ...@@ -1385,27 +1524,26 @@
const set = this.$refs; const set = this.$refs;
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
reject(this.rejectFrom) reject(this.rejectFrom).then(response => {
.then(response => {
if (response.code == 1) { if (response.code == 1) {
this.$notify({ this.$notify({
title: '成功', title: "成功",
message: '操作成功', message: "操作成功",
type: 'success', type: "success",
duration: 2000 duration: 2000
}); });
this.getList(); this.getList();
if(this.rejectVisible){ if (this.rejectVisible) {
this.rejectVisible = false this.rejectVisible = false;
} }
if(this.dialogDetailVisible){ if (this.dialogDetailVisible) {
this.dialogDetailVisible = false this.dialogDetailVisible = false;
} }
}else{ } else {
this.$notify({ this.$notify({
title: '失败', title: "失败",
message: response.message, message: response.message,
type: 'error', type: "error",
duration: 2000 duration: 2000
}); });
} }
...@@ -1418,7 +1556,7 @@ ...@@ -1418,7 +1556,7 @@
handleReject(row) { handleReject(row) {
this.rejectVisible = true; this.rejectVisible = true;
this.rejectFrom.vehicleBookRecordId = row.id; this.rejectFrom.vehicleBookRecordId = row.id;
this.rejectFrom.rejectRemark = ''; this.rejectFrom.rejectRemark = "";
}, },
/** /**
* 操作-出车 * 操作-出车
...@@ -1427,35 +1565,35 @@ ...@@ -1427,35 +1565,35 @@
handleLift(row) { handleLift(row) {
this.cleanDepartureForm(); this.cleanDepartureForm();
this.departurePicList = []; this.departurePicList = [];
if(row.bookType==1){ if (row.bookType == 1) {
this.departureForm.use = '租车' this.departureForm.use = "租车";
}else if(row.bookType==2){ } else if (row.bookType == 2) {
this.departureForm.use = '用户租赁' this.departureForm.use = "用户租赁";
}else if(row.bookType==3){ } else if (row.bookType == 3) {
this.departureForm.use = '维修' this.departureForm.use = "维修";
}else if(row.bookType==4){ } else if (row.bookType == 4) {
this.departureForm.use = '展览' this.departureForm.use = "展览";
}else if(row.bookType==5){ } else if (row.bookType == 5) {
this.departureForm.use = '旅游' this.departureForm.use = "旅游";
}else if(row.bookType==6){ } else if (row.bookType == 6) {
this.departureForm.use = '保养' this.departureForm.use = "保养";
}else if(row.bookType==7){ } else if (row.bookType == 7) {
this.departureForm.use = '预约中' this.departureForm.use = "预约中";
}else if(row.bookType==8){ } else if (row.bookType == 8) {
this.departureForm.use = '禁用' this.departureForm.use = "禁用";
}else if(row.bookType==9){ } else if (row.bookType == 9) {
this.departureForm.use = '客户用车' this.departureForm.use = "客户用车";
}else if(row.bookType==10){ } else if (row.bookType == 10) {
this.departureForm.use = '其他' this.departureForm.use = "其他";
} }
this.departureForm.bookRecordId=row.id this.departureForm.bookRecordId = row.id;
this.departureForm.vehicleId = row.vehicleId this.departureForm.vehicleId = row.vehicleId;
this.departureForm.numberPlate = row.numberPlate this.departureForm.numberPlate = row.numberPlate;
this.departureForm.departureDate = Date(); this.departureForm.departureDate = Date();
this.departureForm.departureBranchCompanyId = row.liftCompany this.departureForm.departureBranchCompanyId = row.liftCompany;
this.departureForm.departureBranchCompanyName = row.liftCompanyName this.departureForm.departureBranchCompanyName = row.liftCompanyName;
this.departureForm.user = row.vehicleUsername this.departureForm.user = row.vehicleUsername;
this.departureForm.userTel = row.vehicleUserPhone this.departureForm.userTel = row.vehicleUserPhone;
// if(row.vehicleDepartureLogVo!=undefined){ // if(row.vehicleDepartureLogVo!=undefined){
// this.departureForm.user = row.vehicleDepartureLogVo.user?row.vehicleDepartureLogVo.user:'' // this.departureForm.user = row.vehicleDepartureLogVo.user?row.vehicleDepartureLogVo.user:''
// this.departureForm.userTel = row.vehicleDepartureLogVo.userTel?row.vehicleDepartureLogVo.userTel:'' // this.departureForm.userTel = row.vehicleDepartureLogVo.userTel?row.vehicleDepartureLogVo.userTel:''
...@@ -1463,8 +1601,8 @@ ...@@ -1463,8 +1601,8 @@
// this.departureForm.user = '' // this.departureForm.user = ''
// this.departureForm.userTel = '' // this.departureForm.userTel = ''
// } // }
this.departureForm.expectArrivalBranchCompanyId = row.retCompany this.departureForm.expectArrivalBranchCompanyId = row.retCompany;
this.departureForm.expectArrivalBranchCompanyName = row.retCompanyName this.departureForm.expectArrivalBranchCompanyName = row.retCompanyName;
this.dialogForm4LiftVisible = true; this.dialogForm4LiftVisible = true;
}, },
/** /**
...@@ -1473,48 +1611,48 @@ ...@@ -1473,48 +1611,48 @@
*/ */
handleRet(row) { handleRet(row) {
this.arrivalPicList = []; this.arrivalPicList = [];
this.arrivalForm.bookRecordId = row.id this.arrivalForm.bookRecordId = row.id;
this.arrivalForm.vehicleId = row.vehicleId this.arrivalForm.vehicleId = row.vehicleId;
this.arrivalForm.numberPlate = row.numberPlate this.arrivalForm.numberPlate = row.numberPlate;
this.arrivalForm.arrivalDate = Date(); this.arrivalForm.arrivalDate = Date();
this.arrivalForm.arrivalBranchCompanyId = row.retCompany this.arrivalForm.arrivalBranchCompanyId = row.retCompany;
this.arrivalForm.arrivalBranchCompanyName = row.retCompanyName this.arrivalForm.arrivalBranchCompanyName = row.retCompanyName;
this.dialogForm4RetVisible = true; this.dialogForm4RetVisible = true;
}, },
ret(formName) { ret(formName) {
const set = this.$refs; const set = this.$refs;
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
if(Number(this.arrivalForm.mileage)>999999){ if (Number(this.arrivalForm.mileage) > 999999) {
this.$notify({ this.$notify({
title: '警告', title: "警告",
message: '公里数不能大于999999', message: "公里数不能大于999999",
type: 'warning', type: "warning",
duration: 2000 duration: 2000
}); });
return false; return false;
} }
var arr = []; var arr = [];
this.arrivalPicList.map(function(item){ this.arrivalPicList.map(function(item) {
arr.push(item.url); arr.push(item.url);
}); });
this.arrivalForm.arrivalPic=arr.join(","); this.arrivalForm.arrivalPic = arr.join(",");
arrivalVehicle(this.arrivalForm).then(response => { arrivalVehicle(this.arrivalForm).then(response => {
if (response.status == 200) { if (response.status == 200) {
this.dialogForm4RetVisible = false; this.dialogForm4RetVisible = false;
this.$notify({ this.$notify({
title: '成功', title: "成功",
message: '收车成功', message: "收车成功",
type: 'success', type: "success",
duration: 2000 duration: 2000
}); });
this.cleanArrivalForm(); this.cleanArrivalForm();
this.getList(); this.getList();
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: "失败",
message: response.message, message: response.message,
type: 'error', type: "error",
duration: 2000 duration: 2000
}); });
} }
...@@ -1525,57 +1663,61 @@ ...@@ -1525,57 +1663,61 @@
}); });
}, },
handleUnbook(row) { handleUnbook(row) {
this.$confirm('确定取消预定?', '提示', { this.$confirm("确定取消预定?", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning"
}).then(() => { }).then(() => {
var obj = { var obj = {
vehicleBookRecordId:row.id vehicleBookRecordId: row.id
}; };
unbook(obj) unbook(obj)
.then(response => { .then(response => {
if(response.code==1){ if (response.code == 1) {
this.$notify({ this.$notify({
title: '成功', title: "成功",
message: '操作成功', message: "操作成功",
type: 'success', type: "success",
duration: 2000 duration: 2000
}); });
this.getList(); this.getList();
}else{ } else {
this.$notify({ this.$notify({
title: '失败', title: "失败",
message: response.message, message: response.message,
type: 'error', type: "error",
duration: 2000 duration: 2000
}); });
} }
}).catch(response=>{ })
console.log(response) .catch(response => {
} console.log(response);
});
);
}); });
},
} }
} }
};
</script> </script>
<style scoped> <style scoped>
.order-details .el-form-item{ .order-details .el-form-item {
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
.order-details hr { .order-details hr {
height: 1px; height: 1px;
background-color: #ccc; background-color: #ccc;
border: none; border: none;
} }
.image { .image {
width: 100%; width: 100%;
height: 110px; height: 110px;
display: block; display: block;
} }
.el-card__body,.el-card{padding: 0px !important;width: 150px;text-align: center;} .el-card__body,
.el-card {
padding: 0px !important;
width: 150px;
text-align: center;
}
</style> </style>
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