Skip to content

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

Merge remote-tracking branch 'origin/base-modify' into base-modify-hf

parents 754210c9 e0fb6fa7
Show whitespace changes
Inline Side-by-side
Showing with 1037 additions and 229 deletions
config/dev.env.js
View file @ f5a45cbf
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
<<<<<<< HEAD
<<<<<<< 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
=======
BASE_API:'"https://xxtest.upyuns.com"',//'"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(小威) BASE_API:'"https://xxtest.upyuns.com"',//'"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(小威)
>>>>>>> 4ae432b1473866a6dc59f10c1ec4b5c66a9ad5cc
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
} }
config/sit.env.js
View file @ f5a45cbf
module.exports = { module.exports = {
NODE_ENV: '"sit"', NODE_ENV: '"sit"',
BASE_API: '"https://xxtest.upyuns.com"', BASE_API: '"https://dev.dfangche.com"',
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
}; };
src/views/cunponManagements/cunponManagement.vue
View file @ f5a45cbf
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<span v-if="scope.row.channel==1">租车</span> <span v-if="scope.row.channel==1">租车</span>
<span v-if="scope.row.channel==2">旅游</span> <span v-if="scope.row.channel==2">旅游</span>
<span v-if="scope.row.channel==3">营地</span> <span v-if="scope.row.channel==3">营地</span>
<span v-if="scope.row.channel==4">会员</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="金额"> <el-table-column align="center" label="金额">
...@@ -119,6 +120,7 @@ ...@@ -119,6 +120,7 @@
<el-radio-group v-model="formdata.valid_type_name" size="medium"> <el-radio-group v-model="formdata.valid_type_name" size="medium">
<el-radio-button label="绝对时效" :disabled="formdata.valid_type_name=='相对时效'&&isUpdate"></el-radio-button> <el-radio-button label="绝对时效" :disabled="formdata.valid_type_name=='相对时效'&&isUpdate"></el-radio-button>
<el-radio-button label="相对时效" :disabled="formdata.valid_type_name=='绝对时效'&&isUpdate"></el-radio-button> <el-radio-button label="相对时效" :disabled="formdata.valid_type_name=='绝对时效'&&isUpdate"></el-radio-button>
<el-radio-button label="永久时效" :disabled="formdata.valid_type_name=='永久时效'&&isUpdate"></el-radio-button>
</el-radio-group> </el-radio-group>
<div style="display:inline-block" v-show="formdata.valid_type_name=='绝对时效'"> <div style="display:inline-block" v-show="formdata.valid_type_name=='绝对时效'">
<el-date-picker v-model="formdata.validStartTimeStr" type = "date" placeholder = "开始时间" :disabled="isUpdate" :picker-options="pickerOptionsStart"></el-date-picker> <el-date-picker v-model="formdata.validStartTimeStr" type = "date" placeholder = "开始时间" :disabled="isUpdate" :picker-options="pickerOptionsStart"></el-date-picker>
...@@ -328,6 +330,10 @@ ...@@ -328,6 +330,10 @@
{ {
id:3, id:3,
val:'营地' val:'营地'
},
{
id:4,
val:'会员'
} }
], ],
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
...@@ -448,7 +454,7 @@ ...@@ -448,7 +454,7 @@
console.log(response) console.log(response)
var item = response.data; var item = response.data;
item.user_type_name = item.userType==0?'普通用户':'会员用户'; item.user_type_name = item.userType==0?'普通用户':'会员用户';
item.valid_type_name = item.validType==1?'绝对时效':'相对时效'; item.valid_type_name = item.validType==1?'绝对时效':item.validType==2?'相对时效':'永久时效';
//相对时效的时间 //相对时效的时间
if(item.validStartTime>0){ if(item.validStartTime>0){
item.validStartTimeStr = getYMD(item.validStartTime); item.validStartTimeStr = getYMD(item.validStartTime);
...@@ -517,7 +523,7 @@ ...@@ -517,7 +523,7 @@
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
that.formdata.userType = that.formdata.user_type_name=='普通用户'?0:1; that.formdata.userType = that.formdata.user_type_name=='普通用户'?0:1;
that.formdata.validType = that.formdata.valid_type_name=='绝对时效'?1:2; that.formdata.validType = that.formdata.valid_type_name=='绝对时效'?1:that.formdata.valid_type_name=='相对时效'?2:3;
if(that.formdata.valid_type_name=='绝对时效'){ if(that.formdata.valid_type_name=='绝对时效'){
that.formdata.validStartTime = new Date(this.formdata.validStartTimeStr).getTime(); that.formdata.validStartTime = new Date(this.formdata.validStartTimeStr).getTime();
that.formdata.validEndTime = new Date(this.formdata.validEndTimeStr).getTime(); that.formdata.validEndTime = new Date(this.formdata.validEndTimeStr).getTime();
...@@ -582,7 +588,7 @@ ...@@ -582,7 +588,7 @@
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
that.formdata.userType = that.formdata.user_type_name=='普通用户'?0:1; that.formdata.userType = that.formdata.user_type_name=='普通用户'?0:1;
that.formdata.validType = that.formdata.valid_type_name=='绝对时效'?1:2; that.formdata.validType = that.formdata.valid_type_name=='绝对时效'?1:that.formdata.valid_type_name=='相对时效'?2:3;
if(that.formdata.valid_type_name=='绝对时效'){ if(that.formdata.valid_type_name=='绝对时效'){
that.formdata.validStartTime = new Date(that.formdata.validStartTimeStr).getTime(); that.formdata.validStartTime = new Date(that.formdata.validStartTimeStr).getTime();
......
src/views/order/memberOrderInfo/index.vue
View file @ f5a45cbf
...@@ -258,12 +258,12 @@ ...@@ -258,12 +258,12 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="注册时间:"> <el-form-item label="注册时间:">
<span>{{userDetails.createTime}}</span> <span>{{!!userDetails.createTime ? timestamp(new Date(userDetails.createTime*1000)) : ''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="最近登录时间:"> <el-form-item label="最近登录时间:">
<span>{{userDetails.lastTime}}</span> <span>{{!!userDetails.lastTime ? timestamp(new Date(userDetails.lastTime)): ''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -308,12 +308,12 @@ ...@@ -308,12 +308,12 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="充值次数:"> <el-form-item label="充值次数:">
<span>{{userDetails.buyCount}}次</span> <span>{{!!userDetails.buyCount ? userDetails.buyCount+'次' : ''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="加入时间:"> <el-form-item label="加入时间:">
<span>{{userDetails.timeOfMembership}}</span> <span>{{!!userDetails.timeOfMembership ? timestamp(new Date(userDetails.timeOfMembership)) :''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -534,36 +534,17 @@ export default { ...@@ -534,36 +534,17 @@ export default {
}, },
excel() { excel() {
this.listQuery.isExport = true; this.listQuery.isExport = true;
// if (!!this.createTime && !!this.createTime[0]) {
// this.listQuery.startOrderTime = formatDate(this.createTime[0], 'yyyy-MM-dd')+ ' 00:00:00'
// this.listQuery.endOrderTime = formatDate(this.createTime[1], 'yyyy-MM-dd')+ ' 23:59:59'
// }
// if (!!this.aplyTime && !!this.aplyTime[0]) {
// this.listQuery.startPayTime = this.aplyTime[0].getTime()
// this.listQuery.endPayTime = this.aplyTime[1].getTime()
// }
// let endOrderTime = this.listQuery.endOrderTime
// let endPayTime = this.listQuery.endPayTime
// let facilitatePhone = this.listQuery.facilitatePhone
// let isExport = 'true'
// let leaderPhone = this.listQuery.leaderPhone
// let level = this.listQuery.level
// let name = this.listQuery.name
// let orderNo = this.listQuery.orderNo
// let phone = this.listQuery.phone
// let startOrderTime = this.listQuery.startOrderTime
// let startPayTime = this.listQuery.startPayTime
// let state = this.listQuery.state
// let type = this.listQuery.type
// window.location.href=process.env.BASE_API+'/api/order/orderMember/app/unauth/export'+'?isExport='+isExport
var u = navigator.userAgent, app = navigator.appVersion;
orderMemberExcel(this.listQuery,{responseType: 'arraybuffer'}).then(res => { orderMemberExcel(this.listQuery,{responseType: 'arraybuffer'}).then(res => {
this.listQuery.isExport = false; this.listQuery.isExport = false;
const content = res const content = res
const blob = new Blob([content], {type: "application/vnd.ms-excel"}) const blob = new Blob([content], {type: "application/vnd.ms-excel"})
const fileName = this.timestamp(new Date())+'.xlsx' const fileName = this.timestamp(new Date())+'会员订单列表.xlsx'
if ('download' in document.createElement('a')) { if(u.indexOf('Edge') > -1){
// 非IE下载 window.navigator.msSaveBlob(blob, fileName)
console.log('ie');
}else{
const elink = document.createElement('a') const elink = document.createElement('a')
elink.download = fileName elink.download = fileName
elink.style.display = 'none' elink.style.display = 'none'
...@@ -572,9 +553,7 @@ export default { ...@@ -572,9 +553,7 @@ export default {
elink.click() elink.click()
URL.revokeObjectURL(elink.href) // 释放URL 对象 URL.revokeObjectURL(elink.href) // 释放URL 对象
document.body.removeChild(elink) document.body.removeChild(elink)
} else { console.log('fei ie');
// IE10+下载
window.navigator.msSaveBlob(blob, fileName)
} }
}) })
}, },
......
src/views/purseManage/discountRecord.vue
View file @ f5a45cbf
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="收款账号"> <el-table-column align="center" label="收款账号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.accountName}}</span> <span>{{scope.row.accountNumber}}</span>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/purseManage/incomeOverview.vue
View file @ f5a45cbf
...@@ -51,27 +51,27 @@ ...@@ -51,27 +51,27 @@
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="总提现"> <el-table-column align="center" label="总提现">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.withdrawals}}</span> <span>{{scope.row.withdrawals}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="提现中"> <el-table-column align="center" label="提现中">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.withdrawaling}}</span> <span>{{scope.row.withdrawaling}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="未入账"> <el-table-column align="center" label="未入账">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.unbooked}}</span> <span>{{scope.row.unbooked}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="当前余额"> <!-- <el-table-column align="center" label="当前余额">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.balance}}</span> <span>{{scope.row.balance}}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<!-- <el-table-column align="center" label="操作" fixed="right"> <!-- <el-table-column align="center" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button <el-button
......
src/views/summit/model/reviewPopup.vue
View file @ f5a45cbf
...@@ -170,6 +170,10 @@ export default { ...@@ -170,6 +170,10 @@ export default {
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
var index = file.name.lastIndexOf('.') var index = file.name.lastIndexOf('.')
var ext = file.name.substr(index + 1) var ext = file.name.substr(index + 1)
<<<<<<< HEAD
console.log(ext)
=======
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
if (ext != 'zip') { if (ext != 'zip') {
this.$message.error('上传压缩包只能是 zip 格式!') this.$message.error('上传压缩包只能是 zip 格式!')
return false return false
...@@ -196,7 +200,11 @@ export default { ...@@ -196,7 +200,11 @@ export default {
cre() { cre() {
let zipPic = [] let zipPic = []
this.list.forEach(element => { this.list.forEach(element => {
<<<<<<< HEAD
zipPic.push(element.url)
=======
zipPic.push(element.response.data) zipPic.push(element.response.data)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
}) })
let mp4Vadio = [] let mp4Vadio = []
this.vadio.forEach(element => { this.vadio.forEach(element => {
...@@ -218,8 +226,11 @@ export default { ...@@ -218,8 +226,11 @@ export default {
: zipPic.join(',') + ',' + this.oldList : zipPic.join(',') + ',' + this.oldList
: zipPic.join(',') : zipPic.join(',')
} }
<<<<<<< HEAD
=======
// console.log(params); // console.log(params);
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
save(params).then(res => { save(params).then(res => {
this.responseResult(res) this.responseResult(res)
}) })
......
src/views/summit/model/summitPopup.vue
View file @ f5a45cbf
...@@ -105,7 +105,16 @@ ...@@ -105,7 +105,16 @@
<el-form-item label="活动id:"> <el-form-item label="活动id:">
<!-- <el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> --> <!-- <el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> -->
<el-select v-model="form.rid" placeholder="请选择签到/抽奖活动id"> <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> <el-option v-for="(item,index) in optionsId" :key="index" :label="item" :value="item"></el-option>
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -146,7 +155,11 @@ ...@@ -146,7 +155,11 @@
<div> <div>
<el-row> <el-row>
<el-col> <el-col>
<<<<<<< HEAD
<el-form-item label="房车介绍:">
=======
<el-form-item label="房车介绍:" style="margin-top:20px"> <el-form-item label="房车介绍:" style="margin-top:20px">
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
<el-upload <el-upload
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'" :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
list-type="picture-card" list-type="picture-card"
...@@ -278,7 +291,11 @@ export default { ...@@ -278,7 +291,11 @@ export default {
created() { created() {
activityIds().then(data => { activityIds().then(data => {
if (data.status == 200) { if (data.status == 200) {
<<<<<<< HEAD
this.optionsId = data.data;
=======
this.optionsId = data.data this.optionsId = data.data
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
} }
}) })
}, },
...@@ -378,7 +395,11 @@ export default { ...@@ -378,7 +395,11 @@ export default {
}, },
getState(status) { getState(status) {
if (this.$utils.isInteger(status)) { if (this.$utils.isInteger(status)) {
<<<<<<< HEAD
console.log(status);
=======
console.log(status) console.log(status)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
if (status == 0) { if (status == 0) {
return '默认' return '默认'
} else { } else {
...@@ -444,6 +465,12 @@ export default { ...@@ -444,6 +465,12 @@ export default {
? (this.form.bmCloseTime = this.form.bmCloseTime) ? (this.form.bmCloseTime = this.form.bmCloseTime)
: (this.form.bmCloseTime = this.form.bmCloseTime.getTime()) : (this.form.bmCloseTime = this.form.bmCloseTime.getTime())
let pic = [] let pic = []
<<<<<<< HEAD
if (!!this.form.vehicleImgs) {
this.form.vehicleImgs.forEach(element => {
pic.push(element.url)
})
=======
if (this.fileList2 != '') { if (this.fileList2 != '') {
console.log(this.fileList2); console.log(this.fileList2);
this.fileList2.forEach(element => { this.fileList2.forEach(element => {
...@@ -455,6 +482,7 @@ export default { ...@@ -455,6 +482,7 @@ export default {
}); });
console.log(pic); console.log(pic);
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.form.vehicleImgs = pic.join(',') this.form.vehicleImgs = pic.join(',')
} }
...@@ -502,6 +530,14 @@ export default { ...@@ -502,6 +530,14 @@ export default {
this.form.startTime = this.form.startTime.getTime() this.form.startTime = this.form.startTime.getTime()
this.form.bmCloseTime = this.form.bmCloseTime.getTime() this.form.bmCloseTime = this.form.bmCloseTime.getTime()
let pic = [] let pic = []
<<<<<<< HEAD
if (!!this.form.vehicleImgs) {
this.form.vehicleImgs.forEach(element => {
pic.push(element.url)
})
this.form.vehicleImgs = pic.join(',')
}
=======
if (this.fileList2 != '') { if (this.fileList2 != '') {
this.fileList2.forEach(element => { this.fileList2.forEach(element => {
pic.push(element.response.data); pic.push(element.response.data);
...@@ -514,6 +550,7 @@ export default { ...@@ -514,6 +550,7 @@ export default {
// }) // })
// this.form.vehicleImgs = pic.join(',') // this.form.vehicleImgs = pic.join(',')
// } // }
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.dataProcessing() this.dataProcessing()
add(this.form).then(res => { add(this.form).then(res => {
this.responseResult(res) this.responseResult(res)
...@@ -523,7 +560,11 @@ export default { ...@@ -523,7 +560,11 @@ export default {
dataProcessing() { dataProcessing() {
if (this.form.state === '默认') { if (this.form.state === '默认') {
this.form.status = '0' this.form.status = '0'
<<<<<<< HEAD
}else{
=======
} else { } else {
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.form.status = this.statusRadio this.form.status = this.statusRadio
} }
this.form.processJson = JSON.stringify(this.processJson) this.form.processJson = JSON.stringify(this.processJson)
......
src/views/vehicle/bookRecord/index.vue
View file @ f5a45cbf
...@@ -2,6 +2,26 @@ ...@@ -2,6 +2,26 @@
<div class="app-container calendar-list-container"> <div class="app-container calendar-list-container">
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form :rules="rules4Query" ref="queryForm" :inline="inline" :model="listQuery"> <el-form :rules="rules4Query" ref="queryForm" :inline="inline" :model="listQuery">
<el-row>
<el-col :span="5">
<el-form-item label="用途">
<el-select class="filter-item" v-model="listQuery.bookType" placeholder="请选择">
<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-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车辆编码">
<el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车牌号">
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌号"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<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>
...@@ -15,20 +35,12 @@ ...@@ -15,20 +35,12 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="车辆编码"> </el-col>
<el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input> </el-row>
</el-form-item> <el-row>
<el-form-item label="车牌号"> </el-col>
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌号"></el-input> <el-col :span="5">
</el-form-item> <el-form-item label="所属大区">
<el-form-item label="用途">
<el-select class="filter-item" v-model="listQuery.bookType" placeholder="请选择">
<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-select>
</el-form-item>
<!-- <el-form-item label="所属大区">
<el-select <el-select
class="filter-item" class="filter-item"
v-model="listQuery.zoneId" v-model="listQuery.zoneId"
...@@ -38,7 +50,9 @@ ...@@ -38,7 +50,9 @@
<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-col>
<el-col :span="5">
<el-form-item label="提车公司" prop="subordinateBranch"> <el-form-item label="提车公司" prop="subordinateBranch">
<el-autocomplete <el-autocomplete
class="inline-input" class="inline-input"
...@@ -48,26 +62,30 @@ ...@@ -48,26 +62,30 @@
@select="handleSelect" @select="handleSelect"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<!--<el-form-item label="提车公司">--> </el-col>
<!--<el-select--> <el-col :span="5">
<!--class="filter-item"--> <el-form-item label="提车时间" prop="bookStartDate4Query">
<!--v-model="listQuery.liftCompany"--> <el-date-picker
<!--placeholder="请选择"--> v-model="bookStartDate4Query"
<!--@change="getAllBranchCompanyChange"--> type="month"
<!--&gt;--> :editable="true"
<!--<el-option :key="undefined" label="全部" :value="undefined"></el-option>--> format="yyyy-MM"
<!--<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"></el-option>--> placeholder="请选择预约提车时间"
<!--</el-select>--> ></el-date-picker>
<!--</el-form-item>--> </el-form-item>
<el-form-item label="预订月份" prop="selectedMonth4Query"> </el-col>
<el-col :span="5">
<el-form-item label="还车时间" prop="bookEndDate4Query">
<el-date-picker <el-date-picker
v-model="selectedMonth4Query" v-model="bookEndDate4Query"
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-col>
</el-row>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button> <el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
</el-form> </el-form>
...@@ -113,20 +131,24 @@ ...@@ -113,20 +131,24 @@
<span v-if="scope.row.bookType==10">其他</span> <span v-if="scope.row.bookType==10">其他</span>
</template> </template>
</el-table-column> </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"> <el-table-column align="center" label="预定取/还时间" width="200">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.bookStartDate}}</span> <span>{{scope.row.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span>
<br />
<span>{{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">
<span>{{scope.row.actualStartDate}}</span> <span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
<br />
<span>{{scope.row.actualEndDate}}</span>
</template> </template>
</el-table-column> </el-table-column>
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
<!-- <el-table-column align="center" label="预定时间" width="220"> <!-- <el-table-column align="center" label="预定时间" width="220">
<template scope="scope"> <template scope="scope">
<span <span
...@@ -315,7 +337,11 @@ ...@@ -315,7 +337,11 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车辆编号"> <el-form-item label="车辆编号">
<<<<<<< HEAD
<span>{{detailItem.vehicleId}}</span>
=======
<span>{{detailItem.code}}</span> <span>{{detailItem.code}}</span>
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="7"> <!-- <el-col :span="7">
...@@ -407,7 +433,7 @@ ...@@ -407,7 +433,7 @@
</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 <el-col
:span="3" :span="3"
v-for="(item, index) in departurePicList" v-for="(item, index) in departurePicList"
:key="index" :key="index"
...@@ -415,13 +441,9 @@ ...@@ -415,13 +441,9 @@
style="margin-bottom:10px" style="margin-bottom:10px"
> >
<el-card> <el-card>
<img :src="item" class="image" @click="lookPic(item)" /> <img :src="item" class="image" />
</el-card> </el-card>
</el-col>
</el-col> -->
<viewer :images="departurePicList">
<img v-for="src in departurePicList" :src="src" :key="src" style="width: 100px; height: 100px;margin-right:30px;">
</viewer>
</el-row> </el-row>
<hr /> <hr />
<el-row> <el-row>
...@@ -433,14 +455,7 @@ ...@@ -433,14 +455,7 @@
type="primary" type="primary"
style="padding: 7px 9px;" style="padding: 7px 9px;"
@click="resetReturn = true" @click="resetReturn = true"
v-if="detailItem.status == 2 && !detailItem.vehicleDepartureLogVo" v-show="detailItem.status == 2 || detailItem.status == 5"
>更换</el-button>
<el-button
size="mini"
type="primary"
style="padding: 7px 9px;"
@click="resetReturn = true"
v-if="detailItem.status == 2 && !!detailItem.vehicleDepartureLogVo && detailItem.vehicleDepartureLogVo.state == 0"
>更换</el-button> >更换</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -467,7 +482,7 @@ ...@@ -467,7 +482,7 @@
</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 <el-col
:span="3" :span="3"
v-for="(item, index) in arrivalPicList" v-for="(item, index) in arrivalPicList"
:key="index" :key="index"
...@@ -475,12 +490,9 @@ ...@@ -475,12 +490,9 @@
style="margin-bottom:10px" style="margin-bottom:10px"
> >
<el-card> <el-card>
<img :src="item" class="image" @click="lookPic(item)" /> <img :src="item" class="image" />
</el-card> </el-card>
</el-col> --> </el-col>
<viewer :images="arrivalPicList">
<img v-for="src in arrivalPicList" :src="src" :key="src" style="width: 100px; height: 100px;margin-right:30px;">
</viewer>
</el-row> </el-row>
<hr /> <hr />
<el-row> <el-row>
...@@ -947,11 +959,13 @@ export default { ...@@ -947,11 +959,13 @@ export default {
flag: false, flag: false,
zoneId: undefined, zoneId: undefined,
liftCompany: undefined, liftCompany: undefined,
liftCompanyName: '', liftCompanyName: "",
numberPlate: undefined, numberPlate: undefined,
selectedMonth: undefined, selectedMonth: undefined,
status: undefined, status: undefined,
bookType: undefined bookType: undefined,
bookStartDate: undefined,
bookEndDate: undefined
}, },
inline: true, inline: true,
dialogFormVisible: false, dialogFormVisible: false,
...@@ -1079,56 +1093,56 @@ export default { ...@@ -1079,56 +1093,56 @@ export default {
} }
}, },
created() { created() {
let t = this let t = this;
getAll().then(response => { getAll().then(response => {
this.allCompaniesArr = response.data this.allCompaniesArr = response.data;
let query = localStorage.getItem('bookRecord') let query = localStorage.getItem("bookRecord");
if (query != 'null' && query) { if(query !="null" && query){
let queryJson = JSON.parse(query) let queryJson = JSON.parse(query);
if (queryJson.page) { if(queryJson.page){
t.listQuery.page = queryJson.page t.listQuery.page = queryJson.page;
} }
if (queryJson.limit) { if(queryJson.limit){
t.listQuery.limit = queryJson.limit t.listQuery.limit = queryJson.limit;
} }
if (queryJson.flag) { if(queryJson.flag){
t.listQuery.flag = queryJson.flag t.listQuery.flag = queryJson.flag;
} }
if (queryJson.zoneId) { if(queryJson.zoneId){
t.listQuery.zoneId = queryJson.zoneId t.listQuery.zoneId = queryJson.zoneId;
} }
if (queryJson.liftCompany) { if(queryJson.liftCompany){
t.listQuery.liftCompany = queryJson.liftCompany t.listQuery.liftCompany = queryJson.liftCompany;
} }
if (queryJson.liftCompanyName) { if(queryJson.liftCompanyName){
t.listQuery.liftCompanyName = queryJson.liftCompanyName t.listQuery.liftCompanyName = queryJson.liftCompanyName;
} }
if (queryJson.numberPlate) { if(queryJson.numberPlate){
t.listQuery.numberPlate = queryJson.numberPlate t.listQuery.numberPlate = queryJson.numberPlate;
} }
if (queryJson.selectedMonth) { if(queryJson.selectedMonth){
t.listQuery.selectedMonth = queryJson.selectedMonth t.listQuery.selectedMonth = queryJson.selectedMonth;
} }
if (queryJson.status) { if(queryJson.status){
t.listQuery.status = queryJson.status t.listQuery.status = queryJson.status;
} }
if (queryJson.bookType) { if(queryJson.bookType){
t.listQuery.bookType = queryJson.bookType t.listQuery.bookType = queryJson.bookType;
} }
// if(queryJson.liftCompany){ // if(queryJson.liftCompany){
// t.allCompaniesArr.map(function (item) { // t.allCompaniesArr.map(function (item) {
// if(item.id == queryJson.liftCompany){ // if(item.id == queryJson.liftCompany){
// t.listQuery.liftCompanyName = item.name; // t.listQuery.liftCompanyName = item.name;
// } // }
// }); // });
// } // }
} }
this.getList() this.getList()
}) });
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']
...@@ -1161,6 +1175,42 @@ export default { ...@@ -1161,6 +1175,42 @@ export default {
this.listQuery.selectedMonth = undefined this.listQuery.selectedMonth = undefined
} }
} }
},
bookStartDate4Query: {
get: function() {
if (
this.$utils.isString(this.listQuery.bookStartDate) &&
this.listQuery.bookStartDate !== ''
) {
return toEast8Date(this.listQuery.bookStartDate)
}
return undefined
},
set: function(date) {
if (this.$utils.isDate(date)) {
this.listQuery.bookStartDate = formatDate(date, 'yyyy-MM')
} else {
this.listQuery.bookStartDate = undefined
}
}
},
bookEndDate4Query: {
get: function() {
if (
this.$utils.isString(this.listQuery.bookEndDate) &&
this.listQuery.bookEndDate !== ''
) {
return toEast8Date(this.listQuery.bookEndDate)
}
return undefined
},
set: function(date) {
if (this.$utils.isDate(date)) {
this.listQuery.bookEndDate = formatDate(date, 'yyyy-MM')
} else {
this.listQuery.bookEndDate = undefined
}
}
} }
}, },
methods: { methods: {
...@@ -1174,19 +1224,18 @@ export default { ...@@ -1174,19 +1224,18 @@ export default {
flag: false, flag: false,
zoneId: undefined, zoneId: undefined,
liftCompany: undefined, liftCompany: undefined,
liftCompanyName: '', liftCompanyName: "",
numberPlate: undefined, numberPlate: undefined,
selectedMonth: undefined, selectedMonth: undefined,
status: undefined, status: undefined,
bookType: undefined bookType: undefined,
bookStartDate: undefined,
bookEndDate: undefined
};
if(this.listQuery){
localStorage.setItem("bookRecord", JSON.stringify(this.listQuery));
} }
if (this.listQuery) { this.getList();
localStorage.setItem(
'bookRecord',
JSON.stringify(this.listQuery)
)
}
this.getList()
}, },
confirm() { confirm() {
if (this.returnForm.retCompany == '') { if (this.returnForm.retCompany == '') {
...@@ -1206,9 +1255,9 @@ export default { ...@@ -1206,9 +1255,9 @@ export default {
type: 'success', type: 'success',
duration: 2000 duration: 2000
}) })
this.resetReturn = false this.resetReturn = false;
this.dialogDetailVisible = false this.dialogDetailVisible = false;
this.getList() this.getList();
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
...@@ -1369,10 +1418,10 @@ export default { ...@@ -1369,10 +1418,10 @@ export default {
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).then(response => { // getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
// this.allBranchCompany = response.data // this.allBranchCompany = response.data
// }) // })
}, },
getAllBranchCompanyChange(item) { getAllBranchCompanyChange(item) {
this.listQuery.liftCompany = item this.listQuery.liftCompany = item
...@@ -1404,12 +1453,11 @@ export default { ...@@ -1404,12 +1453,11 @@ export default {
* 提车分公司 * 提车分公司
* */ * */
handleSelect(item) { handleSelect(item) {
if (item.value == '全部') { if (item.value == "全部") {
this.listQuery.liftCompany = undefined this.listQuery.liftCompany = undefined;
} else { } else {
this.listQuery.liftCompany = item.id this.listQuery.liftCompany = item.id;
} }
console.log(item)
}, },
cancelDialog4Lift(formName) { cancelDialog4Lift(formName) {
this.dialogForm4LiftVisible = false this.dialogForm4LiftVisible = false
...@@ -1618,11 +1666,8 @@ export default { ...@@ -1618,11 +1666,8 @@ export default {
this.listQuery.page = 1 this.listQuery.page = 1
this.$refs.queryForm.validate(valid => { this.$refs.queryForm.validate(valid => {
if (valid) { if (valid) {
if (this.listQuery) { if(this.listQuery){
localStorage.setItem( localStorage.setItem("bookRecord", JSON.stringify(this.listQuery));
'bookRecord',
JSON.stringify(this.listQuery)
)
} }
this.getList() this.getList()
} else { } else {
......
src/views/vehicle/vehicleInfo/index.vue
View file @ f5a45cbf
...@@ -925,6 +925,211 @@ ...@@ -925,6 +925,211 @@
</template> </template>
<script> <script>
<<<<<<< HEAD
import upkeepDialog from '../../modal/upkeepDialogVisible'// 保养弹框
import departureDialog from '../../modal/departureDialog'// 出车弹框
import 'static/css/uploadImg.css';// 引入图片上传组件对话框
import {
page,
addObj,
getObj,
book,
getBookedInfoIn2Month,
getBookedInfo,
putObj,
delObj,
getSysRegionByIds,
checkCode,
checkVin,
checkEngineNum
} from '../../../api/vehicle/vehicleInfo/';
import {
getAllVehicleModelList,
getAllVehicleList
} from '../../../api/vehicleType';
import {
getConstantByTypeAndCode,
getConstantListByType,
getAllInsuranceCompany,
getInsuranceCompany
} from 'api/base_info/constant/';
import {
departureVehicle,
arrivalVehicle,
upkeepVehicle,
upkeepEndVehicle
} from 'api/vehicle/active';
import {
getAllUpkeepItem,
getUpkeepAll
} from 'api/vehicle/upkeep';
import {
getSonRegionByCodes,
getRegionByCodes,
} from 'api/base_info/region/';
import {
VEHICLE_CONSTANT_VEHICLE_BRAND,
VEHICLE_CONSTANT_VEHICLE_USE,
VEHICLE_CONSTANT_BRAND_CODE_UNKOWN,
BELONG_TO_TYPE_OWN,
VEHICLE_CONSTANT_USE_TYPE_UNKOWN,
VEHICLE_CONSTANT_STATUS_NORMAL
} from '../../../store/modules/baseInfo';
import {
getAllCompany,
getAll
} from 'api/base_info/branch_company/';
import {
formatDate
} from 'utils/dateFormattor';
import {
toEast8Date,
deepCopyDate,
newEast8Date,
convertDate2Str
} from 'utils/dateUtils';
import rsCode from '../../../utils/rsCode';
import {mapGetters} from 'vuex';
import {
getToken
} from 'utils/auth';
import bookInfoViewer from '../bookInfoViewer';
import accItemSelector from '../accompanyingItem/accItemSelector.vue';
import Element1 from "../../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col";
import {
getAllZone
} from 'api/base_info/constant/';
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
export default {
name: 'vehicleInfo',
components: {
ElFormItem,
ElCol,
ElRow,
Element1,
bookInfoViewer,
accItemSelector,
upkeepDialog,
departureDialog
},
data() {
return {
upkeepRow: {},//保养数据
departureRow: {},//出车数据
state1: '',
vehicleArr: '',
BASE_API: process.env.BASE_API,
dialogForm4LicenceVisible: false,
licenceSrcUrl: undefined,
showLoadingBody: false,
allVehicleList: [],//全部车型
form: {
vehicleModelName:"",
subordinateBranchName: "",
subordinateBranch: undefined,
parkBranchCompanyName: "",
parkBranchCompanyId: undefined,
modelId: undefined,//车型id
status: undefined,
code: undefined,
numberPlate: undefined,
brand: undefined,
useType: undefined,
vin: undefined,
insuranceNo: undefined,
insuranceCompany: undefined,
insuranceDateRange4form: undefined,
annualVerificationDate: undefined,
maintenanceDate: undefined,
belongTo: undefined,
belongToName: undefined,
engineNum: undefined,
manufacturer: undefined,
mileageLastUpdate: undefined,
// receiveTime: undefined,
drivingLicensePath: undefined,
remark: undefined
},
rules: {
subordinateBranchName: [
{
required: true,
message: '请选择所属分公司',
trigger: 'change'
}
],
vehicleModelName:[
{
required: true,
message: '请选择车型',
trigger: 'change'
}
],
parkBranchCompanyName: [
{
required: true,
message: '请选择停靠分公司',
trigger: 'change'
}
],
maintenanceMileage: [this.integerValidator()],
code: [
{
validator: (rule, value, callback) => {
if (this.$utils.isUndefined(value) || this.$utils.isNull(value) || this.$utils.isEmpty("" + value)) {
return callback(new Error("请输入车辆编码"));
}
if (!this.$utils.isInteger(value)) {
return callback(new Error('编码必须为整数'));
}
if (value < 1 || value > 9999999999) {
return callback(new Error('编码合法范围：[1 - 9999999999]'));
}
//检验code码
checkCode(value, this.form.id).then(response => {
// console.log(response.data);
if (response.data === true) {
return callback(new Error("该车辆编码已经被占用，请重新输入"));
} else {
callback();
}
})
},
trigger: 'blur',
required: true
}
],
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("请输入车架号"));
=======
import axios from 'axios' import axios from 'axios'
import upkeepDialog from '../../modal/upkeepDialogVisible' // 保养弹框 import upkeepDialog from '../../modal/upkeepDialogVisible' // 保养弹框
import departureDialog from '../../modal/departureDialog' // 出车弹框 import departureDialog from '../../modal/departureDialog' // 出车弹框
...@@ -1112,6 +1317,7 @@ export default { ...@@ -1112,6 +1317,7 @@ export default {
) )
} else { } else {
callback() callback()
>>>>>>> 4ae432b1473866a6dc59f10c1ec4b5c66a9ad5cc
} }
}) })
}, },
...@@ -1146,6 +1352,517 @@ export default { ...@@ -1146,6 +1352,517 @@ export default {
} else { } else {
callback() callback()
} }
<<<<<<< HEAD
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,
max: 20,
trigger: 'blur',
message: '车牌不能为空且长度小于20个字符',
required: true
}
],
remark: [
{
min: 0,
max: 2000,
message: '长度小于 2000 个字符',
trigger: 'blur'
}
]
},
book_type_list: [
{
name: '维修',
id: 3
}, {
name: '展览',
id: 4
}, {
name: '旅游',
id: 5
}, {
name: '保养',
id: 6
}, {
name: '禁用',
id: 8
}, {
name: '客户用车',
id: 9
}, {
name: '其他',
id: 10
}
],
form4Apply: {
bookStartDate: undefined,
bookEndDate: undefined,
vehicle: undefined,
liftAddr: undefined,
state3: '',
retCompany: undefined,
state4: '',
liftCompany: undefined,
destination: undefined,
selectedAccItem: undefined,
remark: undefined,
vehicleId: undefined,
bookType: undefined,
vehicleUsername: undefined,
vehicleUserPhone: undefined,
upkeepIds: [],
},
pickerOptions4Apply: {
disabledDate: this.checkBookDate
},
rules4Query: {
vin: [
{
min: 0,
max: 200,
message: '长度小于 200 个字符',
trigger: 'blur'
}
],
subordinateBranch: [
{
validator: (rule, value, callback) => {
if ((this.$utils.isString(this.listQuery.bookedStartDate) && this.listQuery.bookedStartDate !== '') ||
(this.$utils.isString(this.listQuery.bookedEndDate) && this.listQuery.bookedEndDate !== '') ||
(this.$utils.isString(this.listQuery.notBookedStartDate) && this.listQuery.notBookedStartDate !== '') ||
(this.$utils.isString(this.listQuery.notBookedEndDate) && this.listQuery.notBookedEndDate !== '')) {
if (!this.listQuery.subordinateBranch) {
return callback(new Error('若需按预定日期查询车辆，选择分公司'));
}
}
callback();
},
trigger: 'blur'
}
],
notBookDateRange: [
{
validator: (rule, value, callback) => {
if (this.notBookDateRange) {
let startDate = toEast8Date(this.listQuery.notBookedStartDate);
let endDate = toEast8Date(this.listQuery.notBookedEndDate);
if (this.$utils.isDate(startDate) && startDate.setMonth(startDate.getMonth() + 2) < endDate) {
return callback(new Error('日期范围不能超过2个月'));
}
}
callback();
},
trigger: 'blur'
}
],
bookDateRange: [
{
validator: (rule, value, callback) => {
if (this.bookDateRange) {
let startDate = toEast8Date(this.listQuery.bookedStartDate);
let endDate = toEast8Date(this.listQuery.bookedEndDate);
if (this.$utils.isDate(startDate) && startDate.setMonth(startDate.getMonth() + 2) < endDate) {
return callback(new Error('日期范围不能超过2个月'));
}
}
callback();
},
trigger: 'blur'
}
]
},
rules4Apply: {
bookDateRange4Apply: [
{
validator: (rule, value, callback) => {
if (!this.$utils.isArray(this.bookDateRange4Apply) || this.bookDateRange4Apply.length === 0) {
return callback(new Error('请输入预定时间。'));
}
let [oriStartDate, ortEndDate] = this.bookDateRange4Apply;
if (!this.$utils.isDate(oriStartDate) || !this.$utils.isDate(ortEndDate)) {
return callback(new Error('请输入预定时间。'));
}
let [startDate, endDate] = [deepCopyDate(oriStartDate), deepCopyDate(ortEndDate)];
if (!this.$utils.isDate(oriStartDate) || !this.$utils.isDate(ortEndDate)) {
return callback();
}
for (let curDate = startDate; curDate <= endDate; curDate.setDate(curDate.getDate() + 1)) {
if (this.checkBookDate(curDate)) {
return callback(new Error('请选择从今天起两个月内，未预定的时间。'));
}
}
callback();
},
required: true,
trigger: 'blur'
}
],
vehicleUsername: [
{
required: true,
message: '请输入使用人',
trigger: 'blur'
}
],
vehicleUserPhone: [
{
required: true,
message: '请输入使用人联系方式',
trigger: 'blur'
}, {
pattern: /^1[3456789]\d{9}$/,
message: '请输入正确的手机号'
}
],
bookType: [
{
required: true,
message: '请选择用途',
}
],
liftCompany: [
{
required: true,
message: '请选择提车分公司',
trigger: 'blur',
type: 'integer'
}
],
retCompany: [
{
required: true,
message: '请选择还车分公司',
trigger: 'blur',
type: 'integer'
}
],
destination: [
{
min: 0,
max: 200,
message: '长度小于 200 个字符',
trigger: 'blur'
}
],
remark: [
{
min: 0,
max: 2000,
message: '长度小于 2000 个字符',
trigger: 'blur'
}
]
},
selectArry: [],
selectVehicleModelArray: [],
list: null,
total: null,
listLoading: true,
listQuery: {
page: 1,
limit: 20,
zoneId: undefined,
addrProvince: undefined,
addrCity: undefined,
addrTown: undefined,
vin: undefined,
insuranceCompany: undefined,
mileageRangeStart: undefined,
mileageRangeEnd: undefined,
insuranceDateRange: undefined,
mRange: undefined,
aVRange: undefined,
subordinateBranch: undefined,
numberPlate: undefined,
status: undefined,
bookedStartDate: undefined,
bookedEndDate: undefined,
notBookedStartDate: undefined,
notBookedEndDate: undefined,
code: undefined,
modelId: undefined,
belongToName: undefined,
useType:undefined
},
showMoreQueryFilter: false,
showMoreMoreCol: false,
inline: true,
dialogFormVisible: false,
dialogForm4ApplyVisible: false,
curBookedInfo3Month: undefined,
curBookedInfo: undefined,
dialogStatus: '',
allCompanies: {},
allCompaniesArr: [],
textMap: {
update: '编辑',
create: '创建',
apply: '预定申请'
},
tableKey: 0,
departureDialogVisible: false,//出车弹框
departureForm: {
vehicleId: null,
numberPlate: null,
departureDate: null,
departureBranchCompanyId: null,
departureBranchCompanyName: '',
use: null,
user: null,
userTel: null,
checkMan: null,
checkManTel: null,
expectArrivalBranchCompanyId: null,
expectArrivalBranchCompanyName: '',
mileage: null
},
arrivalDialogVisible: false,
arrivalForm: {
vehicleId: null,
numberPlate: null,
arrivalDate: null,
recycleMan: null,
recycleManTel: null,
mileage: null,
arrivalBranchCompanyId: null,
arrivalBranchCompanyName: ''
},
upkeepDialogVisible: false,
allUpkeepItems: null,
allZoneArr: [],//全部片区
provinceRegions: [],//片区下省份数据
cityList:[],
vehicleInfo_btn_edit: false,//编辑
vehicleInfo_btn_add: false,//新增
vehicleInfo_btn_apply: false,//申请预定
vehicleInfo_btn_ride: false,//出车
vehicleInfo_btn_ret: false,//删除
}
},
created() {
this.getList();
this.getAllVehicleType();//获取全部车型
getAll()
.then(response => {
this.allCompaniesArr = response.data;
})
getAllCompany(codeAndBranchCompany => {
this.allCompanies = codeAndBranchCompany;
});
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'];
this.vehicleInfo_btn_ride = this.elements['vehicleInfo:btn_ride'];
this.vehicleInfo_btn_ret = this.elements['vehicleInfo:btn_ret'];
},
computed: {
...mapGetters([
'elements',
'belong2Type',
'vehicleStatus'
]),
cityRegions() {
if (!this.$utils.isInteger(this.form.addrProvince)) {
return null;
}
return getSonRegionByCodes(this.form.addrProvince);
},
townRegions() {
if (!this.$utils.isInteger(this.form.addrCity)) {
return null;
}
return getSonRegionByCodes(this.form.addrCity);
},
getAllZoneList() {
let that = this;
<<<<<<< HEAD
that.allZoneArr = getAllZone();
=======
that.allZoneArr = getAllZone();
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
return getAllZone();
},
townRegions4Query() {
if (!this.$utils.isInteger(this.listQuery.addrCity)) {
return null;
}
return getSonRegionByCodes(this.listQuery.addrCity);
},
getHeaderWithToken() {
return {Authorization: getToken()};
},
getSelectedAccItemStr() {
if (!this.$utils.isEmpty(this.form4Apply.selectedAccItem)) {
let rsStr = '';
for (let key in this.form4Apply.selectedAccItem) {
rsStr = rsStr + this.$refs.accItemSelector.getNameById(key) + ' : ' + this.form4Apply.selectedAccItem[key] + '\n';
}
return rsStr;
}
return '';
},
getUnkownBrandCode: () => VEHICLE_CONSTANT_BRAND_CODE_UNKOWN,
getCurBookedInfo: function () {
if (!this.$utils.isEmpty(this.curBookedInfo3Month) && this.curBookedInfo3Month.length > 0) {
let rs = {};
for (let index in this.curBookedInfo3Month) {
rs[this.curBookedInfo3Month[index].yearMonth] = this.curBookedInfo3Month[index].bookedDate;
}
return rs;
}
return undefined;
},
bookDateRange: {
get: function () {
let startDate = undefined;
let endDate = undefined;
if (this.$utils.isString(this.listQuery.bookedStartDate) && this.listQuery.bookedStartDate !== '') {
startDate = toEast8Date(this.listQuery.bookedStartDate);
}
if (this.$utils.isString(this.listQuery.bookedEndDate) && this.listQuery.bookedEndDate !== '') {
endDate = toEast8Date(this.listQuery.bookedEndDate);
}
return [startDate, endDate];
},
set: function ([startDate, endDate]) {
if (this.$utils.isDate(startDate)) {
this.listQuery.bookedStartDate = formatDate(startDate, 'yyyy-MM-dd');
} else {
this.listQuery.bookedStartDate = undefined;
}
if (this.$utils.isDate(endDate)) {
this.listQuery.bookedEndDate = formatDate(endDate, 'yyyy-MM-dd');
} else {
this.listQuery.bookedEndDate = undefined;
}
}
},
notBookDateRange: {
get: function () {
let startDate = undefined;
let endDate = undefined;
if (this.$utils.isString(this.listQuery.notBookedStartDate) && this.listQuery.notBookedStartDate !== '') {
startDate = toEast8Date(this.listQuery.notBookedStartDate);
}
if (this.$utils.isString(this.listQuery.notBookedEndDate) && this.listQuery.notBookedEndDate !== '') {
endDate = toEast8Date(this.listQuery.notBookedEndDate);
}
return [startDate, endDate];
},
set: function ([startDate, endDate]) {
if (this.$utils.isDate(startDate)) {
this.listQuery.notBookedStartDate = formatDate(startDate, 'yyyy-MM-dd');
} else {
this.listQuery.notBookedStartDate = undefined;
}
if (this.$utils.isDate(endDate)) {
this.listQuery.notBookedEndDate = formatDate(endDate, 'yyyy-MM-dd');
} else {
this.listQuery.notBookedEndDate = undefined;
}
}
},
bookDateRange4Apply: {
get: function () {
let startDate = undefined;
let endDate = undefined;
if (this.$utils.isString(this.form4Apply.bookStartDate) && this.form4Apply.bookStartDate !== '') {
startDate = toEast8Date(this.form4Apply.bookStartDate);
}
if (this.$utils.isString(this.form4Apply.bookEndDate) && this.form4Apply.bookEndDate !== '') {
endDate = toEast8Date(this.form4Apply.bookEndDate);
}
return [startDate, endDate];
},
set: function ([startDate, endDate]) {
if (this.$utils.isDate(startDate)) {
this.form4Apply.bookStartDate = formatDate(startDate, 'yyyy-MM-dd hh:mm:ss');
} else {
this.form4Apply.bookStartDate = undefined;
}
if (this.$utils.isDate(endDate)) {
this.form4Apply.bookEndDate = formatDate(endDate, 'yyyy-MM-dd hh:mm:ss');
} else {
this.form4Apply.bookEndDate = undefined;
}
}
}
},
methods: {
/**
* 根据片区获取省份数据
* */
getProvinceRegions() {
let that = this;
this.listQuery.addrCity = undefined;
this.listQuery.addrProvince = undefined;
if (!this.$utils.isInteger(this.listQuery.zoneId)) {
return that.getAllProvinceRegions();
}
this.allZoneArr.map(function (item) {
if (item.id == that.listQuery.zoneId) {
getSysRegionByIds(item.provinceIds).then(response => {
let listRs = undefined;
if (!that.$utils.isEmpty(response.data)) {
listRs = response.data;
}
that.provinceRegions = listRs;
});
}
});
},
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;
=======
}) })
}, },
trigger: 'blur' trigger: 'blur'
...@@ -1190,6 +1907,7 @@ export default { ...@@ -1190,6 +1907,7 @@ export default {
trigger: 'blur' trigger: 'blur'
} }
] ]
>>>>>>> 4ae432b1473866a6dc59f10c1ec4b5c66a9ad5cc
}, },
book_type_list: [ book_type_list: [
{ {
......
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