Skip to content

C
cloud-platform-ui
Commit 8bc28350 authored by hanfeng's avatar hanfeng
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

parents 8776841f f35b67f8
Hide whitespace changes
Inline Side-by-side
Showing with 403 additions and 135 deletions
src/api/admin/group/index.js
View file @ 8bc28350
......@@ -137,3 +137,10 @@ export function getGroups() {
});
}
export function listAll() {
return fetch({
url: '/api/admin/group/list_all',
method: 'get'
});
}
src/api/vehicle/bookRecord/index.js
View file @ 8bc28350
......@@ -3,9 +3,9 @@ import fetch from 'utils/fetch';
export function page(query) {
return fetch({
url: '/vehicle/vehicleInfo/bookedRecord',
url: '/vehicle/vehicleInfo/app/unauth/getBookRecordInfo',
method: 'get',
params: {vehicleBookRecordQueryVoJson: JSON.stringify(query)}
params: query
});
}
......
src/router/index.js
View file @ 8bc28350
......@@ -347,6 +347,12 @@ export const asyncRouterMap = [{
component: _import('vehicle/vehicleSchedulManage/vehicleRecords'),
name: '车辆排班记录',
authority: 'vehicleRecords'
},
{
path: 'dispatchApply',
component: _import('vehicle/dispatchApply/index'),
name: '调度申请管理',
authority: 'dispatchApply'
}
]
},
......
src/views/admin/user/index.vue
View file @ 8bc28350
......@@ -81,14 +81,21 @@
</el-select>
</el-form-item>
<el-form-item label="所属角色" prop="members">
<el-select v-model="form.members" multiple filterable placeholder="请选择" :loading="loading" :remote-method="remoteGroupsMethod" remote>
<el-autocomplete
class="inline-input"
v-model="membersName"
:fetch-suggestions="querySearch"
placeholder="请选择"
@select="handleSelect2"
></el-autocomplete>
<!-- <el-select v-model="form.members" multiple filterable placeholder="请选择" :loading="loading" :remote-method="remoteGroupsMethod" remote>
<el-option
v-for="item in myGroups"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="数据权限" prop="dataState">
<el-checkbox-group v-model="form.dataLimit" >
......@@ -134,7 +141,8 @@ import {
import {
fetchTree,
getUserGroups,
getCurrentGroups
getCurrentGroups,
listAll
} from 'api/admin/group/index';
import {getAllBranchCompanyByZoneId} from "../../../api/order/rentVehicle";
......@@ -142,6 +150,7 @@ export default {
name: 'user',
data() {
return {
membersName:'',//角色
form: {
username: undefined,
name: undefined,
......@@ -250,6 +259,7 @@ export default {
},
tableKey: 0,
allBranchCompany: [],//所有分公司列表
list_All:[]
}
},
created() {
......@@ -261,6 +271,9 @@ export default {
getAllCompany(codeAndBranchCompany => {
this.allCompanies = codeAndBranchCompany;
});
listAll().then(response => {
this.list_All = response;
})
this.remoteGroupsMethod('');
// getCurrentGroups().then(result => {
// this.myGroups = result.data;
......@@ -308,6 +321,10 @@ export default {
this.form.companyId = item.id;
this.form.companyName = item.name;
},
// 角色
handleSelect2(item){
this.form.members = item.id;
},
/**
* 获取后台用户管理列表数据
* */
......@@ -448,7 +465,7 @@ export default {
},
querySearch(queryString, cb) {
let selectArry = [];
this.allBranchCompany.map(function(item){
this.list_All.map(function(item){
item.value = item.name;
selectArry.push(item);
});
......
src/views/campsiteManage/index.vue
View file @ 8bc28350
......@@ -64,7 +64,7 @@
</el-table-column>
<el-table-column align="center" width="300" label="操作">
<template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)" v-if="campsiteshop_btn_update">编辑
<el-button size="small" type="success" @click="handleUpdate(scope.row)">{{campsiteshop_btn_update?"编辑":"查看"}}
</el-button>
<el-button size="small" type="primary" v-if="(scope.row.saleState==2|| scope.row.saleState==0) && campsiteshop_btn_update_salestatus" @click="upStatus(scope.row)">上架
</el-button>
......@@ -92,7 +92,7 @@
</div>
</div>
<!-- 营地modal弹窗 -->
<oneCampsite v-if="oneCampsiteDialogVisible" :oneRow="oneRow" :title="modalTitle" v-on:oneCampsiteDialogEvent = "oneCampsiteDialogEvent"></oneCampsite>
<oneCampsite v-if="oneCampsiteDialogVisible" :campsiteshop_btn_update="campsiteshop_btn_update" :oneRow="oneRow" :title="modalTitle" v-on:oneCampsiteDialogEvent = "oneCampsiteDialogEvent"></oneCampsite>
</div>
</template>
......@@ -169,7 +169,7 @@ import {
campsiteshop_btn_del: false,//删除
}
},
created() {debugger
created() {
this.campsite_btn_save = this.elements['campsite:btn_save'];
this.campsiteshop_btn_update = this.elements['campsiteshop:btn_update'];
this.campsiteshop_btn_update_salestatus = this.elements['campsiteshop:btn_update_salestatus'];
......
src/views/campsiteManage/modal/oneCampsiteModal.vue
View file @ 8bc28350
......@@ -94,13 +94,13 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" v-if="title=='创建' && !isCreate" @click="create()">确 定</el-button>
<el-button type="primary" v-if="title=='编辑' && !isCreate" @click="update()">确 定</el-button>
<el-button type="primary" v-if="title=='创建' && !isCreate && campsiteshop_btn_update" @click="create()">确 定</el-button>
<el-button type="primary" v-if="title=='编辑' && !isCreate && campsiteshop_btn_update" @click="update()">确 定</el-button>
</div>
<!--编辑营地地址-->
<campsiteModal v-if="showCampsiteVisible" :obj="campsiteObj" v-on:campsiteEvent = "campsiteEvent"></campsiteModal>
<campsiteModal v-if="showCampsiteVisible && campsiteshop_btn_update" :obj="campsiteObj" v-on:campsiteEvent = "campsiteEvent"></campsiteModal>
<!--编辑营地标签-->
<campsiteLabelModal v-if="editLableVisible" :allLabelList="allLabelList" :checkList="checkList" v-on:tourLabelEvent = "tourLabelEvent"></campsiteLabelModal>
<campsiteLabelModal v-if="editLableVisible && campsiteshop_btn_update" :allLabelList="allLabelList" :checkList="checkList" v-on:tourLabelEvent = "tourLabelEvent"></campsiteLabelModal>
</div>
</template>
<style>
......@@ -146,10 +146,9 @@
} from '../../../utils/auth';
import {mapGetters} from 'vuex';
export default {
props: ["oneRow", "title"],
props: ["oneRow", "title", "campsiteshop_btn_update"],
name: 'upkeepDialog',
components: {
// Editor,
UE,
campsiteModal,
campsiteLabelModal
......
src/views/order/rentVehicleInfo/index.vue
View file @ 8bc28350
......@@ -29,7 +29,7 @@
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择状态">
<!--"0--删除"+"1--创建订单" +"2--取消" +"3--待付款" +"4--待出行" +"5--出行中（进行中）" +"6--已完成"-->
<el-option :key="null" label="全部订单" :value="null" ></el-option>
<el-option :key="3" label="待支付" :value="3"></el-option>
<el-option :key="3" label="待付款" :value="3"></el-option>
<el-option :key="4" label="待出行" :value="4"></el-option>
<el-option :key="5" label="出行中" :value="5"></el-option>
<el-option :key="6" label="已完成" :value="6"></el-option>
......@@ -110,7 +110,7 @@
<el-button size="small" v-if="scope.row.status >=4" type="success" @click="handleHandoverOrderVehicle(scope.row)">交车记录</el-button>
<el-button size="small" v-if="scope.row.status == 6" type="success" @click="handleReturnOrderVehicle(scope.row)">还车记录</el-button>
<el-button size="small" v-if="scope.row.status > 3" type="success" @click="handleRefundVehicle(scope.row)">押金记录</el-button>
<el-button size="small" v-if="scope.row.status == 6" type="success" @click="illegalInquiry(scope.row)">违章查询</el-button>
<el-button size="small" v-if="scope.row.status == 6&&order_btn_order_violcation_save" type="success" @click="illegalInquiry(scope.row)">违章查询</el-button>
</template>
</el-table-column>
</el-table>
......@@ -376,12 +376,14 @@
handover:false,
returnVehicle: false,
refundshow:false,//退款信息
vehicleDetail:true //交还车信息，默认全部显示
vehicleDetail:true, //交还车信息，默认全部显示
order_btn_order_violcation_save:false
}
},
created() {
this.getList();
this.btn_del = this.elements['branchCompany/stockApply:btn_delete'];
this.btn_del = this.elements['branchCompany/stockApply:btn_delete'];
this.order_btn_order_violcation_save = this.elements['order:btn_order_violcation_save'];
},
computed: {
...mapGetters([
......
src/views/userManagement/memberEnter.vue
View file @ 8bc28350
......@@ -30,11 +30,11 @@
</el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" style="margin-left: 10px;" @click="newMember"
type="primary" icon="edit">新增会员
type="primary" icon="edit" v-if="memberEnter_btn_add">新增会员
</el-button>
<el-button class="filter-item" style="margin-left: 10px;" @click="bulkUpload"
type="primary" icon="edit">批量导入会员
type="primary" icon="edit" v-if="memberEnter_btn_addIn">批量导入会员
</el-button>
</div>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
......@@ -92,7 +92,7 @@
<el-button type="primary" size="mini" @click="deleteHandler(scope.row)">确定</el-button>
</div>
</el-popover>
<el-button type="danger" size="small" v-popover:popover5>删除</el-button>
<el-button type="danger" size="small" v-popover:popover5 v-if="memberEnter_btn_del">删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -300,10 +300,16 @@
loading: false,
tableKey: 0,
selectedAccItem: undefined
selectedAccItem: undefined,
memberEnter_btn_add: false,//添加一条
memberEnter_btn_del:false,//删除
memberEnter_btn_addIn: false,//批量上传
}
},
created() {
this.memberEnter_btn_add=this.elements['memberEnter:btn_add'];//添加一条
this.memberEnter_btn_del=this.elements['memberEnter:btn_del'];//删除
this.memberEnter_btn_addIn=this.elements['memberEnter:btn_addIn'];//批量上传
this.getList();
} ,
computed: {
......
src/views/userManagement/memberManagement/index.vue
View file @ 8bc28350
......@@ -2,7 +2,7 @@
<div class="app-container calendar-list-container">
<div>
<el-button class="filter-item" style="margin-bottom: 10px;" @click="newMembershipGrade"
type="primary" icon="edit">添加会员等级
type="primary" icon="edit" v-if="memberManagement_btn_add">添加会员等级
</el-button>
</div>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
......@@ -44,7 +44,7 @@
</el-table-column>
<el-table-column align="center" label="操作" width="212">
<template scope="scope">
<el-button size="small" type="danger" @click="delMembership(scope.row)">删除
<el-button size="small" type="danger" @click="delMembership(scope.row)" v-if="memberManagement_btn_del">删除
</el-button>
</template>
</el-table-column>
......@@ -196,10 +196,14 @@
trigger: 'blur'
}
]
}
},
memberManagement_btn_add: false,//添加
memberManagement_btn_del: false,//删除
}
},
created() {
this.memberManagement_btn_add=this.elements['memberManagement:btn_add'];//添加
this.memberManagement_btn_del=this.elements['memberManagement:btn_del'];//删除
this.getList();
}
,
......
src/views/userManagement/userList/index.vue
View file @ 8bc28350
......@@ -131,13 +131,13 @@
<template scope="scope">
<el-button size="small" type="success" @click="viewDetails(scope.row)">查看详情
</el-button>
<el-button v-if="scope.row.status!=1" size="small" type="success" @click=" setMember(scope.row)">设置会员信息
<el-button v-if="scope.row.status!=1&&userList_btn_edit" size="small" type="success" @click=" setMember(scope.row)">设置会员信息
</el-button>
<el-button v-if="scope.row.status!=1" size="small" type="success" @click="userOrder(scope.row)">用户订单
</el-button>
<el-button v-if="scope.row.status!=1" size="small" type="danger" @click="disable(scope.row)">设为禁用
<el-button v-if="scope.row.status!=1&&userList_btn_forbidden" size="small" type="danger" @click="disable(scope.row)">设为禁用
</el-button>
<el-button v-if="scope.row.status==1" size="small" type="danger" @click="available(scope.row)">取消禁用
<el-button v-if="scope.row.status==1&&userList_btn_unmute" size="small" type="danger" @click="available(scope.row)">取消禁用
</el-button>
<el-popover
ref="popover5"
......@@ -150,7 +150,7 @@
<el-button type="primary" size="mini" @click="deleteUser(scope.row)">确定</el-button>
</div>
</el-popover>
<el-button type="danger" size="small" v-popover:popover5>删除</el-button>
<el-button type="danger" size="small" v-if="userList_btn_del" v-popover:popover5>删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -676,10 +676,18 @@
loading: false,
HeaderWithToken: undefined,
tableKey: 0,
selectedAccItem: undefined
selectedAccItem: undefined,
userList_btn_edit: false,//编辑
userList_btn_forbidden: false,//禁用
userList_btn_unmute:false,//取消禁用
userList_btn_del: false,//删除
}
},
created() {
this.userList_btn_edit=this.elements['userList:btn_edit'];//编辑
this.userList_btn_forbidden=this.elements['userList:btn_forbidden'];//禁用
this.userList_btn_unmute=this.elements['userList:btn_unmute'];//取消禁用
this.userList_btn_del=this.elements['userList:btn_del'];//删除
this.getList();
this.getMembersLevel();
}
......
src/views/vehicle/bookRecord/index.vue
View file @ 8bc28350
......@@ -2,28 +2,6 @@
<div class="app-container calendar-list-container">
<div class="filter-container" ref="filter-container">
<el-form :rules="rules4Query" ref="queryForm" :inline="inline" :model="listQuery">
<el-form-item label="分公司" prop="subordinateBranch">
<el-autocomplete
class="inline-input"
v-model="state2"
:fetch-suggestions="querySearch"
placeholder="请输入内容"
@select="handleSelect2"
></el-autocomplete>
<!--<el-select class="filter-item" v-model="listQuery.subordinateBranch" placeholder="请选择分公司">-->
<!--<el-option :key="undefined" label="无" :value="undefined"></el-option>-->
<!--<el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"></el-option>-->
<!--</el-select>-->
</el-form-item>
<el-form-item label="">
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input>
</el-form-item>
<el-form-item label="">
<el-input v-model="listQuery.vehicleCode" placeholder="请输入车辆编码"></el-input>
</el-form-item>
<el-form-item label="申请状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择申请状态">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
......@@ -31,8 +9,24 @@
:value="val.code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌号"></el-input>
</el-form-item>
<el-form-item label="请选择预订月份" prop="selectedMonth4Query">
<el-form-item label="所属大区">
<el-select class="filter-item" v-model="listQuery.zoneId" placeholder="请选择" @change="getProvinceRegions">
<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-select>
</el-form-item>
<el-form-item label="所属公司">
<el-select class="filter-item" v-model="listQuery.liftCompany" placeholder="请选择" @change="getAllBranchCompanyChange">
<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-select>
</el-form-item>
<el-form-item label="预订月份" prop="selectedMonth4Query">
<el-date-picker
v-model="selectedMonth4Query"
type="month"
......@@ -41,7 +35,6 @@
placeholder="请选择预订月份">
</el-date-picker>
</el-form-item>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-form>
</div>
......@@ -49,37 +42,49 @@
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
style="width: 100%">
<el-table-column align="center" label="车辆编号" width="65">
<template scope="scope">
<span>{{scope.row.vehicleCode}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="车牌号" width="120">
<template scope="scope">
<span>{{scope.row.numberPlate}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="所属公司" width="120">
<el-table-column align="center" label="停靠公司" width="120">
<template scope="scope">
<span>{{scope.row.subBranchName}}</span>
<span>{{scope.row.parkCompanyName}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="申请状态" width="65">
<el-table-column align="center" label="申请状态" width="150">
<template scope="scope">
<span>{{getBookRecordStatus(scope.row.status)}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="申请用户" width="65">
<el-table-column align="center" label="使用人/联系方式" width="250">
<template scope="scope">
<span>{{scope.row.bookUserName}}</span>
<span>{{scope.row.vehicleUsername}}/{{scope.row.vehicleUserPhone}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="预定日期" width="220">
<el-table-column align="center" label="出车用途" width="250">
<template scope="scope">
<span v-if="scope.row.bookType==1">租车</span>
<span v-if="scope.row.bookType==2">用户租赁</span>
<span v-if="scope.row.bookType==3">维修</span>
<span v-if="scope.row.bookType==4">展览</span>
<span v-if="scope.row.bookType==5">旅游</span>
<span v-if="scope.row.bookType==6">保养</span>
<span v-if="scope.row.bookType==7">预约中</span>
<span v-if="scope.row.bookType==8">禁用</span>
<span v-if="scope.row.bookType==9">客户用车</span>
<span v-if="scope.row.bookType==10">其他</span>
</template>
</el-table-column>
<el-table-column align="center" label="预定时间" width="220">
<template scope="scope">
<span>{{scope.row.bookStartDate}} 至 {{scope.row.bookEndDate}}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="预定时间" width="220">
<template scope="scope">
<span
v-if="checkIfApply(scope.row.status) && checkIfBooked(scope.row.bookedDate, [scope.row.bookStartDate, scope.row.bookEndDate])"
......@@ -89,7 +94,7 @@
<span v-else>{{getDatePeriodStr([scope.row.bookStartDate, scope.row.bookEndDate])}}</span>
</template>
</el-table-column>
</el-table-column> -->
<!-- <el-table-column align="center" label="提车地址" width="200">-->
<!-- <template scope="scope">-->
......@@ -97,7 +102,7 @@
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="目的地" width="200">
<!-- <el-table-column align="center" label="目的地" width="200">
<template scope="scope">
<span>{{scope.row.destination}}</span>
</template>
......@@ -119,14 +124,14 @@
<template scope="scope">
<span>{{scope.row.reviewerNameCancel}}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column align="center" label="提车地点" width="120">
<el-table-column align="center" label="提车公司" width="200">
<template scope="scope">
<span>{{scope.row.liftCompanyName}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="提车审核人" width="120">
<!-- <el-table-column align="center" label="提车审核人" width="120">
<template scope="scope">
<span>{{scope.row.reviewerNameLift}}</span>
</template>
......@@ -135,14 +140,14 @@
<template scope="scope">
<span>{{scope.row.actualStartDate}}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column align="center" label="还车地点" width="120">
<el-table-column align="center" label="还车公司" width="200">
<template scope="scope">
<span>{{scope.row.retCompanyName}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="还车审核人" width="120">
<!-- <el-table-column align="center" label="还车审核人" width="120">
<template scope="scope">
<span>{{scope.row.reviewerNameReturn}}</span>
</template>
......@@ -176,19 +181,19 @@
<template scope="scope">
<span>{{scope.row.haveViolation?'是':'否'}}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column align="center" label="详情" width="100">
<template scope="scope">
<span style="color: #13CE66;cursor: pointer;" @click="handleDetail(scope.row)">订单详情</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="250">
<template scope="scope">
<el-button size="small" type="success" @click="handleBookInfo(scope.row)">预订信息</el-button>
<el-button
v-if="bookRecord_btn_prove && checkIfApply(scope.row.status) && !checkIfBooked(scope.row.bookedDate, [scope.row.bookStartDate, scope.row.bookEndDate])"
size="small" type="success" @click="handleProve(scope.row)">通过
<el-button v-if="scope.row.haveViolation" size="small" type="success" @click="weizhang(scope.row)">违章记录</el-button>
<el-button v-if="bookRecord_btn_prove&&scope.row.status==1" size="small" type="success" @click="handleProve(scope.row)">通过
</el-button>
<el-button
v-if="bookRecord_btn_reject && checkIfApply(scope.row.status) && !checkIfBooked(scope.row.bookedDate, [scope.row.bookStartDate, scope.row.bookEndDate]) "
size="small" type="danger" @click="handleReject(scope.row)">拒绝
<el-button v-if="bookRecord_btn_reject&&scope.row.status==1" size="small" type="danger" @click="handleReject(scope.row)">驳回
</el-button>
<el-button v-if="bookRecord_btn_lift && checkIfProved(scope.row.status)" size="small" type="success"
@click="handleLift(scope.row)">提车
......@@ -205,13 +210,169 @@
<div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit"
: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>
<book-info-viewer ref="bookInfoViewer"></book-info-viewer>
<acc-item-selector :selectedAccItem="selectedAccItem" :isReadOnly="true" ref="accItemSelector"></acc-item-selector>
<!-- 查看详情 -->
<el-dialog title="预约详情" :visible.sync="dialogDetailVisible" class="order-details">
<el-form label-width="100px">
<el-row>
<el-col :span="24">
<el-form-item label="申请状态">
<span v-if="detailItem.status==1">申请中</span>
<span v-if="detailItem.status==2">已通过</span>
<span v-if="detailItem.status==3">已归还</span>
<span v-if="detailItem.status==4">拒绝</span>
<span v-if="detailItem.status==5">逾期归还</span>
<span v-if="detailItem.status==6">取消预订</span>
<span v-if="detailItem.status==7">已提车</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="车牌号">
<span>{{detailItem.numberPlate}}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车辆编号">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.vehicleId}}</span>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="当前停靠公司">
<span>{{detailItem.parkCompanyName}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="申请账号">
<span></span>
<span style="margin-left:10px"></span>
</el-form-item>
</el-col>
</el-row>
<hr>
<el-row>
<el-col :span="24">
<el-form-item label="使用人">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.user}}</span>
<span style="margin-left:10px" v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.userTel}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="预定时间">
<span>{{detailItem.bookStartDate}}</span> 至 <span>{{detailItem.bookEndDate}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="出车用途">
<span v-if="detailItem.bookType==1">租车</span>
<span v-if="detailItem.bookType==2">用户租赁</span>
<span v-if="detailItem.bookType==3">维修</span>
<span v-if="detailItem.bookType==4">展览</span>
<span v-if="detailItem.bookType==5">旅游</span>
<span v-if="detailItem.bookType==6">保养</span>
<span v-if="detailItem.bookType==7">预约中</span>
<span v-if="detailItem.bookType==8">禁用</span>
<span v-if="detailItem.bookType==9">客户用车</span>
<span v-if="detailItem.bookType==10">其他</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<span></span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="随车物品">
<span></span>
</el-form-item>
</el-col>
</el-row>
<hr>
<el-row>
<el-col :span="8">
<el-form-item label="提车分公司">
<span>{{detailItem.liftCompanyName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作人">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.checkMan}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作时间">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.departureTime}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="还车分公司">
<span>{{detailItem.retCompanyName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作人">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.recycleMan}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作时间">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.arrivalTime}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="提车公里数">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageStart}}KM</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="还车公里数">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageEnd}}KM</span>
</el-form-item>
</el-col>
</el-row>
<hr>
<el-row>
<el-col :span="8">
<el-form-item label="审核人操作">
<span></span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="通过操作">
<span></span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button v-if="detailItem.status==1" @click="handleReject(detailItem)">驳回</el-button>
<el-button v-if="detailItem.status==1" type="primary" @click="handleProve(detailItem)">通过</el-button>
</div>
</el-dialog>
<!-- 提车对话框相关html元素 -->
<el-dialog title="提车" :visible.sync="dialogForm4LiftVisible">
......@@ -226,10 +387,6 @@
placeholder="请输入内容"
@select="handleSelect1"
></el-autocomplete>
<!--<el-select class="filter-item" v-model="form4Lift.liftCompany" placeholder="请选择提车分公司">-->
<!--<el-option :key="undefined" label="无" :value="undefined"></el-option>-->
<!--<el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"></el-option>-->
<!--</el-select>-->
</el-form-item>
<el-form-item label="提车里程数" prop="mileageLift">
......@@ -301,7 +458,12 @@
getAllCompany,
getAll
} from 'api/base_info/branch_company/';
import {
getAllZone
} from 'api/base_info/constant/';
import {
getAllBranchCompanyByZoneId
} from 'api/order/rentVehicle';
import {
formatDate
} from 'utils/dateFormattor';
......@@ -333,6 +495,13 @@
},
data() {
return {
detailItem:{},
dialogDetailVisible:false,
baranchQuery: {
zoneId:null
},
allZoneArr:[],//全部片区
allBranchCompany:[],
state2: '',//搜索-分公司名称
rules4Query: {
selectedMonth4Query: [
......@@ -353,10 +522,10 @@
listQuery: {
page: 1,
limit: 20,
subordinateBranch: undefined,
zoneId:undefined,
liftCompany: undefined,
numberPlate: undefined,
selectedMonth: formatDate(newEast8Date(), 'yyyy-MM'),
vehicleCode: undefined,
status: undefined
},
inline: true,
......@@ -481,8 +650,8 @@
this.allCompanies = codeAndBranchCompany;
});
this.bookRecord_btn_prove = this.elements['bookRecord:btn_prove'];
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook'];
this.bookRecord_btn_reject = this.elements['bookRecord:btn_reject'];
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook'];
this.bookRecord_btn_lift = this.elements['bookRecord:btn_lift'];
this.bookRecord_btn_ret = this.elements['bookRecord:btn_ret'];
},
......@@ -491,6 +660,10 @@
'elements',
'bookRecordStatus'
]),
//获取大区列表
getAllZoneList(){
return getAllZone();
},
selectedMonth4Query: {
get: function () {
if (this.$utils.isString(this.listQuery.selectedMonth) && this.listQuery.selectedMonth !== '') {
......@@ -508,6 +681,23 @@
}
},
methods: {
handleDetail(row){
this.detailItem = row;
this.dialogDetailVisible = true;
},
//监听change事件
getProvinceRegions(item) {
this.listQuery.zoneId = item
this.baranchQuery.zoneId = item
this.listQuery.liftCompany = undefined;
getAllBranchCompanyByZoneId(this.baranchQuery)
.then(response => {
this.allBranchCompany = response.data;
})
},
getAllBranchCompanyChange(item) {
this.listQuery.liftCompany = item
},
querySearch(queryString, cb) {
let selectArry = [];
let iitem = {
......@@ -659,9 +849,6 @@
* 搜索按钮
* */
handleFilter() {
if(this.state2 == "" || this.state2 == "全部"){
this.listQuery.subordinateBranch = undefined;
}
this.listQuery.page = 1;
this.$refs.queryForm.validate(valid => {
if (valid) {
......@@ -708,6 +895,9 @@
type: 'success',
duration: 2000
});
if(this.dialogDetailVisible){
this.dialogDetailVisible = false
}
}
this.getList();
});
......@@ -742,6 +932,9 @@
type: 'success',
duration: 2000
});
if(this.dialogDetailVisible){
this.dialogDetailVisible = false
}
}
this.getList();
});
......@@ -874,3 +1067,14 @@
}
}
</script>
<style>
.order-details .el-form-item{
margin-bottom: 0px !important;
}
.order-details hr {
height: 1px;
background-color: #ccc;
border: none;
}
</style>
\ No newline at end of file
src/views/vehicle/vehicleInfo/index.vue
View file @ 8bc28350
......@@ -320,9 +320,9 @@
<el-table-column align="center" label="操作" width="500">
<template scope="scope">
<el-button v-if="vehicleInfo_btn_edit" size="small" type="success" @click="handleUpdate(scope.row)">编辑
<el-button size="small" type="success" @click="handleUpdate(scope.row)">{{vehicleInfo_btn_edit?"编辑":"查看"}}
</el-button>
<el-button v-if="scope.row.status == 1" size="small" type="success" @click="departureHandler(scope.row)">出车
<el-button v-if="scope.row.status == 1&&vehicleInfo_btn_ride" size="small" type="success" @click="departureHandler(scope.row)">出车
</el-button>
<el-button v-if="scope.row.status == 4" size="small" type="success" @click="arrivalHandler(scope.row)">收车
</el-button>
......@@ -349,7 +349,7 @@
<el-button type="primary" size="mini" @click="deleteHandler(scope.row)">确定</el-button>
</div>
</el-popover>
<el-button type="danger" size="small" v-popover:popover5>删除</el-button>
<el-button type="danger" size="small" v-popover:popover5 v-if="vehicleInfo_btn_ret">删除</el-button>
</template>
</el-table-column>
......@@ -599,7 +599,7 @@
<div slot="footer" class="dialog-footer">
<el-button @click="cancel('form')">取 消</el-button>
<el-button v-if="dialogStatus=='create'" type="primary" @click="create('form')">确 定</el-button>
<el-button v-else type="primary" @click="update('form')">确 定</el-button>
<el-button type="primary" @click="update('form')" v-if="dialogStatus=='update'&&vehicleInfo_btn_edit">确 定</el-button>
</div>
</el-dialog>
......@@ -1062,9 +1062,6 @@
curBookedInfo3Month: undefined,
curBookedInfo: undefined,
dialogStatus: '',
vehicleInfo_btn_edit: false,
vehicleInfo_btn_add: false,
vehicleInfo_btn_apply: false,
allCompanies: {},
allCompaniesArr: [],
textMap: {
......@@ -1104,6 +1101,11 @@
allUpkeepItems: null,
allZoneArr:[],//全部片区
provinceRegions: [],//片区下省份数据
vehicleInfo_btn_edit: false,//编辑
vehicleInfo_btn_add: false,//新增
vehicleInfo_btn_apply: false,//申请预定
vehicleInfo_btn_ride:false,//出车
vehicleInfo_btn_ret:false,//删除
}
},
created() {
......@@ -1122,6 +1124,8 @@
this.vehicleInfo_btn_edit = this.elements['vehicleInfo:btn_edit'];
this.vehicleInfo_btn_add = this.elements['vehicleInfo:btn_add'];
this.vehicleInfo_btn_apply = this.elements['vehicleInfo:btn_apply'];
this.vehicleInfo_btn_ride = this.elements['vehicleInfo:btn_ride'];
this.vehicleInfo_btn_ret = this.elements['vehicleInfo:btn_ret'];
},
computed: {
...mapGetters([
......
src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue
View file @ 8bc28350
......@@ -20,10 +20,10 @@
<div>止：{{scope.row.bookEndDate}}</div>
</template>
</el-table-column>
<el-table-column width="100" align="center" label="用途">
<el-table-column width="150" align="center" label="用途">
<template scope="scope">
<!--/*1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用*/-->
<span>{{scope.row.bookType==1?"租房车":scope.row.bookType==4?"展览":scope.row.bookType==5?"房车游":scope.row.bookType==6?"保养":scope.row.bookType==7?"预约中":scope.row.bookType==8?"禁用":'未知用途'}}</span>
<span>{{scope.row.bookType==1?"租房车":scope.row.bookType==4?"展览":scope.row.bookType==5?"房车游":scope.row.bookType==6?"保养":scope.row.bookType==7?"预约中":scope.row.bookType==8?"禁用":scope.row.bookType==2?"分公司使用":'未知用途'}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="订单号">
......@@ -53,7 +53,7 @@
</el-table-column>
<el-table-column align="center" label="操作" width="300">
<template scope="scope">
<el-button size="small" type="success" @click="toShowDialog(scope.row)">详情</el-button>
<el-button size="small" type="success" @click="toShowDialog(scope.row)" v-if="scope.row.bookType !=2 && scope.row.bookType !=3">详情</el-button>
<el-button size="small" type="success" @click="getLogInfo(scope.row)">重新安排</el-button>
</template>
</el-table-column>
......
src/views/vehicle/vehicleWarningMsg/index.vue
View file @ 8bc28350
......@@ -16,7 +16,7 @@
</el-select>
</el-form-item>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" v-if="vehicle_warning_msg_btn_add" style="margin-left: 10px;"
<el-button class="filter-item" v-if="vehicleWarningMsg_btn_add" style="margin-left: 10px;"
@click="handleCreate"
type="primary" icon="edit">添加
</el-button>
......@@ -67,9 +67,9 @@
<el-table-column align="center" label="操作" width="100">
<template scope="scope">
<el-button v-if="scope.row.status == 1" size="small" type="success" @click="handleDeal(scope.row)">处理
<el-button v-if="scope.row.status == 1&&vehicleInfo_btn_upkeep" size="small" type="success" @click="handleDeal(scope.row)">处理
</el-button>
<el-button v-if="scope.row.status == 5" size="small" type="success" @click="upkeepEndHandler(scope.row)">
<el-button v-if="scope.row.status == 5&&vehicleInfo_btn_upkeepEnd" size="small" type="success" @click="upkeepEndHandler(scope.row)">
保养结束
</el-button>
</template>
......@@ -199,8 +199,9 @@
allUpkeepItems: null,
dialogStatus: undefined,
tableKey: 0,
vehicle_warning_msg_btn_add: false,
vehicle_warning_msg_btn_deal: false
vehicleWarningMsg_btn_add: false,//增加自定义预警
vehicleInfo_btn_upkeep: false,//处理预警消息
vehicleInfo_btn_upkeepEnd: false,//保养结束
}
},
created() {
......@@ -215,8 +216,9 @@
getAllUpkeepItem().then(response => {
this.allUpkeepItems = response.data;
});
this.vehicle_warning_msg_btn_add = this.elements['vehicleWarningMsg:btn_add'];
this.vehicle_warning_msg_btn_deal = this.elements['vehicleWarningMsg:btn_deal'];
this.vehicleWarningMsg_btn_add=this.elements['vehicleWarningMsg:btn_add'];//增加自定义预警
this.vehicleInfo_btn_upkeep = this.elements['vehicleInfo:btn_upkeep'];//处理预警消息
this.vehicleInfo_btn_upkeepEnd= this.elements['vehicleInfo:btn_upkeepEnd'];//保养结束
},
computed: {
...mapGetters([
......
src/views/vehicleType/index.vue
View file @ 8bc28350
......@@ -31,7 +31,7 @@
</el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
type="primary" icon="edit">添加
type="primary" icon="edit" v-if="vehicleTypeList_btn_add">添加
</el-button>
</div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
......@@ -76,7 +76,7 @@
</el-table-column>
<el-table-column align="center" width="200" label="操作">
<template scope="scope">
<el-button v-if="tourManage_btn_edit" size="small" type="success" @click="handleUpdate(scope.row)">编辑
<el-button size="small" type="success" @click="handleUpdate(scope.row)">{{vehicleTypeList_btn_edit?'编辑':'查看'}}
</el-button>
<el-popover
ref="popover5"
......@@ -89,7 +89,7 @@
<el-button type="primary" size="mini" @click="deleteHandler(scope.row)">确定</el-button>
</div>
</el-popover>
<el-button type="danger" size="small" v-popover:popover5>删除</el-button>
<el-button type="danger" size="small" v-popover:popover5 v-if="vehicleTypeList_btn_del">删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -100,7 +100,7 @@
</div>
</div>
<!-- 车型编辑 -->
<oneType v-if="oneTypeDialogVisible" :oneRow="oneRow" :title="modalTitle" v-on:oneDialogEvent = "oneDialogEvent" :brandlist="brandlist" :numberList="numberList"></oneType>
<oneType v-if="oneTypeDialogVisible" :oneRow="oneRow" :vehicleTypeList_btn_edit="vehicleTypeList_btn_edit" :title="modalTitle" v-on:oneDialogEvent = "oneDialogEvent" :brandlist="brandlist" :numberList="numberList"></oneType>
</div>
</template>
......@@ -171,8 +171,6 @@
takeALieTheNumber: undefined,//乘卧数量
},
inline: true,
tourManage_btn_edit: false,//编辑
tourManage_btn_add: false,//添加
vehicleInfo_btn_apply: false,
allCompanies: {},
allCompaniesArr: [],
......@@ -182,15 +180,19 @@
},
tableKey: 0,
departureDialogVisible: false,
arrivalDialogVisible: false
arrivalDialogVisible: false,
vehicleTypeList_btn_add: false,//添加
vehicleTypeList_btn_edit: false,//编辑
vehicleTypeList_btn_del: false,//删除
}
},
created() {
this.getList();
this.getNumberList();//获取全部乘卧数量
this.getLabels();//获取全部品牌标签
this.tourManage_btn_edit = true;//this.elements['tourManage:btn_edit'];
this.tourManage_btn_add = true;//this.elements['tourManage:btn_add'];
this.vehicleTypeList_btn_add=this.elements['vehicleTypeList:btn_add'];//添加
this.vehicleTypeList_btn_edit=this.elements['vehicleTypeList:btn_edit'];//编辑
this.vehicleTypeList_btn_del=this.elements['vehicleTypeList:btn_del'];//删除
},
computed: {
...mapGetters([
......
src/views/vehicleType/modal/oneType.vue
View file @ 8bc28350
......@@ -160,7 +160,7 @@
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" v-if="title=='创建'" @click="create()">确 定</el-button>
<el-button type="primary" v-if="title=='编辑'" @click="update()">确 定</el-button>
<el-button type="primary" v-if="title=='编辑'&&vehicleTypeList_btn_edit" @click="update()">确 定</el-button>
</div>
<!--配置弹框-->
......@@ -230,7 +230,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
import ElRadio from "../../../../node_modules/element-ui/packages/radio/src/radio.vue";
export default {
props: ["oneRow", "title", "brandlist", "numberList"],
props: ["oneRow", "title", "brandlist", "numberList","vehicleTypeList_btn_edit"],
name: 'upkeepDialog',
components: {
ElRadio,
......
src/views/vehicleType/vehicleTypeLabel.vue
View file @ 8bc28350
......@@ -2,7 +2,7 @@
<div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
<div class="filter-container" ref="filter-container">
<el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate"
type="primary" icon="edit">添加
type="primary" icon="edit" v-if="vehicleTypeLabel_btn_save">添加
</el-button>
</div>
<el-table
......@@ -37,19 +37,19 @@
</el-table-column>
<el-table-column width="200" align="center" label="筛选条件">
<template scope="scope">
<el-button size="mini" type="text" @click="startUsingChange(scope.row)" v-if="scope.row.parent.startUsing==1" ><i style="color: #208ee1;font-size:24px;" class="el-icon-star-on el-icon--right"></i></el-button>
<el-button size="mini" type="text" @click="startUsingChange(scope.row)" v-else ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button>
<el-button size="mini" type="text" @click="startUsingChange(scope.row)" v-if="scope.row.parent.startUsing==1&&vehicleTypeLabel_btn_screen" ><i style="color: #208ee1;font-size:24px;" class="el-icon-star-on el-icon--right"></i></el-button>
<el-button size="mini" type="text" @click="startUsingChange(scope.row)" v-if="scope.row.parent.startUsing==0&&vehicleTypeLabel_btn_screen" ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="是否多选">
<template scope="scope">
<el-button size="mini" type="text" @click="setIsMore(scope.row)" v-if="scope.row.parent.isMore==1" ><i style="color: #208ee1;font-size:24px;" class="el-icon-star-on el-icon--right"></i></el-button>
<el-button size="mini" type="text" @click="setIsMore(scope.row)" v-else ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button>
<el-button size="mini" type="text" @click="setIsMore(scope.row)" v-if="scope.row.parent.isMore==1&&vehicleTypeLabel_btn_multipleSelection" ><i style="color: #208ee1;font-size:24px;" class="el-icon-star-on el-icon--right"></i></el-button>
<el-button size="mini" type="text" @click="setIsMore(scope.row)" v-if="scope.row.parent.isMore==0&&vehicleTypeLabel_btn_multipleSelection" ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button>
</template>
</el-table-column>
<el-table-column align="center" width="200" label="操作">
<template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)">编辑
<el-button size="small" type="success" @click="handleUpdate(scope.row)">{{vehicleTypeLabel_btn_save?'编辑':'查看'}}
</el-button>
<el-popover
ref="popover5"
......@@ -62,7 +62,7 @@
<el-button type="primary" size="mini" @click="deleteHandler(scope.row)">确定</el-button>
</div>
</el-popover>
<el-button type="danger" v-if="scope.row.parent.id != 1 && scope.row.parent.id!= 14" size="small" v-popover:popover5>删除</el-button>
<el-button type="danger" v-if="scope.row.parent.id != 1 && scope.row.parent.id!= 14&&vehicleTypeLabel_btn_del" size="small" v-popover:popover5>删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -129,7 +129,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelHandel">取 消</el-button>
<el-button type="primary" @click="update('form')">确 定</el-button>
<el-button type="primary" @click="update('form')" v-if="vehicleTypeLabel_btn_save">确 定</el-button>
</div>
</el-dialog>
</div>
......@@ -238,12 +238,19 @@
listLoading: true,
inline: true,
rankDialogVisible: false,//排序弹框
vehicleTypeLabel_btn_save:false,
vehicleTypeLabel_btn_del:false,
vehicleTypeLabel_btn_multipleSelection:false,
vehicleTypeLabel_btn_screen:false,
}
},
created() {
this.getList();
this.banner_btn_edit = true;//this.elements['tourManage:btn_edit'];
this.banner_btn_add = true;//this.elements['tourManage:btn_add'];
this.vehicleTypeLabel_btn_save=this.elements['vehicleTypeLabel:btn_save'];
this.vehicleTypeLabel_btn_del=this.elements['vehicleTypeLabel:btn_del'];
this.vehicleTypeLabel_btn_multipleSelection=this.elements['vehicleTypeLabel:btn_multipleSelection'];
this.vehicleTypeLabel_btn_screen=this.elements['vehicleTypeLabel:btn_screen'];
},
computed: {
...mapGetters([
......
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