Skip to content

C
cloud-platform-ui
Commit 4a7325f2 authored by xiaosl's avatar xiaosl
Browse files
Options

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

Conflicts:
	config/dev.env.js
	src/views/summit/model/reviewPopup.vue
	src/views/summit/model/summitPopup.vue
	src/views/vehicle/bookRecord/index.vue
	src/views/vehicle/vehicleInfo/index.vue
parents 1915df9b ed66af1f
Hide whitespace changes
Inline Side-by-side
Showing with 895 additions and 554 deletions
config/dev.env.js
View file @ 4a7325f2
module.exports = {
NODE_ENV: '"development"',
<<<<<<< HEAD
BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
=======
BASE_API:'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
APP_ORIGIN: '"https://wallstreetcn.com"'
}
config/sit.env.js
View file @ 4a7325f2
module.exports = {
NODE_ENV: '"sit"',
BASE_API: '"https://xxtest.upyuns.com"',
BASE_API: '"https://dev.dfangche.com"',
APP_ORIGIN: '"https://wallstreetcn.com"'
};
src/api/admin/userManagement/index.js
View file @ 4a7325f2
......@@ -99,15 +99,32 @@ export function postions(obj) {
});
}
// 身份列表
export function jobs(obj) {
return fetch({
url: '/api/admin/postion/admin/jobs',
method: 'get',
data: obj
});
}
// 添加员工
export function addEditor(obj) {
return fetch({
url: '/api/admin/postion/admin/add',
url: '/api/admin/postion/admin/addUserPostion',
method: 'post',
data: obj
});
}
// 编辑员工
export function editorUpd(obj) {
return fetch({
url: '/api/admin/postion/admin/updUserPostion',
method: 'post',
data: obj
});
}
//删除员工
export function deleteStaffs(id) {
return fetch({
......
src/api/base_info/constant/index.js
View file @ 4a7325f2
......@@ -80,7 +80,6 @@ function loadFromServer(type) {
});
}
console.log(rs);
return rs;
}
......
src/api/base_info/region/index.js
View file @ 4a7325f2
......@@ -80,7 +80,6 @@ export function getSonRegionByCodes(code) {
if (!actualCode) {
actualCode = rsCode.REGION_CODE_CHAINA;
}
let sonRegions = store.getters.sonRegions(actualCode);
if (!sonRegions) {
let datas = loadSonsFromServer(actualCode);
......
src/api/vehicle/vehicleInfo/index.js
View file @ 4a7325f2
......@@ -98,3 +98,19 @@ export function checkCode(code, id) {
method: 'get'
});
}
//检查车架号是否存在
export function checkVin(vin, id) {
return fetch({
url: '/vehicle/vehicleInfo/exist_vin/' + vin + '?id=' + id,
method: 'get'
});
}
//检查车辆发动机号是否存在
export function checkEngineNum(engineNum, id) {
return fetch({
url: '/vehicle/vehicleInfo/exist_engineNum/' + engineNum + '?id=' + id,
method: 'get'
});
}
\ No newline at end of file
src/views/summit/model/reviewPopup.vue
View file @ 4a7325f2
......@@ -170,7 +170,10 @@ export default {
beforeAvatarUpload(file) {
var index = file.name.lastIndexOf('.')
var ext = file.name.substr(index + 1)
<<<<<<< HEAD
console.log(ext)
=======
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
if (ext != 'zip') {
this.$message.error('上传压缩包只能是 zip 格式!')
return false
......@@ -197,7 +200,11 @@ export default {
cre() {
let zipPic = []
this.list.forEach(element => {
<<<<<<< HEAD
zipPic.push(element.url)
=======
zipPic.push(element.response.data)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
})
let mp4Vadio = []
this.vadio.forEach(element => {
......@@ -219,6 +226,11 @@ export default {
: zipPic.join(',') + ',' + this.oldList
: zipPic.join(',')
}
<<<<<<< HEAD
=======
// console.log(params);
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
save(params).then(res => {
this.responseResult(res)
})
......
src/views/summit/model/summitPopup.vue
View file @ 4a7325f2
......@@ -105,12 +105,16 @@
<el-form-item label="活动id:">
<!-- <el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> -->
<el-select v-model="form.rid" placeholder="请选择签到/抽奖活动id">
<<<<<<< HEAD
<el-option
v-for="(item,index) in optionsId"
:key="index"
:label="item"
:value="item"
></el-option>
=======
<el-option v-for="(item,index) in optionsId" :key="index" :label="item" :value="item"></el-option>
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
</el-select>
</el-form-item>
</el-col>
......@@ -151,20 +155,20 @@
<div>
<el-row>
<el-col>
<<<<<<< HEAD
<el-form-item label="房车介绍:">
=======
<el-form-item label="房车介绍:" style="margin-top:20px">
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
<el-upload
class="upload-demo"
:headers="getHeaderWithToken"
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:on-remove="handleRemove"
list-type="picture-card"
:file-list="fileList2"
:on-success="handleBannerSuccess"
list-type="picture"
:on-remove="handleRemove"
:headers="getHeaderWithToken"
>
<div slot="tip" class="el-upload__tip">
<span style="color: red;">建议尺寸：1080*644px</span>
</div>
<el-button size="small" type="primary">点击上传</el-button>
<i class="el-icon-plus"></i>
</el-upload>
</el-form-item>
<el-form-item label="峰会流程:">
......@@ -205,8 +209,8 @@
<el-row>
<el-col>
<el-button class="button" @click="cancelHandel">取 消</el-button>
<el-button class="button" type="primary" v-if="titleNme=='创建峰会'" @click="create('form')">确 定</el-button>
<el-button class="button" type="primary" v-if="titleNme=='编辑峰会'" @click="update1()">确 定</el-button>
<el-button class="button" type="primary" v-if="titleNme=='创建峰会'" @click="create('form')">确定</el-button>
<el-button class="button" type="primary" v-if="titleNme=='编辑峰会'" @click="update1()">确定</el-button>
</el-col>
</el-row>
</el-form>
......@@ -287,7 +291,11 @@ export default {
created() {
activityIds().then(data => {
if (data.status == 200) {
<<<<<<< HEAD
this.optionsId = data.data;
=======
this.optionsId = data.data
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
}
})
},
......@@ -306,11 +314,14 @@ export default {
}
},
methods: {
handleBannerSuccess(res, file) {
this.fileList2.push({ url: res.data })
this.form.vehicleImgs = this.fileList2
handleBannerSuccess(res, file, fileList) {
console.log(fileList);
this.fileList2 = fileList
// this.form.vehicleImgs = this.fileList2
},
handleRemove(res, file, fileList) {
this.fileList2 = file
},
handleRemove() {},
getOrderInfo() {
this.title = this.titleNme
if (this.title === '编辑峰会') {
......@@ -384,7 +395,11 @@ export default {
},
getState(status) {
if (this.$utils.isInteger(status)) {
<<<<<<< HEAD
console.log(status);
=======
console.log(status)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
if (status == 0) {
return '默认'
} else {
......@@ -450,10 +465,24 @@ export default {
? (this.form.bmCloseTime = this.form.bmCloseTime)
: (this.form.bmCloseTime = this.form.bmCloseTime.getTime())
let pic = []
<<<<<<< HEAD
if (!!this.form.vehicleImgs) {
this.form.vehicleImgs.forEach(element => {
pic.push(element.url)
})
=======
if (this.fileList2 != '') {
console.log(this.fileList2);
this.fileList2.forEach(element => {
if (!!element.response) {
pic.push(element.response.data)
}else{
pic.push(element.url);
}
});
console.log(pic);
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.form.vehicleImgs = pic.join(',')
}
......@@ -501,12 +530,27 @@ export default {
this.form.startTime = this.form.startTime.getTime()
this.form.bmCloseTime = this.form.bmCloseTime.getTime()
let pic = []
<<<<<<< HEAD
if (!!this.form.vehicleImgs) {
this.form.vehicleImgs.forEach(element => {
pic.push(element.url)
})
this.form.vehicleImgs = pic.join(',')
}
=======
if (this.fileList2 != '') {
this.fileList2.forEach(element => {
pic.push(element.response.data);
});
this.form.vehicleImgs = pic.join(',')
}
// if (!!this.form.vehicleImgs) {
// this.form.vehicleImgs.forEach(element => {
// pic.push(element.url)
// })
// this.form.vehicleImgs = pic.join(',')
// }
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.dataProcessing()
add(this.form).then(res => {
this.responseResult(res)
......@@ -516,7 +560,11 @@ export default {
dataProcessing() {
if (this.form.state === '默认') {
this.form.status = '0'
<<<<<<< HEAD
}else{
=======
} else {
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.form.status = this.statusRadio
}
this.form.processJson = JSON.stringify(this.processJson)
......
src/views/userManagement/employeesInput.vue
View file @ 4a7325f2
<template>
<div class="app-container calendar-list-container">
<div class="filter-container">
<el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item>
</el-col>
<div class="app-container calendar-list-container">
<div class="filter-container">
<el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="姓名">
<el-input v-model.number="listQuery.name" placeholder="请输入姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="姓名">
<el-input v-model.number="listQuery.name" placeholder="请输入姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选员工状态">
<el-col :span="4">
<el-form-item label="状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选员工状态">
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option
v-for="(item,index) in statusList "
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="分公司">
<el-autocomplete
class="inline-input"
v-model="listQuery.companyName"
:fetch-suggestions="querySearch"
placeholder="请选择分公司"
@select="handleSelectPark"
clearable
></el-autocomplete>
<!-- <el-select class="filter-item" v-model="listQuery.status" placeholder="请选分公司">
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option
v-for="(item,index) in statusList "
:key="index"
:label="item.label"
:value="item.value"
v-for="(item,index) in companyList "
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<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="delete"
@click="cleaningQuery"
>清除搜索条件</el-button>
</el-select>-->
</el-form-item>
</el-col>
</el-row>
</el-form>
<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="delete" @click="cleaningQuery">清除搜索条件</el-button>
<el-button class="filter-item" type="primary" v-waves @click="addStaff">新增员工</el-button>
<el-button class="filter-item" type="primary" v-waves @click="toLoad">批量导入员工</el-button>
<el-button class="filter-item" type="primary" v-waves @click="addStaff">新增员工</el-button>
<el-button class="filter-item" type="primary" v-waves @click="toLoad">批量导入员工</el-button>
<el-table
:key="tableKey"
:data="list"
v-loading="listLoading"
border
fit
highlight-current-row
style="width: 100%"
>
<el-table-column prop="name" label="姓名" width="180" align="center"></el-table-column>
<el-table-column prop="phone" label="手机号" align="center"></el-table-column>
<el-table-column prop="jobName" label="职位" align="center"></el-table-column>
<el-table-column prop="companyName" label="所属公司" align="center"></el-table-column>
<el-table-column prop="positionName" label="身份" align="center"></el-table-column>
<el-table-column label="状态" align="center">
<template scope="scope">
<span v-if="scope.row.status == 1">已核销</span>
<span v-else>未核销</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="400" fixed="right">
<template scope="scope">
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="editorStaff(scope.row)"
v-if="scope.row.status != 1"
>编辑</el-button>
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="deleteStaff(scope.row)"
v-if="scope.row.status != 1"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<el-table
:key="tableKey"
:data="list"
v-loading="listLoading"
border
fit
highlight-current-row
style="width: 100%"
>
<el-table-column prop="name" label="姓名" width="180" align="center"></el-table-column>
<el-table-column prop="phone" label="手机号" align="center"></el-table-column>
<el-table-column prop="positionName" label="身份" align="center"></el-table-column>
<el-table-column label="状态" align="center">
<template scope="scope">
<span v-if="scope.row.status == 1">已核销</span>
<span v-else>未核销</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="400" fixed="right">
<template scope="scope">
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="editorStaff(scope.row)"
v-if="scope.row.status != 1"
>编辑</el-button>
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="deleteStaff(scope.row)"
v-if="scope.row.status != 1"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10,20,30, 50]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
style="margin-top:20px"
></el-pagination>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10,20,30, 50]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
style="margin-top:20px"
></el-pagination>
<!-- 新增编辑员工 -->
<el-dialog :title="staffTitle" :visible.sync="bulkUploadMember" class="member" @close="closeAdd">
<el-form :model="staffTitleFrom" ref="userMembership" :rules="rules" label-width="100px">
<el-form-item label="员工姓名">
<el-input v-model.number="staffTitleFrom.name" placeholder="请输入姓名"></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model.number="staffTitleFrom.phone" placeholder="请输入手机号"></el-input>
</el-form-item>
<el-form-item label="员工身份">
<el-select
class="filter-item"
v-model="staffTitleFrom.positionId"
placeholder="请选择员工身份"
style="width:100%"
>
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option
v-for="(item,index) in postionsList "
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<!-- 新增编辑员工 -->
<el-dialog
:title="staffTitle"
:visible.sync="bulkUploadMember"
class="member"
@close="closeAdd"
>
<el-form :model="staffTitleFrom" ref="userMembership" :rules="rules" label-width="100px">
<el-form-item label="员工姓名">
<el-input v-model.number="staffTitleFrom.name" placeholder="请输入姓名"></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model.number="staffTitleFrom.phone" placeholder="请输入手机号"></el-input>
</el-form-item>
<el-form-item label="员工身份">
<el-select
class="filter-item"
v-model="staffTitleFrom.positionId"
placeholder="请选择员工身份"
style="width:100%"
>
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option
v-for="(item,index) in postionsList "
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<div style="text-align:center">
<el-button type="primary" @click="confirm">确 定</el-button>
<el-button type="primary" @click="bulkUploadMember = false">取消</el-button>
</div>
</el-form>
</el-dialog>
<el-form-item label="员工职位">
<el-select
class="filter-item"
v-model="staffTitleFrom.jobId"
placeholder="请选择员工身份"
style="width:100%"
>
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option
v-for="(item,index) in jobsList "
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<!--批量导入会员窗口-->
<el-dialog title="导入会员" :visible.sync="tolead">
<el-form :model="fileForm">
<el-form-item label="上传文件" label-width="80px">
<el-button type="primary" icon="el-icon-download">
<a
class="el-icon-download"
href="https://mgmt.dfangche.com/axshare/userposition.xlsx"
>下载模板</a>
</el-button>
<el-form-item label="分公司">
<el-autocomplete
class="inline-input"
v-model="staffTitleFrom.companyName"
:fetch-suggestions="querySearch"
placeholder="请选择分公司"
style="width:100%"
@select="handleSelectParks"
></el-autocomplete>
</el-form-item>
<div style="text-align:center">
<el-button type="primary" @click="confirm">确 定</el-button>
<el-button type="primary" @click="bulkUploadMember = false">取消</el-button>
</div>
</el-form>
</el-dialog>
<el-upload
ref="uploadExcel"
:limit="limitNum"
action="1111"
:headers="getHeaderWithToken"
accept=".xlsx"
:http-request="upLoad"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:before-upload="beforeUploadFile"
:on-change="fileChange"
:on-exceed="exceedFile"
:file-list="fileList"
>
<el-button size="small" type="primary" icon="el-icon-edit">
上传文件
<i class="el-icon-upload el-icon--right"></i>
</el-button>
<div slot="tip" class="el-upload__tip">只能上传xlsx(Excel2007以上版本)文件，且不超过10M</div>
</el-upload>
<el-button
size="small"
class="filter-item"
type="primary"
@click="cancelNotDeleteForm"
>取消</el-button>
</el-form-item>
</el-form>
</el-dialog>
<!--批量导入会员窗口-->
<el-dialog title="导入会员" :visible.sync="tolead">
<el-form :model="fileForm">
<el-form-item label="上传文件" label-width="80px">
<el-button type="primary" icon="el-icon-download">
<a class="el-icon-download" href="https://mgmt.dfangche.com/axshare/userposition.xlsx">下载模板</a>
</el-button>
<!-- 提示 -->
<el-dialog title="上传提示" :visible.sync="uploadHiut">
<p>
上传成功:
<b>{{uploadListHiut.success}}</b>条,上传失败:
<b>{{uploadListHiut.error}}</b>条
</p>
<ul class="defeated">
<li v-for="(item,index) in uploadListHiut.uploadList" :key="index">
<p>
失败行数:
<span>{{item.num}}</span>,失败原因:
<span>{{item.msg}}</span>
</p>
</li>
</ul>
</el-dialog>
</div>
</div>
<el-upload
ref="uploadExcel"
:limit="limitNum"
action="1111"
:headers="getHeaderWithToken"
accept=".xlsx"
:http-request="upLoad"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:before-upload="beforeUploadFile"
:on-change="fileChange"
:on-exceed="exceedFile"
:file-list="fileList"
>
<el-button size="small" type="primary" icon="el-icon-edit">
上传文件
<i class="el-icon-upload el-icon--right"></i>
</el-button>
<div slot="tip" class="el-upload__tip">只能上传xlsx(Excel2007以上版本)文件，且不超过10M</div>
</el-upload>
<el-button size="small" class="filter-item" type="primary" @click="cancelNotDeleteForm">取消</el-button>
</el-form-item>
</el-form>
</el-dialog>
<!-- 提示 -->
<el-dialog title="上传提示" :visible.sync="uploadHiut">
<p>
上传成功:
<b>{{uploadListHiut.success}}</b>条,上传失败:
<b>{{uploadListHiut.error}}</b>条
</p>
<ul class="defeated">
<li v-for="(item,index) in uploadListHiut.uploadList" :key="index">
<p>
失败行数:
<span>{{item.num}}</span>,失败原因:
<span>{{item.msg}}</span>
</p>
</li>
</ul>
</el-dialog>
</div>
</div>
</template>
<script>
import {
staffList,
postions,
addEditor,
deleteStaffs
} from "src/api/admin/userManagement/index";
import { getToken } from "src/utils/auth";
import { mapGetters } from "vuex";
import { staffImport } from "src/api/admin/UserMember/index";
staffList,
postions,
addEditor,
deleteStaffs,
jobs,editorUpd
} from 'src/api/admin/userManagement/index'
import { getToken } from 'src/utils/auth'
import { mapGetters } from 'vuex'
import { staffImport } from 'src/api/admin/UserMember/index'
import { getAll } from 'api/base_info/branch_company'
export default {
created() {
this.getList();
this.postionsFn();
},
computed: {
...mapGetters(["elements"]),
/**
* 获取token
*/
created() {
this.getList()
this.postionsFn()
this.getAllFn()
this.jobsFn()
},
computed: {
...mapGetters(['elements']),
/**
* 获取token
*/
getHeaderWithToken() {
return { Authorization: getToken() };
}
},
data() {
return {
activeId: "",
uploadListHiut: {
uploadList: [],
success: "",
error: ""
},
uploadHiut: false,
fileList: [],
BASE_API: process.env.BASE_API,
limitNum: 1,
fileForm: {
file: ""
},
tolead: false,
listQuery: {
name: "",
phone: "",
status: null,
page: 1,
limit: 10
},
total: null,
tableKey: 0,
list: [],
listLoading: true,
statusList: [
{
label: "未核销",
value: "0"
},
{
label: "已核销",
value: "1"
}
],
postionsList: [],
staffTitle: "新增员工",
bulkUploadMember: false,
staffTitleFrom: {
phone: "",
name: "",
positionId: ""
},
rules: {}
};
},
methods: {
//新增,编辑员工弹窗关闭
closeAdd() {
this.staffTitleFrom = {
phone: "",
name: "",
positionId: ""
};
},
upLoad(file) {
var form = new FormData();
// 文件对象
form.append("file", file.file);
staffImport(form).then(res => {
console.log(res);
this.uploadHiut = true;
(this.uploadListHiut = {
uploadList: res.data.data,
success: res.data.success,
error: res.data.error
}),
this.getList();
});
},
//excel上传
handleRemove(file, fileList) {
//console.log(file, fileList);
},
handlePreview(file) {
//console.log(file);
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}？`);
},
// 文件超出个数限制时的钩子
exceedFile(files, fileList) {
this.$notify.warning({
title: "警告",
message: `只能选择 ${
this.limitNum
} 个文件，当前共选择了 ${files.length + fileList.length} 个`
});
},
// 文件状态改变时的钩子
fileChange(file, fileList) {
//console.log("change");
//console.log(file);
this.fileForm.file = file.raw;
//console.log(this.fileForm.file);
// console.log(fileList);
},
// 上传文件之前的钩子, 参数为上传的文件,若返回 false 或者返回 Promise 且被 reject，则停止上传
beforeUploadFile(file) {
//console.log("before upload");
//console.log(file);
let extension = file.name.substring(file.name.lastIndexOf(".") + 1);
let size = file.size / 1024 / 1024;
if (extension !== "xlsx") {
this.$notify.warning({
title: "警告",
message: `只能上传Excel 2007以上版本（即后缀是.xlsx）的文件`
});
}
if (size > 10) {
this.$notify.warning({
title: "警告",
message: `文件大小不得超过10M`
});
}
},
cancelNotDeleteForm() {
this.tolead = false;
this.$refs.uploadExcel.clearFiles();
},
//员工列表
getList() {
staffList(this.listQuery).then(data => {
this.listLoading = true;
if (data.status == 200) {
console.log(data);
this.list = data.data.data;
this.total = data.data.totalCount;
this.listLoading = false;
}
});
},
handleSizeChange(val) {
this.listQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.listQuery.page = val;
this.getList();
},
//搜索
handleFilter() {
this.getList();
},
//清空搜索条件
cleaningQuery() {
this.listQuery.page = 1;
this.listQuery.limit = 10;
this.listQuery.name = "";
this.listQuery.phone = "";
this.listQuery.status = "";
this.getList();
},
//新增员工
addStaff() {
this.staffTitle == "新增员工"
this.bulkUploadMember = true;
},
//批量导入员工
toLoad() {
this.tolead = true;
},
//编辑员工
editorStaff(row) {
this.activeId = row.id;
this.staffTitle = "编辑员工";
this.bulkUploadMember = true;
this.staffTitleFrom = {
phone: row.phone,
name: row.name,
positionId: row.positionId
};
},
//删除员工
deleteStaff(row) {
this.$confirm("确定删除吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
deleteStaffs(row.id).then(data => {
if (data.status == 200) {
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000
});
this.getList();
} else {
this.$notify({
title: "失败",
message: "删除失败",
type: "failed",
duration: 2000
});
}
});
});
},
//确定
confirm(formName) {
if (this.staffTitle == "新增员工") {
addEditor(this.staffTitleFrom).then(data => {
if (data.status == 200) {
this.$notify({
title: "成功",
message: "新增成功",
type: "success",
duration: 2000
});
this.bulkUploadMember = false;
this.getList();
}
});
} else {
this.staffTitleFrom.id = this.activeId;
addEditor(this.staffTitleFrom).then(data => {
if (data.status == 200) {
this.$notify({
title: "成功",
message: "编辑成功",
type: "success",
duration: 2000
});
this.bulkUploadMember = false;
this.getList();
}
});
}
},
//身份列表
postionsFn() {
postions().then(data => {
//console.log(data);
if (data.status == 200) {
this.postionsList = data.data;
}
});
},
resetForm(formName) {
this.$refs[formName].resetFields();
}
}
};
getHeaderWithToken() {
return { Authorization: getToken() }
}
},
data() {
return {
jobsList: [],
activeId: '',
uploadListHiut: {
uploadList: [],
success: '',
error: ''
},
companyList: [],
uploadHiut: false,
fileList: [],
BASE_API: process.env.BASE_API,
limitNum: 1,
fileForm: {
file: ''
},
tolead: false,
listQuery: {
name: '',
phone: '',
status: null,
page: 1,
limit: 10,
companyId: '',
companyName: ''
},
total: null,
tableKey: 0,
list: [],
listLoading: true,
statusList: [
{
label: '未核销',
value: '0'
},
{
label: '已核销',
value: '1'
}
],
postionsList: [],
staffTitle: '新增员工',
bulkUploadMember: false,
staffTitleFrom: {
phone: '',
name: '',
positionId: '',
jobId: '',
companyId: '',
companyName: ''
},
rules: {}
}
},
methods: {
handleSelectPark(item) {
this.listQuery.companyId = item.id
},
handleSelectParks(item) {
this.staffTitleFrom.companyId = item.id
this.staffTitleFrom.companyName = item.name
},
createFilter(queryString) {
return restaurant => {
return restaurant.name.indexOf(queryString.toLowerCase()) != -1
}
},
querySearch(queryString, cb) {
let selectArry = []
this.companyList.map(function(item) {
item.value = item.name
selectArry.push(item)
})
this.selectArry = selectArry
var results = queryString
? selectArry.filter(this.createFilter(queryString))
: selectArry
// 调用 callback 返回建议列表的数据
cb(results)
},
//分公司
getAllFn() {
getAll().then(data => {
if (data.status == 200) {
this.companyList = data.data;
this.companyList.unshift({name:'全部',id:''})
console.log(this.companyList);
}
})
},
//新增,编辑员工弹窗关闭
closeAdd() {
this.staffTitleFrom = {
phone: '',
name: '',
positionId: '',
jobId: '',
companyId: '',
companyName: ''
}
},
upLoad(file) {
var form = new FormData()
// 文件对象
form.append('file', file.file)
staffImport(form).then(res => {
console.log(res)
this.uploadHiut = true
;(this.uploadListHiut = {
uploadList: res.data.data,
success: res.data.success,
error: res.data.error
}),
this.getList()
})
},
//excel上传
handleRemove(file, fileList) {
//console.log(file, fileList);
},
handlePreview(file) {
//console.log(file);
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}？`)
},
// 文件超出个数限制时的钩子
exceedFile(files, fileList) {
this.$notify.warning({
title: '警告',
message: `只能选择 ${
this.limitNum
} 个文件，当前共选择了 ${files.length + fileList.length} 个`
})
},
// 文件状态改变时的钩子
fileChange(file, fileList) {
//console.log("change");
//console.log(file);
this.fileForm.file = file.raw
//console.log(this.fileForm.file);
// console.log(fileList);
},
// 上传文件之前的钩子, 参数为上传的文件,若返回 false 或者返回 Promise 且被 reject，则停止上传
beforeUploadFile(file) {
//console.log("before upload");
//console.log(file);
let extension = file.name.substring(file.name.lastIndexOf('.') + 1)
let size = file.size / 1024 / 1024
if (extension !== 'xlsx') {
this.$notify.warning({
title: '警告',
message: `只能上传Excel 2007以上版本（即后缀是.xlsx）的文件`
})
}
if (size > 10) {
this.$notify.warning({
title: '警告',
message: `文件大小不得超过10M`
})
}
},
cancelNotDeleteForm() {
this.tolead = false
this.$refs.uploadExcel.clearFiles()
},
//员工列表
getList() {
staffList(this.listQuery).then(data => {
this.listLoading = true
if (data.status == 200) {
console.log(data)
this.list = data.data.data
this.total = data.data.totalCount
this.listLoading = false
}
})
},
handleSizeChange(val) {
this.listQuery.limit = val
this.getList()
},
handleCurrentChange(val) {
this.listQuery.page = val
this.getList()
},
//搜索
handleFilter() {
this.getList()
},
//清空搜索条件
cleaningQuery() {
this.listQuery.page = 1
this.listQuery.limit = 10
this.listQuery.name = ''
this.listQuery.phone = ''
this.listQuery.status = ''
this.listQuery.companyId = ''
this.listQuery.companyName = ''
this.getList()
},
//新增员工
addStaff() {
this.staffTitle = '新增员工'
this.bulkUploadMember = true
},
//批量导入员工
toLoad() {
this.tolead = true
},
//编辑员工
editorStaff(row) {
this.activeId = row.id
this.staffTitle = '编辑员工'
this.bulkUploadMember = true
this.staffTitleFrom = {
phone: row.phone,
name: row.name,
positionId: row.positionId,
companyId:row.companyId,
companyName:row.companyName,
}
},
//删除员工
deleteStaff(row) {
this.$confirm('确定删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteStaffs(row.id).then(data => {
if (data.status == 200) {
this.$notify({
title: '成功',
message: '删除成功',
type: 'success',
duration: 2000
})
this.getList()
} else {
this.$notify({
title: '失败',
message: '删除失败',
type: 'failed',
duration: 2000
})
}
})
})
},
//确定
confirm(formName) {
if (this.staffTitle == '新增员工') {
addEditor(this.staffTitleFrom).then(data => {
if (data.status == 200) {
this.$notify({
title: '成功',
message: '新增成功',
type: 'success',
duration: 2000
})
this.bulkUploadMember = false
this.getList()
}else {
this.$notify({
title: '失败',
message: data.message,
type: 'failed',
duration: 2000
})
}
})
} else {
this.staffTitleFrom.id = this.activeId
editorUpd(this.staffTitleFrom).then(data => {
if (data.status == 200) {
this.$notify({
title: '成功',
message: '编辑成功',
type: 'success',
duration: 2000
})
this.bulkUploadMember = false
this.getList()
}else {
this.$notify({
title: '失败',
message: data.message,
type: 'failed',
duration: 2000
})
}
})
}
},
//身份列表
postionsFn() {
postions().then(data => {
//console.log(data);
if (data.status == 200) {
this.postionsList = data.data
}
})
},
jobsFn() {
jobs().then(data => {
//console.log(data);
if (data.status == 200) {
this.jobsList = data.data
}
})
},
resetForm(formName) {
this.$refs[formName].resetFields()
}
}
}
</script>
<style>
.member .el-dialog--small {
width: 500px;
width: 500px;
}
.defeated {
padding: 0;
padding: 0;
}
.defeated li {
list-style: none;
list-style: none;
}
</style>
src/views/vehicle/bookRecord/index.vue
View file @ 4a7325f2
......@@ -104,11 +104,24 @@
<span v-if="scope.row.bookType==10">其他</span>
</template>
</el-table-column>
<<<<<<< HEAD
<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="200">
<template scope="scope">
<span>{{scope.row.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="实际取/还时间" width="200">
<template scope="scope">
<span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
</template>
</el-table-column>
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
<!-- <el-table-column align="center" label="预定时间" width="220">
<template scope="scope">
<span
......@@ -177,11 +190,7 @@
<span>{{scope.row.reviewerNameReturn}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="还车时间" width="120">
<template scope="scope">
<span>{{scope.row.actualEndDate}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="随车物品" width="120">
<template scope="scope">
......@@ -301,7 +310,11 @@
</el-col>
<el-col :span="12">
<el-form-item label="车辆编号">
<<<<<<< HEAD
<span>{{detailItem.vehicleId}}</span>
=======
<span>{{detailItem.code}}</span>
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
</el-form-item>
</el-col>
<!-- <el-col :span="7">
......
src/views/vehicle/vehicleDepartureLog/index.vue
View file @ 4a7325f2
......@@ -4,29 +4,41 @@
<el-form>
<el-row>
<el-col :span="5">
<el-form-item>
<el-date-picker
v-model="listQuery.time"
type="date"
:editable="false"
format="yyyy-MM-dd"
prop="time"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item>
<el-form-item label="车辆编码" prop="code">
<el-input type="number" style="width: 200px;" v-model.number="listQuery.code"
placeholder="请输入车辆编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item>
<el-form-item label="车牌号" prop="code">
<el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号"
v-model="listQuery.numberPlate"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="出车日期" prop="startTime">
<el-date-picker
v-model="listQuery.startTime"
type="date"
:editable="false"
format="yyyy-MM-dd"
prop="startTime"
placeholder="请选择出车日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="还车日期" prop="endTime">
<el-date-picker
v-model="listQuery.endTime"
type="date"
:editable="false"
format="yyyy-MM-dd"
prop="endTime"
placeholder="请选择还车日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
......@@ -79,8 +91,8 @@
label="编号"
width="65">
</el-table-column>
<!--<el-table-column align="center" label="编号" width="65">-->
<!--<template scope="scope">-->
<!-- <el-table-column align="center" label="编号" width="65">
--> <!--<template scope="scope">-->
<!--<span>{{scope.row.id}}</span>-->
<!--</template>-->
<!--</el-table-column>-->
......@@ -214,10 +226,10 @@
import {
toEast8Date,
deepCopyDate,
newEast8Date
newEast8Date,
getYMD_date
} from 'utils/dateUtils';
export default {
export default {
name: 'vehicleDepartureLog',
data() {
return {
......@@ -262,7 +274,8 @@
listQuery: {
page: 1,
limit: 20,
time: "",
startTime: undefined,
endTime:undefined,
numberPlate: undefined,
departureId:undefined,
},
......@@ -329,9 +342,12 @@
if (!this.listQuery.numberPlate) {
this.statisticVisiable = false;
}
if (this.listQuery.time) {
this.listQuery.time = this.dateToString(this.listQuery.time);
}
if (this.listQuery.startTime) {
this.listQuery.startTime = getYMD_date(new Date(this.listQuery.startTime));
}
if(this.listQuery.endTime) {
this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime));
}
if (!this.state1) {
this.listQuery.departureId = undefined;
}
......
src/views/vehicle/vehicleInfo/index.vue
View file @ 4a7325f2
......@@ -35,44 +35,39 @@
</el-col>
</el-row>
<el-row>
<el-col>
<el-col :span="5">
<el-form-item label="区域" prop="zoneId">
<el-select class="filter-item" v-model="listQuery.zoneId" placeholder="请选择" @change="getProvinceRegions">
<el-select class="filter-item" v-model="listQuery.zoneId" placeholder="请选择" @change="getProvinceRegions()">
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>
—
<el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份（直辖市）"
@change='getValue'>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="省份" prop="addrProvince">
<el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份（直辖市）" @change="cityRegions4Query()">
<el-option v-for="item in provinceRegions" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
—
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="城市" prop="addrCity">
<el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市">
<el-option v-for="item in cityRegions4Query" :key="item.id" :label="item.name"
<el-option v-for="item in cityRegions4Query()" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-form-item label="车型">
<el-select class="filter-item" v-model="listQuery.modelId" placeholder="请选择车型">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="item in allVehicleList" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
-->
<el-form-item label="车型" prop="modelId">
<el-autocomplete
class="inline-input"
v-model="vehicleArr"
:fetch-suggestions="queryVehicleModelSearch"
placeholder="请选择车型"
@select="handleVehicleModelSelect"
></el-autocomplete>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车型" prop="modelId">
<el-autocomplete
class="inline-input"
v-model="vehicleArr"
:fetch-suggestions="queryVehicleModelSearch"
placeholder="请选择车型"
@select="handleVehicleModelSelect"
></el-autocomplete>
</el-form-item>
</el-col>
</el-row>
<el-button class="filter-item" type="primary" :icon=" showMoreQueryFilter ? 'caret-top' : 'caret-bottom' "
......@@ -88,6 +83,11 @@
<el-input v-model="listQuery.vin" placeholder="请输入车架号"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="托管人" prop="belongToName">
<el-input v-model="listQuery.belongToName" placeholder="请输入姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="保险公司" prop="insuranceCompany">
<el-select class="filter-item" v-model="listQuery.insuranceCompany" placeholder="请选择保险公司">
......@@ -97,6 +97,26 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用途">
<el-select class="filter-item" v-model="listQuery.useType" placeholder="请选择用途">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val,index) in getAllUseType() " :key="index" :label="val.val"
:value="val.code"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="保养日期" prop="mRange">
<el-date-picker
v-model="listQuery.mRange"
type="daterange"
:editable="true"
format="yyyy-MM-dd"
placeholder="请输入保养日期范围">
</el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="保险结束日期" prop="insuranceDateRange">
<el-date-picker
......@@ -122,17 +142,7 @@
</el-date-picker>
</el-form-item>
</el-col>-->
<el-col :span="8">
<el-form-item label="保养日期" prop="mRange">
<el-date-picker
v-model="listQuery.mRange"
type="daterange"
:editable="true"
format="yyyy-MM-dd"
placeholder="请输入保养日期范围">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</div>
</transition>
......@@ -201,6 +211,11 @@
<span>{{getUseType(scope.row.useType)}}</span>
</template>
</el-table-column>
<el-table-column width="120" align="center" label="托管人">
<template scope="scope">
<span>{{getBelongToNameStr(scope.row)}}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="备注">
<template scope="scope">
......@@ -262,11 +277,7 @@
</template>
</el-table-column>
<el-table-column width="120" align="center" v-if="showMoreMoreCol" label="所属人">
<template scope="scope">
<span>{{getBelongToNameStr(scope.row)}}</span>
</template>
</el-table-column>
<el-table-column width="80" align="center" v-if="showMoreMoreCol" label="行驶证">
......@@ -318,16 +329,19 @@
保养结束
</el-button> -->
<el-button v-if="vehicleInfo_btn_apply && checkIfRuning(scope.row) " size="small"
<!-- <el-button v-if="vehicleInfo_btn_apply && checkIfRuning(scope.row) " size="small"
class="el-button el-button--text el-button--small"
@click="handleApply(scope.row)">申请预订
</el-button>
</el-button> -->
<!-- <el-button size="small" class="el-button el-button&#45;&#45;text el-button&#45;&#45;small" @click="handleBookInfo(scope.row)">
预订信息
</el-button>-->
<el-button size="small" class="el-button el-button--text el-button--small"
@click="handleDepartureLog(scope.row)">排班记录
@click="handleBookRecord(scope.row)">排班记录
</el-button>
<el-button size="small" class="el-button el-button--text el-button--small"
@click="handleDepartureLog(scope.row)">出行记录
</el-button>
<el-button size="small" @click="deleteHandler(scope.row)" class="el-button el-button--text el-button--small"
style="color:red;" v-if="vehicleInfo_btn_ret">删除
</el-button>
......@@ -733,7 +747,9 @@
putObj,
delObj,
getSysRegionByIds,
checkCode
checkCode,
checkVin,
checkEngineNum
} from '../../../api/vehicle/vehicleInfo/';
import {
......@@ -909,12 +925,51 @@
],
vin: [
{
<<<<<<< HEAD
min: 0,
max: 200,
message: '长度小于 200 个字符',
trigger: 'blur',
}
],
=======
validator: (rule, value, callback) => {
//检验code码
if (this.$utils.isUndefined(value) || this.$utils.isNull(value) || this.$utils.isEmpty("" + value)) {
return callback(new Error("请输入车架号"));
}
if (value.length < 1 || value.length > 17) {
return callback(new Error('车架号长度小于17 个字符'));
}
checkVin(value, this.form.id).then(response => {
// console.log(response.data);
if (response.data === true) {
return callback(new Error("该车架号已经被占用，请重新输入"));
} else {
callback();
}
})
},
trigger: 'blur',
}
],
engineNum: [
{
validator: (rule, value, callback) => {
//检验code码
checkEngineNum(value, this.form.id).then(response => {
// console.log(response.data);
if (response.data === true) {
return callback(new Error("该发动机号已经被占用，请重新输入"));
} else {
callback();
}
})
},
trigger: 'blur',
}
],
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
numberPlate: [
{
min: 0,
......@@ -1143,7 +1198,9 @@
notBookedStartDate: undefined,
notBookedEndDate: undefined,
code: undefined,
modelId: undefined
modelId: undefined,
belongToName: undefined,
useType:undefined
},
showMoreQueryFilter: false,
showMoreMoreCol: false,
......@@ -1192,6 +1249,7 @@
allUpkeepItems: null,
allZoneArr: [],//全部片区
provinceRegions: [],//片区下省份数据
cityList:[],
vehicleInfo_btn_edit: false,//编辑
vehicleInfo_btn_add: false,//新增
vehicleInfo_btn_apply: false,//申请预定
......@@ -1212,6 +1270,8 @@
getUpkeepAll().then(response => {
this.allUpkeepItems = response.data;
});
this.getAllProvinceRegions();
this.getAllCities();
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'];
......@@ -1236,17 +1296,17 @@
}
return getSonRegionByCodes(this.form.addrCity);
},
cityRegions4Query() {
if (!this.$utils.isInteger(this.listQuery.addrProvince)) {
return null;
}
return getSonRegionByCodes(this.listQuery.addrProvince);
},
getAllZoneList() {
let that = this;
<<<<<<< HEAD
that.allZoneArr = getAllZone();
=======
that.allZoneArr = getAllZone();
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
return getAllZone();
},
townRegions4Query() {
if (!this.$utils.isInteger(this.listQuery.addrCity)) {
return null;
......@@ -1362,7 +1422,7 @@
this.listQuery.addrCity = undefined;
this.listQuery.addrProvince = undefined;
if (!this.$utils.isInteger(this.listQuery.zoneId)) {
return null;
return that.getAllProvinceRegions();
}
this.allZoneArr.map(function (item) {
if (item.id == that.listQuery.zoneId) {
......@@ -1376,6 +1436,42 @@
}
});
},
getAllProvinceRegions() {
let that = this;
var zoneStr = "";
getAllZone().map(function (item) {
zoneStr = zoneStr+item.provinceIds+",";
});
let listRs = undefined;
getSysRegionByIds(zoneStr).then(response => {
if (!that.$utils.isEmpty(response.data)) {
listRs = response.data;
}
that.provinceRegions = listRs;
});
return listRs;
},
cityRegions4Query() {
let that = this;
if (!this.$utils.isInteger(this.listQuery.addrProvince)) {
return that.getAllCities();
}
that.cityList = getSonRegionByCodes(this.listQuery.addrProvince);
return that.cityList;
},
getAllCities() {
var cityStr = [];
var provinceIds = this.provinceRegions;
for(var index in provinceIds) {
var sysregion = getSonRegionByCodes(provinceIds[index].id)
for(var i in sysregion) {
cityStr.push(sysregion[i]);
}
}
this.cityList = cityStr;
return cityStr;
},
getValue(e) {
this.listQuery.addrCity = undefined;
},
......@@ -1622,13 +1718,21 @@
this.upkeepRow = row;
this.upkeepDialogVisible = true;
},
handleDepartureLog(row) {
handleBookRecord(row) {
this.$router.push({
path: '/vehicle/vehicleSchedulManage',
query: {
numberPlate: row.numberPlate
}
});
},
handleDepartureLog(row) {
this.$router.push({
path: '/vehicle/vehicleDepartureLog',
query: {
numberPlate: row.numberPlate
}
});
},
arrivalHandler(row) {
// open dialog
......@@ -1835,11 +1939,15 @@
4: {
code: 4,
val: '出车'
}/*,
5: {
code: 5,
val: '上牌中'
}*/
},
6: {
code: 6,
val: '维修中'
},
7: {
code: 7,
val: '保养中'
}
};
},
getBrand: function (code) {
......
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