Skip to content

C
cloud-platform-ui
Commit 3732dfad authored by lixy's avatar lixy
Browse files
Options

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

parents e9b430d0 b4369734
Hide whitespace changes
Inline Side-by-side
Showing with 673 additions and 504 deletions
config/dev.env.js
View file @ 3732dfad
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
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://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.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(小威)
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
} }
src/views/order/modal/rentOrderDetailModal.vue
View file @ 3732dfad
<template> <template>
<el-dialog title="租车订单详情" :visible.sync="dialogVisible" class="order-details"> <el-dialog title="租车订单详情" :visible.sync="dialogVisible" class="order-details">
<el-form :model="form" ref="form" label-width="120px"> <el-form :model="form" ref="form" label-width="110px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="订单号:"> <el-form-item label="订单号:">
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="订单创建时间:"> <el-form-item label="创建订单时间:">
<span></span> <span>{{form.crtTime}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="实际支付时间:"> <el-form-item label="实际支付时间:">
<span>{{form.crtTime}}</span> <span>{{!!form.payTime ? timestamp(new Date(form.payTime)) : '无'}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="会员等级/身份:"> <el-form-item label="会员等级/身份:">
<span></span> <span>{{form.memberName}}/{{form. jobTitle}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8"> <!-- <el-col :span="8">
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
@click="resetCar" @click="resetCar"
>重新配车</el-button> >重新配车</el-button>
</el-form-item> </el-form-item>
</el-col> --> </el-col>-->
</el-row> </el-row>
<!-- <el-row> <!-- <el-row>
<el-col :span="8"> <el-col :span="8">
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<span>{{form.startCompanyName}}</span> <span>{{form.startCompanyName}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> --> </el-row>-->
<!-- <el-row> <!-- <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="还车:"> <el-form-item label="还车:">
...@@ -90,31 +90,83 @@ ...@@ -90,31 +90,83 @@
>更换</el-button> >更换</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> --> </el-row>-->
<table class="orderDetail"> <table class="orderDetail">
<tr> <tr>
<th>房车</th> <th>房车</th>
<th>取/还时间</th> <th>取/还时间</th>
<th>交车公司</th> <th>交车公司</th>
<th>还车公司</th> <th>还车公司</th>
<th>费用明细</th>
<th>免费天数</th>
<th>车辆租赁费</th>
<th>优惠券</th>
<th>不计免赔</th>
<th>租房车押金</th>
<th>专职司机服务费</th>
</tr> </tr>
<tr> <tr>
<!-- {{rentCostDetail}} -->
<td>{{form.name}}</td> <td>{{form.name}}</td>
<td> <td>
<p>取:{{form.orderRentVehicleDetail.startTime}}</p> <p>取:{{form.orderRentVehicleDetail.startTime}}</p>
<p>还:{{form.orderRentVehicleDetail.endTime}}</p> <p>还:{{form.orderRentVehicleDetail.endTime}}</p>
<p>租借天数:{{form.orderRentVehicleDetail.dayNum}}</p>
</td> </td>
<td>{{form.startCompanyName}}</td> <td>{{form.startCompanyName}}</td>
<td>{{form.endCompanyName}}</td> <td>{{form.endCompanyName}}</td>
<td>
<p v-if="form.rentVehiclePriceVO">
会员特权{{form.rentVehiclePriceVO.freeDayNum}}天
</p>
<p v-else>
{{orderInfo('免费天数')}}
</p>
</td>
<td>
<p v-if="form.rentVehiclePriceVO">
¥{{form.rentVehiclePriceVO.modelAmount}}*{{form.rentVehiclePriceVO.vehicleNum}}/{{form.rentVehiclePriceVO.vehicleDayNum}}天
</p>
<p v-else>
{{orderInfo('车辆租赁费')}}
</p>
</td>
<td>
<p v-if="form.couponList">
优惠券:
<span
v-for="(item,index) in form.couponList"
:key="index"
>{{item.title}}-{{item.usedAmount}}元</span>
</p>
<p v-else>无</p>
</td>
<td> <td>
<p>车辆租赁费:</p> <p v-if="form.rentVehiclePriceVO">
<p>免费天数:</p> ¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天
<p>不计免赔:</p> </p>
<p>租房车押金:</p> <p v-else>
<p>优惠券:</p> {{orderInfo('不计免赔')}}
</p>
</td>
<td>
<p v-if='form.rentVehiclePriceVO'>
{{form.rentVehiclePriceVO.deposit}}
</p>
<p v-else>
{{orderInfo('租房车押金')}}
</p>
</td>
<td>
<p v-if='form.rentVehiclePriceVO'>
¥{{form.rentVehiclePriceVO.driverPrice}}*{{form.rentVehiclePriceVO.driverNum}}/{{form.rentVehiclePriceVO.dayNum}}天
</p>
<p v-else>
{{orderInfo('专职司机服务费')}}
</p>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -128,36 +180,47 @@ ...@@ -128,36 +180,47 @@
v-show="form.status == 4 || form.status == 5" v-show="form.status == 4 || form.status == 5"
size="mini" size="mini"
type="text" type="text"
style="padding: 7px 9px;"
@click="resetReturn = true" @click="resetReturn = true"
>更换</el-button> >更换</el-button>
</td> </td>
<td>共计:￥{{form.realAmount}}</td> <td colspan="6">{{form.payWay == 1 ? '微信公众号支付' : form.payWay == 2 ? '支付宝即时支付' : form.payWay == 3 ? '银联支付' : ''}} 共计:￥{{form.realAmount}}</td>
</tr> </tr>
</table> </table>
<p>额外随车物品:11111</p> <p>
<p>内部邀请人:11111</p> <b>额外随车物品:</b>
<p>驾驶证:11111</p> <span
v-for="(item,index) in JSON.parse(this.form.carArticlesJson)"
:key="index"
<div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;"> style="margin-right:10px"
>{{item.name || '无'}}</span>
</p>
<p>
<b>内部邀请人:</b>
<span>{{form.facilitatePhone || '无'}}</span>
</p>
<p>
<b>驾驶证:</b>
<span
v-if="form.orderVehicleCrosstownDto"
>{{form.orderVehicleCrosstownDto.licenseName}} {{form.orderVehicleCrosstownDto.licensePhone}} {{form.orderVehicleCrosstownDto.licenseIdCard}}</span>
<span v-else>无</span>
</p>
<!-- <div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;">
<span style="font-size: 18px;font-weight: bold;">驾驶人信息</span> <span style="font-size: 18px;font-weight: bold;">驾驶人信息</span>
</div> </div>-->
<table class="orderDetail" v-if="form.orderVehicleCrosstownDto"> <!-- <table class="orderDetail" v-if="form.orderVehicleCrosstownDto">
<tr> <tr>
<th>姓名</th> <th>姓名</th>
<th>手机号</th> <th>手机号</th>
<th>身份证号</th> <th>身份证号</th>
<!-- <th>驾照</th>-->
</tr> </tr>
<tr> <tr>
<td>{{form.orderVehicleCrosstownDto.licenseName}}</td> <td>{{form.orderVehicleCrosstownDto.licenseName}}</td>
<td>{{form.orderVehicleCrosstownDto.licensePhone}}</td> <td>{{form.orderVehicleCrosstownDto.licensePhone}}</td>
<td>{{form.orderVehicleCrosstownDto.licenseIdCard}}</td> <td>{{form.orderVehicleCrosstownDto.licenseIdCard}}</td>
<!-- <td><img style="width: 140px;height: 140px;" :src="form.orderVehicleCrosstownDto?form.orderVehicleCrosstownDto.licenseImg:'https://xxtest.upyuns.com/image/app/default_%20avatar.png'"></td>-->
</tr> </tr>
</table> </table>-->
</el-form> </el-form>
<div class="modal_modal" v-show="resetCarVisible"></div> <div class="modal_modal" v-show="resetCarVisible"></div>
<!-- 重新配车 --> <!-- 重新配车 -->
...@@ -215,6 +278,7 @@ export default { ...@@ -215,6 +278,7 @@ export default {
updateNumberPlat: false, //是否重新配车 updateNumberPlat: false, //是否重新配车
dialogVisible: false, dialogVisible: false,
resetCarVisible: false, resetCarVisible: false,
goods: [],
resetCarForm: { resetCarForm: {
no: '', no: '',
numberPlate: '' //重新配车车牌号 numberPlate: '' //重新配车车牌号
...@@ -248,7 +312,7 @@ export default { ...@@ -248,7 +312,7 @@ export default {
} }
}, },
mounted() { mounted() {
console.log(this.form)
this.dialogVisible = true this.dialogVisible = true
if (this.form.status == 2) { if (this.form.status == 2) {
this.form.ststusName = '取消' this.form.ststusName = '取消'
...@@ -268,6 +332,40 @@ export default { ...@@ -268,6 +332,40 @@ export default {
this.getAllFn() this.getAllFn()
}, },
methods: { methods: {
orderInfo(val){
let info = this.form.detailsOfExpenses.filter(item=>item.key == val)
if (info == '' || info < 0) {
return '无'
}else{
return info[0].detail || info[0].val
}
},
timestamp(now) {
var year = now.getFullYear()
var month = now.getMonth() + 1
var date = now.getDate()
var Hours = now.getHours()
var Minutes = now.getMinutes()
var Seconds = now.getSeconds()
month = month.toString().length == 1 ? '0' + month : month
date = date.toString().length == 1 ? '0' + date : date
Hours = Hours.toString().length == 1 ? '0' + Hours : Hours
Minutes = Minutes.toString().length == 1 ? '0' + Minutes : Minutes
Seconds = Seconds.toString().length == 1 ? '0' + Seconds : Seconds
return (
year +
'-' +
month +
'-' +
date +
' ' +
Hours +
':' +
Minutes +
':' +
Seconds
)
},
getAllFn() { getAllFn() {
let _this = this let _this = this
getAll().then(data => { getAll().then(data => {
......
src/views/order/rentVehicleInfo/illegalModal.vue
View file @ 3732dfad
<template> <template>
<el-dialog title="违章查询" :visible.sync="isVisible"> <el-dialog title="违章查询" :visible.sync="isVisible">
<el-form> <el-form>
<el-row> <!-- <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="订单号"> <el-form-item label="订单号">
<span>{{row.no}}</span> <span>{{row.no}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="订单金额"> <el-form-item label="订单金额">
<span>{{row.realAmount}}</span> <span>{{row.realAmount}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车牌号"> <el-form-item label="车牌号">
<span>{{row.vehicleNumberPlat}}</span> <span>{{row.vehicleNumberPlat}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="用户ID/实名"> <el-form-item label="用户ID/实名">
<span>{{row.userId}}</span>/<span>{{row.username}}</span> <span>{{row.userId}}</span>/
</el-form-item> <span>{{row.username}}</span>
</el-col> </el-form-item>
</el-row> </el-col>
<el-row> </el-row>
<el-col :span="8"> <el-row>
<el-form-item label="取车"> <el-col :span="8">
<span>{{dateFormat(row.orderRentVehicleDetail.startTime)}}</span> <el-form-item label="取车">
</el-form-item> <span>{{dateFormat(row.orderRentVehicleDetail.startTime)}}</span>
</el-col> </el-form-item>
<el-col :span="16"> </el-col>
<el-form-item label="交车公司"> <el-col :span="16">
<span>{{row.startCompanyName}}</span> <el-form-item label="交车公司">
<span>({{row.orderRentVehicleDetail.startCityName}}{{row.orderRentVehicleDetail.startAddr}})</span> <span>{{row.startCompanyName}}</span>
</el-form-item> <span>({{row.orderRentVehicleDetail.startCityName}}{{row.orderRentVehicleDetail.startAddr}})</span>
</el-col> </el-form-item>
</el-row> </el-col>
<el-row> </el-row>
<el-col :span="8"> <el-row>
<el-form-item label="还车"> <el-col :span="8">
<span>{{dateFormat(row.orderRentVehicleDetail.endTime)}}</span> <el-form-item label="还车">
</el-form-item> <span>{{dateFormat(row.orderRentVehicleDetail.endTime)}}</span>
</el-col> </el-form-item>
<el-col :span="16"> </el-col>
<el-form-item label="收车公司"> <el-col :span="16">
<span><span>{{row.endCompanyName}}</span> <el-form-item label="收车公司">
<span>({{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}})</span></span> <span>
</el-form-item> <span>{{row.endCompanyName}}</span>
</el-col> <span>({{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}})</span>
</el-row> </span>
<el-row> </el-form-item>
<el-col> </el-col>
<el-form-item label="违章截图" :style="{display:'block'}"> </el-row>-->
<!--<el-upload--> <el-row>
<!--:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"--> <el-col>
<!--list-type="picture-card"--> <el-form-item label="违章截图" :style="{display:'block'}">
<!--:headers="getHeaderWithToken"--> <!--<el-upload-->
<!--:on-success="handleSuccess"--> <!--:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"-->
<!--:on-remove="handleRemove">--> <!--list-type="picture-card"-->
<!--<i class="el-icon-plus"></i>--> <!--:headers="getHeaderWithToken"-->
<!--</el-upload>--> <!--:on-success="handleSuccess"-->
<!--<el-dialog v-model="dialogVisible" size="tiny">--> <!--:on-remove="handleRemove">-->
<!--<img width="100%" :src="dialogImageUrl" alt="">--> <!--<i class="el-icon-plus"></i>-->
<!--</el-dialog>--> <!--</el-upload>-->
<el-upload <!--<el-dialog v-model="dialogVisible" size="tiny">-->
class="upload-demo" <!--<img width="100%" :src="dialogImageUrl" alt="">-->
:headers="getHeaderWithToken" <!--</el-dialog>-->
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'" <el-upload
:on-remove="handleRemove" class="upload-demo"
:file-list="fileList2" :headers="getHeaderWithToken"
:on-success="handleSuccess" :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
list-type="picture-card"> :on-remove="handleRemove"
<!--<div slot="tip" class="el-upload__tip">最多上传5张</div>--> :file-list="fileList2"
<i class="el-icon-plus"></i> :on-success="handleSuccess"
</el-upload> list-type="picture-card"
</el-form-item> >
</el-col> <!--<div slot="tip" class="el-upload__tip">最多上传5张</div>-->
</el-row> <i class="el-icon-plus"></i>
<el-row> </el-upload>
<el-form-item label="违章罚款" style="display: inline-block;"> </el-form-item>
<el-input v-model="price" type="number" placeholder="请输入违章罚款金额"></el-input> </el-col>
</el-form-item> </el-row>
</el-row> <el-row>
</el-form> <el-form-item label="违章罚款" style="display: inline-block;width:100%">
<el-input style="width:300px" v-model="price" type="number" placeholder="请输入违章罚款金额"></el-input>
<span style="margin-left:10px">元</span>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="okHandler('form')">确 定</el-button> <el-button type="primary" @click="okHandler('form')">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { import { page, saveOrderViolation } from 'api/order/rentVehicle'
page, import { mapGetters } from 'vuex'
saveOrderViolation import { formatDate } from '../../../utils/dateFormattor'
} from 'api/order/rentVehicle'; import { getToken } from '../../../utils/auth'
import {mapGetters} from 'vuex'; import { getOneIllegalRow } from 'api/order/rentVehicle'
import { import ElRow from 'element-ui/packages/row/src/row'
formatDate import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
} from '../../../utils/dateFormattor'; import ElCol from 'element-ui/packages/col/src/col'
import { import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
getToken import ElForm from '../../../../node_modules/element-ui/packages/form/src/form.vue'
} from '../../../utils/auth'; export default {
import { props: ['row'],
getOneIllegalRow name: 'illegalDialog',
} from 'api/order/rentVehicle'; components: {
import ElRow from "element-ui/packages/row/src/row"; ElForm,
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue"; ElFormItem,
import ElCol from "element-ui/packages/col/src/col"; ElCol,
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue"; ElInput,
import ElForm from "../../../../node_modules/element-ui/packages/form/src/form.vue"; ElRow
export default { },
props: ["row"], data() {
name: 'illegalDialog', return {
components: { BASE_API: process.env.BASE_API,
ElForm, price: undefined, //违章罚款金额
ElFormItem, isVisible: false,
ElCol, fileList2: [] //违章截图
ElInput, }
ElRow },
}, created() {},
data() { watch: {
return { isVisible(newValue, oldValue) {
BASE_API: process.env.BASE_API, if (!newValue) {
price: undefined,//违章罚款金额 this.$emit('illegalEvent', false)
isVisible: false, }
fileList2:[],//违章截图 }
} },
}, mounted() {
created() { let that = this
// if(that.row.refundStatus == 3) {
}, //refundStatus退款状态 0、未退款 1、已退还所有（取消订单时）2、 已退还部分（保留违章预备金）3、已退还所有押金（扣除该扣除的）
watch: { that.getOne(that.row.detailId)
isVisible(newValue, oldValue){ // }
if(!newValue){ this.isVisible = true
this.$emit('illegalEvent', false); },
} computed: {
}, ...mapGetters(['elements']),
}, getHeaderWithToken() {
mounted() { return { Authorization: getToken() }
let that = this; }
// if(that.row.refundStatus == 3) { },
//refundStatus退款状态 0、未退款 1、已退还所有（取消订单时）2、 已退还部分（保留违章预备金）3、已退还所有押金（扣除该扣除的） methods: {
that.getOne(that.row.detailId); /**
// } * 根据id查询一条记录
this.isVisible = true; * */
}, getOne(id) {
computed: { let t = this
...mapGetters([ getOneIllegalRow(id).then(response => {
'elements', if (response.status == 200) {
]), if (response.data) {
getHeaderWithToken() { let arr = response.data.picture.split(',')
return {Authorization: getToken()}; let fileList2 = []
} let p = {}
}, arr.map(function(item) {
methods: { p = {
/** url: item
* 根据id查询一条记录 }
* */ fileList2.push(p)
getOne(id){ })
let t = this; t.price = parseFloat(response.data.price)
getOneIllegalRow(id).then(response => { t.fileList2 = fileList2
if(response.status == 200){ t.id = response.data.id ? response.data.id : undefined
let arr = response.data.picture.split(","); }
let fileList2 = []; } else {
let p = {}; this.$notify({
arr.map(function(item){ title: '失败',
p = { message: response.menu,
url: item type: 'error',
}; duration: 2000
fileList2.push(p); })
}); }
t.price = parseFloat(response.data.price); })
t.fileList2 = fileList2; },
t.id = response.data.id?response.data.id: undefined; /**
} else { * 上传成功
this.$notify({ * */
title: '失败', handleSuccess(res, file) {
message: response.menu, let c = { url: res.data }
type: 'error', this.fileList2.push(c)
duration: 2000 this.showLoadingBody = false
}); },
} /**
}) * 删除违章图片
}, * */
/** handleRemove(file, fileList) {
* 上传成功 this.fileList2 = fileList
* */ },
handleSuccess(res, file) { /**
let c = {url: res.data}; * 确定
this.fileList2.push(c); * */
this.showLoadingBody = false; okHandler() {
}, let arr = []
/** this.fileList2.map(function(item) {
* 删除违章图片 arr.push(item.url)
* */ })
handleRemove(file, fileList){ let params = {
this.fileList2 = fileList; picture: arr.join(','),
}, price: this.price,
/** detailId: this.row.detailId,
* 确定 id: this.id
* */ }
okHandler() { saveOrderViolation(params).then(response => {
let arr = []; if (response.status === 200) {
this.fileList2.map(function(item){ this.$notify({
arr.push(item.url); title: '成功',
}); message: '创建成功',
let params = { type: 'success',
picture:arr.join(","), duration: 2000
price:this.price, })
detailId: this.row.detailId, this.$emit('illegalEvent', false)
id: this.id } else {
}; this.$notify({
saveOrderViolation(params).then(response => { title: '创建失败',
if (response.status === 200) { message: '操作失败！',
this.$notify({ type: 'error',
title: '成功', duration: 2000
message: '创建成功', })
type: 'success', }
duration: 2000 })
}); },
this.$emit('illegalEvent', false); /**
} else { * 弹框-取消
this.$notify({ * */
title: '创建失败', cancel() {
message: '操作失败！', this.$emit('illegalEvent', false)
type: 'error', },
duration: 2000 /**
}); * 格式化时间
} * @param timestamp
}); * @returns {*}
}, */
/** dateFormat(timestamp) {
* 弹框-取消 let date = new Date(timestamp) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
* */ return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
cancel() { }
this.$emit('illegalEvent', false); }
}, }
/**
* 格式化时间
* @param timestamp
* @returns {*}
*/
dateFormat(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
},
}
}
</script> </script>
<style> <style>
.el-form-item__content{ .el-form-item__content {
display: inline-block; display: inline-block;
} }
</style> </style>
src/views/order/rentVehicleInfo/index.vue
View file @ 3732dfad
...@@ -18,22 +18,11 @@ ...@@ -18,22 +18,11 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="所属公司" prop="startCompanyId"> <el-form-item label="所属公司" prop="startCompanyId">
<!-- <el-select
class="filter-item"
v-model="listQuery.startCompanyId"
placeholder="请选择"
@change="getAllBranchCompanyChange"
>
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>-->
<el-select <el-select
v-model="listQuery.startCompanyId" v-model="listQuery.startCompanyId"
class="filter-item"
filterable filterable
placeholder="请选择" placeholder="请选择"
@change="getAllBranchCompanyChange" getAllBranchCompanyChange
> >
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option <el-option
...@@ -201,19 +190,19 @@ ...@@ -201,19 +190,19 @@
<template scope="scope"> <template scope="scope">
<el-button <el-button
size="small" size="small"
v-if="scope.row.status >=4" v-if="scope.row.status >=4 || scope.row.status == '-1'"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="handleHandoverOrderVehicle(scope.row)" @click="handleHandoverOrderVehicle(scope.row)"
>交车记录</el-button> >交车记录</el-button>
<el-button <el-button
size="small" size="small"
v-if="scope.row.status == 6" v-if="scope.row.status == 6 || scope.row.status == '-1'"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="handleReturnOrderVehicle(scope.row)" @click="handleReturnOrderVehicle(scope.row)"
>还车记录</el-button> >还车记录</el-button>
<el-button <el-button
size="small" size="small"
v-if="scope.row.status!=5&&scope.row.status > 3" v-if="scope.row.status!=5&&scope.row.status > 3 || scope.row.status == '-1'"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="handleRefundVehicle(scope.row)" @click="handleRefundVehicle(scope.row)"
>押金记录</el-button> >押金记录</el-button>
...@@ -258,94 +247,185 @@ ...@@ -258,94 +247,185 @@
v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"
></rentOrderDetailModal> ></rentOrderDetailModal>
<!-- 交车记录 --> <!-- 交车记录,还车记录,押金记录 -->
<el-dialog :title="modalTitle" :visible.sync="orderVehicleCrosstownVisible"> <el-dialog :title="modalTitle" :visible.sync="orderVehicleCrosstownVisible">
<el-form :model="form" :rules="rules" ref="form" label-width="90px"> <el-form :model="form" :rules="rules" ref="form" label-width="90px">
<div class="label-title"> <div v-if="modalTitle=='交车记录'">
<span>订单号:</span> <el-row :gutter="20">
<span class="label-text">{{form.no}}</span> <el-col :span="10">
<span>支付时间:</span> <el-form-item label="客户姓名:">
<span class="label-text">{{form.crtTime}}</span> <span>{{form.realName}}</span>
</div> </el-form-item>
<div class="label-title"> </el-col>
<span>订单状态:</span> <el-col :span="10">
<span class="label-text">{{form.ststusName}}</span> <el-form-item label="手机号:">
<span class="label-text">{{form.telephone}}</span>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="驾驶证:">
<viewer>
<img :src="form.userLicenseImg" class="voucher" />
</viewer>
</el-form-item>
<el-row :gutter="20">
<el-col :span="10">
<el-form-item label="交车操作人:">
<span class="label-text">{{orderReturnVehicleCrosstown.operatorName}} {{orderReturnVehicleCrosstown.operatorPhone}}</span>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="交车时间:">
<span class="label-text">{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime) : ''}}</span>
</el-form-item>
</el-col>
</el-row>
</div> </div>
<div class="label-title">
<span>姓名/手机号:</span> <div v-else-if="modalTitle=='还车记录'">
<span class="label-text"> <el-form-item label="实退押金:">
<span>{{form.realName}}</span>/ <span>{{orderReturnVehicleCrosstown.restDeposit}}</span>
<span>{{form.telephone}}</span> </el-form-item>
</span> <el-form-item label="消费超额:">
<span
v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
:key="index"
>{{item.excessCost}}</span>
</el-form-item>
<el-form-item label="违约类型:">
<span
v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
:key="index"
>{{item.statusName}}</span>
</el-form-item>
<el-form-item label="赔款备注:">
<span
v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
:key="index"
>{{item.deductions}}</span>
</el-form-item>
<el-form-item label="优惠券返还:">
<span
v-for="(item,index) in orderReturnVehicleCrosstown.backCoupons"
:key="index"
>{{item.title}} {{item.usedAmount}}</span>
</el-form-item>
</div> </div>
<div class="label-title">
<span>取车:</span> <div v-show="modalTitle=='还车记录' || modalTitle=='交车记录'">
<span class="label-text">{{form.orderRentVehicleDetail.startTime}}</span> <el-form-item label="公里数:">
<span class="label-text">{{form.orderRentVehicleDetail.startAddr}}</span> <p
<span class="label-text">交车公司:</span> style="line-height: 1;position: relative;top: -3px;"
<span>{{form.startCompanyName}}</span> >{{orderReturnVehicleCrosstown.mileage}}km/h</p>
<viewer>
<img :src="orderReturnVehicleCrosstown.mileageImg" class="voucher" />
</viewer>
</el-form-item>
<el-form-item label="车辆取证:">
<viewer :images="otherImg">
<img v-for="src in otherImg" :src="src" :key="src" class="voucher" />
</viewer>
</el-form-item>
<el-form-item label="备注:">
<span>{{form.remak}}</span>
</el-form-item>
</div> </div>
<div class="label-title">
<span>还车:</span> <div v-show="modalTitle=='还车记录'">
<span class="label-text">{{form.orderRentVehicleDetail.endTime}}</span> <div v-show="orderReturnVehicleCrosstown.type == 3">
<span class="label-text">{{form.orderRentVehicleDetail.endAddr}}</span> <el-form-item label="定损类型:">
<span class="label-text">交车公司:</span> <span></span>
<span>{{form.endCompanyName}}</span> </el-form-item>
<el-form-item label="定损总赔:">
<span>{{dedDetailDTOListAll}}</span>
</el-form-item>
<el-form-item label="赔偿事项:">
<div v-for="(item,index) in orderReturnVehicleCrosstown.dedDetailDTOList" :key="index">
<p
style="line-height: 1;position: relative;top: -3px;"
>事项{{index+1}} {{item.deductions}} {{item.cost}}</p>
<viewer :images="item.picList">
<img v-for="src in item.picList" :src="src" :key="src" class="voucher" />
</viewer>
</div>
</el-form-item>
<el-form-item label="定损时间:">
<span>{{dateFormat(orderReturnVehicleCrosstown.updTime)}}</span>
</el-form-item>
</div>
<el-row :gutter="20">
<el-col :span="10">
<el-form-item label="收车操作人:">
<span
class="label-text"
>{{orderReturnVehicleCrosstown.operatorName}} {{orderReturnVehicleCrosstown.operatorPhone}}</span>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="收车时间:">
<span class="label-text">{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime): ''}}</span>
</el-form-item>
</el-col>
</el-row>
</div> </div>
<div class="stepBox" v-if="depositDetail"> <div class="stepBox" v-if="depositDetail">
<div class="title" v-if="depositRefundRecord.length>0">押金退还进度</div> <div class="title" v-if="depositRefundRecord.length>0">押金退还进度</div>
<ul> <ul>
<li >
<p class="inline successInline"></p>
<p>
成功收车
<br />
<span>{{dateFormat(crtTimeIndex)}}</span>
</p>
</li>
<li <li
v-for="(item,index) in depositRefundRecord" v-for="(item,index) in depositRefundRecord"
:class="{'active':item.iscomplete}" :class="{'active':item.iscomplete}"
:key="index" :key="index"
> >
<img class="activeImg" v-if="item.iscomplete" src="../../../assets/images/active.png" alt /> <p :class="{successInline:item.iscomplete}" class="inline"></p>
<img class="activeImg" v-if="!item.iscomplete" src="../../../assets/images/doing.png" alt />
<p class="stepTitle"> <p class="stepTitle">
<template v-if="item.status==1"> <template v-if="item.status==1">
<div class="picBox"> <div class="picBox">
<div style="flex: 1">{{item.restAmount}}押金退还已申请</div> <div>{{item.restAmount}}押金退还已申请</div>
<div style="font-size: 10px;color: #999">{{item.updTimeStr}}</div> <div style="color: #999">{{item.updTimeStr}}</div>
</div> </div>
</template> </template>
<template v-if="item.status==2"> <template v-if="item.status==2">
<div class="picBox"> <div class="picBox">
<div style="flex: 1">{{item.restAmount}}元押金退还到账</div> <div v-show="item.iscomplete">退还押金{{item.restAmount}}(扣除{{item.amount}}元)</div>
<div style="font-size: 10px;color: #999">{{item.updTimeStr}}</div> <div v-show='!item.iscomplete'>退还押金15000元</div>
<div style="color: #999" v-show="item.iscomplete">{{item.updTimeStr}}</div>
<button v-if="item.iscomplete">详情</button>
</div> </div>
</template> </template>
<template v-if="item.status==3"> <template v-if="item.status==3">
<div class="picBox"> <div class="picBox">
<div style="flex: 1">{{item.restAmount}}元房车违章押金到账</div> <div v-show="item.iscomplete">退还违章保证金{{item.restAmount}}元（扣除{{item.amount}}元）</div>
<div style="font-size: 10px;color: #999">{{item.updTimeStr}}</div> <div v-show="!item.iscomplete">退还押金5000元</div>
</div> <div style="color: #999" v-show="item.iscomplete">{{item.updTimeStr}}</div>
</template> <div v-if="item.iscomplete">详情</div>
<template v-if="item.status==4">
<div class="picBox">
<div style="flex: 1">房车定损评定中</div>
<div style="font-size: 10px;color: #999">{{item.updTimeStr}}</div>
</div> </div>
</template> </template>
<template v-if="item.status==5"> <template v-if="item.status==5">
<div class="picBox"> <div class="picBox">
<div style="flex: 1">完成定损，退还剩余押金</div> <div>定损中</div>
<div style="font-size: 10px;color: #999">{{item.updTimeStr}}</div> <div style="color: #999" v-if="item.iscomplete">{{item.updTimeStr}}</div>
</div> </div>
</template> </template>
<template v-if="item.status==6"> <template v-if="item.status==6">
<div class="picBox"> <div class="picBox">
<div style="flex: 1">押金退还到账</div> <div v-show="item.iscomplete">退还押金{{item.restAmount}}(扣除{{item.amount}}元)</div>
<div style="font-size: 10px;color: #999">{{item.updTimeStr}}</div> <div v-show='!item.iscomplete'>退还押金15000元</div>
<div style="color: #999" v-show="item.iscomplete">{{item.updTimeStr}}</div>
<button v-if="item.iscomplete">详情</button>
</div> </div>
</template> </template>
</p> </p>
<p class="tip"> <!-- <p class="tip">
<template v-if="item.status==1">成功还车，退还15000租车押金</template> <template v-if="item.status==1">成功还车，退还15000租车押金</template>
<template v-if="item.status==2">{{item.updTimeStr}} 到账</template> <template v-if="item.status==2">{{item.updTimeStr}} 到账</template>
<template v-if="item.status==3">预计{{item.endTimeStr}}之前到账</template> <template v-if="item.status==3">预计{{item.endTimeStr}}之前到账</template>
...@@ -358,8 +438,8 @@ ...@@ -358,8 +438,8 @@
定损流程有疑问可联系滴房车 客服 定损流程有疑问可联系滴房车 客服
<a :href="'tel://'+Tel" style="color: #666666;">{{Tel}}</a> <a :href="'tel://'+Tel" style="color: #666666;">{{Tel}}</a>
</template> </template>
</p> </p> -->
<p <!-- <p
class="detailTitle" class="detailTitle"
v-if="item.orderViolation && item.status==3" v-if="item.orderViolation && item.status==3"
style="margin-top: 15px" style="margin-top: 15px"
...@@ -387,76 +467,10 @@ ...@@ -387,76 +467,10 @@
<div class="picBox"> <div class="picBox">
<img class="picItem" :src="it" alt v-for="(it,ix) in itm.picList" :key="ix" /> <img class="picItem" :src="it" alt v-for="(it,ix) in itm.picList" :key="ix" />
</div> </div>
</div> </div> -->
</li> </li>
</ul> </ul>
</div> </div>
<div v-if="vehicleDetail" style="border: 1px solid;">
<div style="border-bottom: 1px solid;">
<span class="label-text">交车交接人:</span>
<span class="label-text">{{orderReturnVehicleCrosstown.username}}</span>
</div>
<div>
<span class="label-text">上传驾驶证*:</span>
<span class="label-text">{{orderReturnVehicleCrosstown.licenseName}}</span>
<span class="label-text">{{orderReturnVehicleCrosstown.licensePhone}}</span>
<br />
<span style="margin-left:110px;">身份证号:</span>
<span class="label-text">{{orderReturnVehicleCrosstown.licenseIdCard}}</span>
<br />
<viewer>
<img
:src="orderReturnVehicleCrosstown.licenseImg"
style="width: 100px; height: 100px;margin-left:110px;"
/>
</viewer>
</div>
<div>
<span class="label-text">拍照取证*:</span>
<br />
<viewer :images="otherImg">
<img
v-for="src in otherImg"
:src="src"
:key="src"
style="width: 100px; height: 100px;margin-left:110px;"
/>
</viewer>
</div>
<div v-if="handover">
<span class="label-text">房车公里数*:</span>
<span class="label-text">当前公里数:</span>
<span class="label-text">{{orderReturnVehicleCrosstown.mileage}}Km</span>
<br />
<viewer>
<img
:src="orderReturnVehicleCrosstown.mileageImg"
style="width: 100px; height: 100px;margin-left:110px;"
/>
</viewer>
</div>
<div v-if="returnVehicle">
<span class="label-text">钥匙照片*:</span>
<br />
<viewer>
<img
:src="orderReturnVehicleCrosstown.vehicleKey"
style="width: 100px; height: 100px;margin-left:110px;"
/>
</viewer>
</div>
<div v-if="returnVehicle">
<span class="label-text">押金扣除项*:</span>
<span>{{orderReturnVehicleCrosstown.deduction?'有扣除项':'没有扣除项'}}</span>
<br />
</div>
<div>
<span class="label-text">备注:</span>
<span class="label-text">{{orderReturnVehicleCrosstown.remak}}</span>
</div>
<div></div>
</div>
</el-form> </el-form>
</el-dialog> </el-dialog>
...@@ -518,6 +532,7 @@ export default { ...@@ -518,6 +532,7 @@ export default {
}, },
data() { data() {
return { return {
isInline:false,
pictureList: [], pictureList: [],
dedDetail: [], dedDetail: [],
depositRefundRecord: [], depositRefundRecord: [],
...@@ -629,6 +644,7 @@ export default { ...@@ -629,6 +644,7 @@ export default {
orderStartTime: undefined, orderStartTime: undefined,
orderEndTime: undefined orderEndTime: undefined
}, },
crtTimeIndex:null,
baranchQuery: { baranchQuery: {
zoneId: null zoneId: null
}, },
...@@ -671,6 +687,7 @@ export default { ...@@ -671,6 +687,7 @@ export default {
licensePhone: undefined licensePhone: undefined
}, //还车记录 }, //还车记录
tableKey: 0, tableKey: 0,
dedDetailDTOListAll: undefined,
otherImg: [], otherImg: [],
handover: false, handover: false,
returnVehicle: false, returnVehicle: false,
...@@ -1041,6 +1058,7 @@ export default { ...@@ -1041,6 +1058,7 @@ export default {
} }
this.orderVehicleQuery.orderId = this.form.id this.orderVehicleQuery.orderId = this.form.id
this.orderVehicleQuery.type = 1 this.orderVehicleQuery.type = 1
this.orderVehicleQuery.types = null
this.getAllOrderVehicleCrosstown() this.getAllOrderVehicleCrosstown()
this.handover = true this.handover = true
this.returnVehicle = false this.returnVehicle = false
...@@ -1049,12 +1067,20 @@ export default { ...@@ -1049,12 +1067,20 @@ export default {
}, },
getAllOrderVehicleCrosstown() { getAllOrderVehicleCrosstown() {
getOrderVehicleCrosstown(this.orderVehicleQuery).then(response => { getOrderVehicleCrosstown(this.orderVehicleQuery).then(response => {
// console.log(response);
if (response.data.length <= 0) { if (response.data.length <= 0) {
alert('交还车记录不存在') alert('交还车记录不存在')
} else { } else {
this.orderVehicleCrosstownVisible = true this.orderVehicleCrosstownVisible = true
this.orderReturnVehicleCrosstown = response.data[0] this.orderReturnVehicleCrosstown = response.data[0]
var sum = 0
if (this.orderReturnVehicleCrosstown.dedDetailDTOList) {
this.orderReturnVehicleCrosstown.dedDetailDTOList.forEach(
element => {
sum += element.cost
}
)
this.dedDetailDTOListAll = sum
}
if (response.data[0].imgs) { if (response.data[0].imgs) {
this.otherImg = response.data[0].imgs.split(',') this.otherImg = response.data[0].imgs.split(',')
} }
...@@ -1105,7 +1131,8 @@ export default { ...@@ -1105,7 +1131,8 @@ export default {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
} }
this.orderVehicleQuery.orderId = this.form.id this.orderVehicleQuery.orderId = this.form.id
this.orderVehicleQuery.type = 2 this.orderVehicleQuery.types = '2,3'
this.orderVehicleQuery.type = null
this.getAllOrderVehicleCrosstown() this.getAllOrderVehicleCrosstown()
this.returnVehicle = true this.returnVehicle = true
this.handover = false this.handover = false
...@@ -1120,11 +1147,12 @@ export default { ...@@ -1120,11 +1147,12 @@ export default {
that.depositRefundRecord = [] that.depositRefundRecord = []
that.dedTotal = 0 that.dedTotal = 0
that.Tel = '' that.Tel = ''
getStep(row.no).then(response => { getStep(row.no+'&address=1').then(response => {
response.data.forEach(function(item) { response.data.forEach(function(item) {
if (item.type != 1) { if (item.type != 1) {
that.Tel = item.customerPhone that.Tel = item.customerPhone
that.type = item.type that.type = item.type
that.crtTimeIndex = item.crtTime
if (item.dedDetail) { if (item.dedDetail) {
var dedTotal = 0 var dedTotal = 0
var dedDetail = JSON.parse(item.dedDetail) var dedDetail = JSON.parse(item.dedDetail)
...@@ -1162,6 +1190,8 @@ export default { ...@@ -1162,6 +1190,8 @@ export default {
var arr = item.depositRefundRecord var arr = item.depositRefundRecord
} }
that.depositRefundRecord = arr that.depositRefundRecord = arr
// console.log(that.depositRefundRecord); // console.log(that.depositRefundRecord);
} }
...@@ -1360,13 +1390,22 @@ export default { ...@@ -1360,13 +1390,22 @@ export default {
</script> </script>
<style scpoed> <style scpoed>
.voucher {
width: 100px;
height: 100px;
border: 1px solid #d9d9d9;
margin-right: 20px;
}
.label-text { .label-text {
margin-left: 10px; margin-left: 10px;
margin-right: 20px; margin-right: 20px;
} }
.label-title { .label-title {
margin-top: 10px; margin-top: 15px;
display: inline-block;
width: 49%;
color: #333;
} }
.orderDetail tr th { .orderDetail tr th {
...@@ -1398,11 +1437,55 @@ export default { ...@@ -1398,11 +1437,55 @@ export default {
} }
.stepBox { .stepBox {
background-color: #fff; /* border:1px solid red; */
width: 100%; }
margin-top: 10px; .stepBox li {
list-style: none;
margin-bottom: 40px;
/* position: absolute; */
}
.stepBox li p {
display: inline-block;
font-size: 14px;
color: #333;
}
.stepBox li p span {
color: #999;
} }
.successInline{
background: rgb(0, 153, 255) !important;
}
.successInline::before{
background: rgb(0, 153, 255) !important;
}
.stepBox li .inline:nth-child(1) {
width: 20px;
height: 20px;
border-radius: 50%;
/* background: rgb(0, 153, 255); */
background: #999;
position: relative;
}
.stepBox li .inline:nth-child(1)::before {
content: '';
position: absolute;
left: -40px;
top: -43px;
width: 100px;
height: 1px;
/* background: rgb(0, 153, 255); */
background: #999;
transform: rotate(90deg);
}
.stepBox li:first-child .inline::before {
background: transparent !important;
}
.stepBox li p:nth-child(2) {
margin-left: 30px;
position: relative;
top: -3px;
}
.title { .title {
font-size: 17px; font-size: 17px;
color: #171413; color: #171413;
...@@ -1412,29 +1495,6 @@ export default { ...@@ -1412,29 +1495,6 @@ export default {
padding: 10px; padding: 10px;
} }
.stepBox ul {
margin-left: 10px;
padding-left: 10px;
padding-top: 20px;
}
.stepBox li {
position: relative;
padding: 0 20px 20px 20px;
list-style: none;
min-height: 40px;
border-left: 1px solid #ccc;
margin-top: -15px;
}
.stepBox li.active {
border-color: #47e270;
}
.stepBox ul li:last-child {
border: none;
}
.activeImg, .activeImg,
.doingImg { .doingImg {
position: absolute; position: absolute;
...@@ -1512,13 +1572,13 @@ export default { ...@@ -1512,13 +1572,13 @@ export default {
margin-left: 10px; margin-left: 10px;
} }
.picBox { /* .picBox {
display: flex; display: flex;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
} } */
.picItem { .picItem {
width: calc(33.3% - 10px); width: calc(33.3% - 10px);
...@@ -1534,4 +1594,7 @@ export default { ...@@ -1534,4 +1594,7 @@ export default {
font-size: 10px; font-size: 10px;
margin-right: 5px; margin-right: 5px;
} }
.el-form-item__content {
display: block !important;
}
</style> </style>
src/views/vehicle/bookRecord/index.vue
View file @ 3732dfad
...@@ -26,19 +26,18 @@ ...@@ -26,19 +26,18 @@
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择申请状态"> <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择申请状态">
<el-option :key="undefined" label="全部" :value="undefined"></el-option> <el-option :key="undefined" label="全部" :value="undefined"></el-option>
<!-- <el-option v-for="(val, key, index) in statusList " :key="val.code" :label="val.val" <!-- <el-option v-for="(val, key, index) in statusList " :key="val.code" :label="val.val"
:value="val.code"></el-option>--> :value="val.code"></el-option>-->
<el-option <el-option
v-for="(val, index) in statusList " v-for="(val, index) in statusList "
:key="index" :key="index"
:label="val.val" :label="val.val"
:value="val.code" :value="val.code"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
</el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="所属大区"> <el-form-item label="所属大区">
<el-select <el-select
...@@ -55,11 +54,11 @@ ...@@ -55,11 +54,11 @@
<el-col :span="5"> <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"
v-model="listQuery.liftCompanyName" v-model="listQuery.liftCompanyName"
:fetch-suggestions="querySearch" :fetch-suggestions="querySearch"
placeholder="请输入内容" placeholder="请输入内容"
@select="handleSelect" @select="handleSelect"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -133,12 +132,16 @@ ...@@ -133,12 +132,16 @@
</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.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span> <span>{{scope.row.bookStartDate}}</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> <br/><span>{{scope.row.actualEndDate}}</span> <span>{{scope.row.actualStartDate}}</span>
<br />
<span>{{scope.row.actualEndDate}}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="预定时间" width="220"> <!-- <el-table-column align="center" label="预定时间" width="220">
...@@ -421,17 +424,21 @@ ...@@ -421,17 +424,21 @@
</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 <viewer :images="departurePicList">
:span="3" <img v-for="src in departurePicList" :src="src" :key="src" class="voucher" />
v-for="(item, index) in departurePicList" </viewer>
:key="index"
:offset="index%6 > 0 ? 1 : 0" <!-- <el-col
style="margin-bottom:10px" :span="3"
v-for="(item, index) in departurePicList"
:key="index"
:offset="index%6 > 0 ? 1 : 0"
style="margin-bottom:10px"
> >
<el-card> <el-card>
<img :src="item" class="image" /> <img :src="item" class="image" />
</el-card> </el-card>
</el-col> </el-col> -->
</el-row> </el-row>
<hr /> <hr />
<el-row> <el-row>
...@@ -470,17 +477,20 @@ ...@@ -470,17 +477,20 @@
</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 <viewer :images="arrivalPicList">
:span="3" <img v-for="src in arrivalPicList" :src="src" :key="src" class="voucher" />
v-for="(item, index) in arrivalPicList" </viewer>
:key="index" <!-- <el-col
:offset="index%6 > 0 ? 1 : 0" :span="3"
style="margin-bottom:10px" v-for="(item, index) in arrivalPicList"
:key="index"
:offset="index%6 > 0 ? 1 : 0"
style="margin-bottom:10px"
> >
<el-card> <el-card>
<img :src="item" class="image" /> <img :src="item" class="image" />
</el-card> </el-card>
</el-col> </el-col> -->
</el-row> </el-row>
<hr /> <hr />
<el-row> <el-row>
......
src/views/vehicleType/priceList.vue
View file @ 3732dfad
...@@ -273,25 +273,26 @@ export default { ...@@ -273,25 +273,26 @@ export default {
setPrice() { setPrice() {
let params = [] let params = []
//全局设置 //全局设置
console.log(this.setForm.isGlobal);
if (this.setForm.isGlobal == 1) { if (this.setForm.isGlobal == 1) {
if (this.chooseData == '') { if (this.chooseData == '') {
this.$message.error('请选择要设置的日期') this.$message.error('请选择要设置的日期')
return false return false
} else if(this.setForm.type == 1 && this.setForm.multiple == ''){ } else if (
this.setForm.type == 1 &&
this.setForm.multiple == ''
) {
this.$message.error('请输入倍数') this.$message.error('请输入倍数')
return false return false
}else if(this.setForm.type == 2 && !this.setForm.price){ } else if (this.setForm.type == 2 && !this.setForm.price) {
this.$message.error('请输入绝对值') this.$message.error('请输入绝对值')
return false return false
}else if(this.setForm.type == 3 && this.setForm.level == ''){ } else if (this.setForm.type == 3 && this.setForm.level == '') {
this.$message.error('请选择会员等级') this.$message.error('请选择会员等级')
return false return false
}else if(this.setForm.freeDays == ''){ } else if (this.setForm.freeDays == '') {
this.$message.error('请设置天数') this.$message.error('请设置天数')
return false return false
}else{ } else {
this.chooseData.forEach(element => { this.chooseData.forEach(element => {
let defaults = {} let defaults = {}
defaults.date = element defaults.date = element
...@@ -308,12 +309,11 @@ export default { ...@@ -308,12 +309,11 @@ export default {
: Number(this.setForm.price) : Number(this.setForm.price)
defaults.freeDays = Number(this.setForm.freeDays) defaults.freeDays = Number(this.setForm.freeDays)
defaults.level = this.setForm.level defaults.level = this.setForm.level
console.log(defaults); params=[defaults]
params.push(defaults)
}) })
} }
} else { } else {
//特殊设置
this.dayListData.forEach(element => { this.dayListData.forEach(element => {
if (this.setForm.type == 1) { if (this.setForm.type == 1) {
if (!!element.multiple || !!element.freeDays) { if (!!element.multiple || !!element.freeDays) {
...@@ -326,10 +326,11 @@ export default { ...@@ -326,10 +326,11 @@ export default {
vehicleModelId: element.vehicleModelId, vehicleModelId: element.vehicleModelId,
type: this.setForm.type type: this.setForm.type
}) })
} else {
this.$message.error('请设置不同车型不同价格')
return false
} }
// else {
// this.$message.error('请设置不同车型不同价格1')
// return false
// }
} else if (this.setForm.type == 2) { } else if (this.setForm.type == 2) {
if (!!element.price || !!element.freeDays) { if (!!element.price || !!element.freeDays) {
params.push({ params.push({
...@@ -341,10 +342,11 @@ export default { ...@@ -341,10 +342,11 @@ export default {
vehicleModelId: element.vehicleModelId, vehicleModelId: element.vehicleModelId,
type: this.setForm.type type: this.setForm.type
}) })
} else {
this.$message.error('请设置不同车型不同价格')
return false
} }
// else {
// this.$message.error('请设置不同车型不同价格2')
// return false
// }
} else { } else {
if (!!element.level || !!element.freeDays) { if (!!element.level || !!element.freeDays) {
params.push({ params.push({
...@@ -356,15 +358,17 @@ export default { ...@@ -356,15 +358,17 @@ export default {
vehicleModelId: element.vehicleModelId, vehicleModelId: element.vehicleModelId,
type: this.setForm.type type: this.setForm.type
}) })
} else {
this.$message.error('请设置不同车型不同价格')
return false
} }
// else {
// this.$message.error('请设置不同车型不同价格3')
// return false
// }
} }
}) })
} }
if (params == '') { if (params == '') {
this.$message.error('请设置不同车型不同价格') this.$message.error('请设置不同车型不同价格4')
return false return false
} else { } else {
add_edit(params).then(data => { add_edit(params).then(data => {
...@@ -391,10 +395,10 @@ export default { ...@@ -391,10 +395,10 @@ export default {
if (this.calendarStatus == 1 && this.setForm.isGlobal == 0) { if (this.calendarStatus == 1 && this.setForm.isGlobal == 0) {
dayList(val).then(data => { dayList(val).then(data => {
data.data.forEach(element => { data.data.forEach(element => {
element.multiple = '' element.multiple = element.multiple || ''
element.price = '' element.price = element.price || ''
element.level = '' element.level = element.level||''
element.freeDays = '' element.freeDays = element.freeDays||''
}) })
this.dayListData = data.data this.dayListData = data.data
this.setMultiplePop = true this.setMultiplePop = true
......
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