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
Expand all Show whitespace changes
Inline Side-by-side
Showing with 673 additions and 504 deletions
config/dev.env.js
View file @ 3732dfad
module.exports = {
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"'
}
src/views/order/modal/rentOrderDetailModal.vue
View file @ 3732dfad
<template>
<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-col :span="8">
<el-form-item label="订单号:">
......@@ -8,14 +8,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单创建时间:">
<span></span>
<el-form-item label="创建订单时间:">
<span>{{form.crtTime}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际支付时间:">
<span>{{form.crtTime}}</span>
<span>{{!!form.payTime ? timestamp(new Date(form.payTime)) : '无'}}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -32,7 +32,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="会员等级/身份:">
<span></span>
<span>{{form.memberName}}/{{form. jobTitle}}</span>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
......@@ -48,7 +48,7 @@
@click="resetCar"
>重新配车</el-button>
</el-form-item>
</el-col> -->
</el-col>-->
</el-row>
<!-- <el-row>
<el-col :span="8">
......@@ -66,7 +66,7 @@
<span>{{form.startCompanyName}}</span>
</el-form-item>
</el-col>
</el-row> -->
</el-row>-->
<!-- <el-row>
<el-col :span="8">
<el-form-item label="还车:">
......@@ -90,31 +90,83 @@
>更换</el-button>
</el-form-item>
</el-col>
</el-row> -->
</el-row>-->
<table class="orderDetail">
<tr>
<th>房车</th>
<th>取/还时间</th>
<th>交车公司</th>
<th>还车公司</th>
<th>费用明细</th>
<th>免费天数</th>
<th>车辆租赁费</th>
<th>优惠券</th>
<th>不计免赔</th>
<th>租房车押金</th>
<th>专职司机服务费</th>
</tr>
<tr>
<!-- {{rentCostDetail}} -->
<td>{{form.name}}</td>
<td>
<p>取:{{form.orderRentVehicleDetail.startTime}}</p>
<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
<p>租借天数:{{form.orderRentVehicleDetail.dayNum}}</p>
</td>
<td>{{form.startCompanyName}}</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>
<p>车辆租赁费:</p>
<p>免费天数:</p>
<p>不计免赔:</p>
<p>租房车押金:</p>
<p>优惠券:</p>
<p v-if="form.rentVehiclePriceVO">
¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天
</p>
<p v-else>
{{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>
</tr>
<tr>
......@@ -128,36 +180,47 @@
v-show="form.status == 4 || form.status == 5"
size="mini"
type="text"
style="padding: 7px 9px;"
@click="resetReturn = true"
>更换</el-button>
</td>
<td>共计:￥{{form.realAmount}}</td>
<td colspan="6">{{form.payWay == 1 ? '微信公众号支付' : form.payWay == 2 ? '支付宝即时支付' : form.payWay == 3 ? '银联支付' : ''}} 共计:￥{{form.realAmount}}</td>
</tr>
</table>
<p>额外随车物品:11111</p>
<p>内部邀请人:11111</p>
<p>驾驶证:11111</p>
<div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;">
<p>
<b>额外随车物品:</b>
<span
v-for="(item,index) in JSON.parse(this.form.carArticlesJson)"
:key="index"
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>
</div>
<table class="orderDetail" v-if="form.orderVehicleCrosstownDto">
</div>-->
<!-- <table class="orderDetail" v-if="form.orderVehicleCrosstownDto">
<tr>
<th>姓名</th>
<th>手机号</th>
<th>身份证号</th>
<!-- <th>驾照</th>-->
</tr>
<tr>
<td>{{form.orderVehicleCrosstownDto.licenseName}}</td>
<td>{{form.orderVehicleCrosstownDto.licensePhone}}</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>
</table>
</table>-->
</el-form>
<div class="modal_modal" v-show="resetCarVisible"></div>
<!-- 重新配车 -->
......@@ -215,6 +278,7 @@ export default {
updateNumberPlat: false, //是否重新配车
dialogVisible: false,
resetCarVisible: false,
goods: [],
resetCarForm: {
no: '',
numberPlate: '' //重新配车车牌号
......@@ -248,7 +312,7 @@ export default {
}
},
mounted() {
console.log(this.form)
this.dialogVisible = true
if (this.form.status == 2) {
this.form.ststusName = '取消'
......@@ -268,6 +332,40 @@ export default {
this.getAllFn()
},
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() {
let _this = this
getAll().then(data => {
......
src/views/order/rentVehicleInfo/illegalModal.vue
View file @ 3732dfad
<template>
<el-dialog title="违章查询" :visible.sync="isVisible">
<el-form>
<el-row>
<!-- <el-row>
<el-col :span="24">
<el-form-item label="订单号">
<span>{{row.no}}</span>
......@@ -23,7 +23,8 @@
<el-row>
<el-col :span="24">
<el-form-item label="用户ID/实名">
<span>{{row.userId}}</span>/<span>{{row.username}}</span>
<span>{{row.userId}}</span>/
<span>{{row.username}}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -48,11 +49,13 @@
</el-col>
<el-col :span="16">
<el-form-item label="收车公司">
<span><span>{{row.endCompanyName}}</span>
<span>({{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}})</span></span>
<span>
<span>{{row.endCompanyName}}</span>
<span>({{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}})</span>
</span>
</el-form-item>
</el-col>
</el-row>
</el-row>-->
<el-row>
<el-col>
<el-form-item label="违章截图" :style="{display:'block'}">
......@@ -74,7 +77,8 @@
:on-remove="handleRemove"
:file-list="fileList2"
:on-success="handleSuccess"
list-type="picture-card">
list-type="picture-card"
>
<!--<div slot="tip" class="el-upload__tip">最多上传5张</div>-->
<i class="el-icon-plus"></i>
</el-upload>
......@@ -82,8 +86,9 @@
</el-col>
</el-row>
<el-row>
<el-form-item label="违章罚款" style="display: inline-block;">
<el-input v-model="price" type="number" placeholder="请输入违章罚款金额"></el-input>
<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>
......@@ -95,27 +100,18 @@
</el-dialog>
</template>
<script>
import {
page,
saveOrderViolation
} from 'api/order/rentVehicle';
import {mapGetters} from 'vuex';
import {
formatDate
} from '../../../utils/dateFormattor';
import {
getToken
} from '../../../utils/auth';
import {
getOneIllegalRow
} from 'api/order/rentVehicle';
import ElRow from "element-ui/packages/row/src/row";
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
import ElCol from "element-ui/packages/col/src/col";
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
import ElForm from "../../../../node_modules/element-ui/packages/form/src/form.vue";
export default {
props: ["row"],
import { page, saveOrderViolation } from 'api/order/rentVehicle'
import { mapGetters } from 'vuex'
import { formatDate } from '../../../utils/dateFormattor'
import { getToken } from '../../../utils/auth'
import { getOneIllegalRow } from 'api/order/rentVehicle'
import ElRow from 'element-ui/packages/row/src/row'
import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
import ElCol from 'element-ui/packages/col/src/col'
import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
import ElForm from '../../../../node_modules/element-ui/packages/form/src/form.vue'
export default {
props: ['row'],
name: 'illegalDialog',
components: {
ElForm,
......@@ -127,64 +123,62 @@
data() {
return {
BASE_API: process.env.BASE_API,
price: undefined,//违章罚款金额
price: undefined, //违章罚款金额
isVisible: false,
fileList2:[],//违章截图
fileList2: [] //违章截图
}
},
created() {
},
created() {},
watch: {
isVisible(newValue, oldValue){
if(!newValue){
this.$emit('illegalEvent', false);
isVisible(newValue, oldValue) {
if (!newValue) {
this.$emit('illegalEvent', false)
}
}
},
},
mounted() {
let that = this;
// if(that.row.refundStatus == 3) {
let that = this
// if(that.row.refundStatus == 3) {
//refundStatus退款状态 0、未退款 1、已退还所有（取消订单时）2、 已退还部分（保留违章预备金）3、已退还所有押金（扣除该扣除的）
that.getOne(that.row.detailId);
// }
this.isVisible = true;
that.getOne(that.row.detailId)
// }
this.isVisible = true
},
computed: {
...mapGetters([
'elements',
]),
...mapGetters(['elements']),
getHeaderWithToken() {
return {Authorization: getToken()};
return { Authorization: getToken() }
}
},
methods: {
/**
* 根据id查询一条记录
* */
getOne(id){
let t = this;
getOne(id) {
let t = this
getOneIllegalRow(id).then(response => {
if(response.status == 200){
let arr = response.data.picture.split(",");
let fileList2 = [];
let p = {};
arr.map(function(item){
if (response.status == 200) {
if (response.data) {
let arr = response.data.picture.split(',')
let fileList2 = []
let p = {}
arr.map(function(item) {
p = {
url: item
};
fileList2.push(p);
});
t.price = parseFloat(response.data.price);
t.fileList2 = fileList2;
t.id = response.data.id?response.data.id: undefined;
}
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: '失败',
message: response.menu,
type: 'error',
duration: 2000
});
})
}
})
},
......@@ -192,30 +186,30 @@
* 上传成功
* */
handleSuccess(res, file) {
let c = {url: res.data};
this.fileList2.push(c);
this.showLoadingBody = false;
let c = { url: res.data }
this.fileList2.push(c)
this.showLoadingBody = false
},
/**
* 删除违章图片
* */
handleRemove(file, fileList){
this.fileList2 = fileList;
handleRemove(file, fileList) {
this.fileList2 = fileList
},
/**
* 确定
* */
okHandler() {
let arr = [];
this.fileList2.map(function(item){
arr.push(item.url);
});
let arr = []
this.fileList2.map(function(item) {
arr.push(item.url)
})
let params = {
picture:arr.join(","),
price:this.price,
picture: arr.join(','),
price: this.price,
detailId: this.row.detailId,
id: this.id
};
}
saveOrderViolation(params).then(response => {
if (response.status === 200) {
this.$notify({
......@@ -223,23 +217,23 @@
message: '创建成功',
type: 'success',
duration: 2000
});
this.$emit('illegalEvent', false);
})
this.$emit('illegalEvent', false)
} else {
this.$notify({
title: '创建失败',
message: '操作失败！',
type: 'error',
duration: 2000
});
})
}
});
})
},
/**
* 弹框-取消
* */
cancel() {
this.$emit('illegalEvent', false);
this.$emit('illegalEvent', false)
},
/**
* 格式化时间
......@@ -247,14 +241,14 @@
* @returns {*}
*/
dateFormat(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
},
let date = new Date(timestamp) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
}
}
}
</script>
<style>
.el-form-item__content{
.el-form-item__content {
display: inline-block;
}
}
</style>
src/views/order/rentVehicleInfo/index.vue
View file @ 3732dfad
This diff is collapsed.
src/views/vehicle/bookRecord/index.vue
View file @ 3732dfad
......@@ -38,7 +38,6 @@
</el-col>
</el-row>
<el-row>
</el-col>
<el-col :span="5">
<el-form-item label="所属大区">
<el-select
......@@ -133,12 +132,16 @@
</el-table-column>
<el-table-column align="center" label="预定取/还时间" width="200">
<template scope="scope">
<span>{{scope.row.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span>
<span>{{scope.row.bookStartDate}}</span>
<br />
<span>{{scope.row.bookEndDate}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="实际取/还时间" width="200">
<template scope="scope">
<span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
<span>{{scope.row.actualStartDate}}</span>
<br />
<span>{{scope.row.actualEndDate}}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="预定时间" width="220">
......@@ -421,7 +424,11 @@
</el-col>
</el-row>
<el-row style="margin-left: 20px;" v-if="departurePicList.length>0">
<el-col
<viewer :images="departurePicList">
<img v-for="src in departurePicList" :src="src" :key="src" class="voucher" />
</viewer>
<!-- <el-col
:span="3"
v-for="(item, index) in departurePicList"
:key="index"
......@@ -431,7 +438,7 @@
<el-card>
<img :src="item" class="image" />
</el-card>
</el-col>
</el-col> -->
</el-row>
<hr />
<el-row>
......@@ -470,7 +477,10 @@
</el-col>
</el-row>
<el-row style="margin-left: 20px;" v-if="arrivalPicList.length>0">
<el-col
<viewer :images="arrivalPicList">
<img v-for="src in arrivalPicList" :src="src" :key="src" class="voucher" />
</viewer>
<!-- <el-col
:span="3"
v-for="(item, index) in arrivalPicList"
:key="index"
......@@ -480,7 +490,7 @@
<el-card>
<img :src="item" class="image" />
</el-card>
</el-col>
</el-col> -->
</el-row>
<hr />
<el-row>
......
src/views/vehicleType/priceList.vue
View file @ 3732dfad
......@@ -273,25 +273,26 @@ export default {
setPrice() {
let params = []
//全局设置
console.log(this.setForm.isGlobal);
if (this.setForm.isGlobal == 1) {
if (this.chooseData == '') {
this.$message.error('请选择要设置的日期')
return false
} else if(this.setForm.type == 1 && this.setForm.multiple == ''){
} else if (
this.setForm.type == 1 &&
this.setForm.multiple == ''
) {
this.$message.error('请输入倍数')
return false
}else if(this.setForm.type == 2 && !this.setForm.price){
} else if (this.setForm.type == 2 && !this.setForm.price) {
this.$message.error('请输入绝对值')
return false
}else if(this.setForm.type == 3 && this.setForm.level == ''){
} else if (this.setForm.type == 3 && this.setForm.level == '') {
this.$message.error('请选择会员等级')
return false
}else if(this.setForm.freeDays == ''){
} else if (this.setForm.freeDays == '') {
this.$message.error('请设置天数')
return false
}else{
} else {
this.chooseData.forEach(element => {
let defaults = {}
defaults.date = element
......@@ -308,12 +309,11 @@ export default {
: Number(this.setForm.price)
defaults.freeDays = Number(this.setForm.freeDays)
defaults.level = this.setForm.level
console.log(defaults);
params.push(defaults)
params=[defaults]
})
}
} else {
//特殊设置
this.dayListData.forEach(element => {
if (this.setForm.type == 1) {
if (!!element.multiple || !!element.freeDays) {
......@@ -326,10 +326,11 @@ export default {
vehicleModelId: element.vehicleModelId,
type: this.setForm.type
})
} else {
this.$message.error('请设置不同车型不同价格')
return false
}
// else {
// this.$message.error('请设置不同车型不同价格1')
// return false
// }
} else if (this.setForm.type == 2) {
if (!!element.price || !!element.freeDays) {
params.push({
......@@ -341,10 +342,11 @@ export default {
vehicleModelId: element.vehicleModelId,
type: this.setForm.type
})
} else {
this.$message.error('请设置不同车型不同价格')
return false
}
// else {
// this.$message.error('请设置不同车型不同价格2')
// return false
// }
} else {
if (!!element.level || !!element.freeDays) {
params.push({
......@@ -356,15 +358,17 @@ export default {
vehicleModelId: element.vehicleModelId,
type: this.setForm.type
})
} else {
this.$message.error('请设置不同车型不同价格')
return false
}
// else {
// this.$message.error('请设置不同车型不同价格3')
// return false
// }
}
})
}
if (params == '') {
this.$message.error('请设置不同车型不同价格')
this.$message.error('请设置不同车型不同价格4')
return false
} else {
add_edit(params).then(data => {
......@@ -391,10 +395,10 @@ export default {
if (this.calendarStatus == 1 && this.setForm.isGlobal == 0) {
dayList(val).then(data => {
data.data.forEach(element => {
element.multiple = ''
element.price = ''
element.level = ''
element.freeDays = ''
element.multiple = element.multiple || ''
element.price = element.price || ''
element.level = element.level||''
element.freeDays = element.freeDays||''
})
this.dayListData = data.data
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