Skip to content

C
cloud-platform-ui
Commit a1065ca3 authored by guoyou's avatar guoyou
Browse files
Options

会员订单管理

parents 367f3618 2685bdd4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1041 additions and 455 deletions
config/dev.env.js
View file @ a1065ca3
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://dev.dfangche.com"',//'"https://xxtest.upyuns.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 @ a1065ca3
<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,32 +90,50 @@ ...@@ -90,32 +90,50 @@
>更换</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>
</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></td>
<td></td>
<td> <td>
<p>车辆租赁费:</p> <p v-if="form.couponList">
<p>免费天数:</p> 优惠券:
<p>不计免赔:</p> <span
<p>租房车押金:</p> v-for="(item,index) in form.couponList"
<p>优惠券:</p> :key="index"
>{{item.title}}-{{item.usedAmount}}元</span>
</p>
<p v-else>优惠券:无</p>
</td> </td>
<td></td>
<td>
<!-- {{form.orderRentVehicleDetail.costDetail.children}} -->
<!-- <div v-show="form.orderRentVehicleDetail.costDetail">
<p
v-for="(item,index) in JSON.parse(form.orderRentVehicleDetail.costDetail).children"
:key="index"
>{{item.key}}:{{item.detail || '无'}}</p>
</div> -->
</td>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -128,36 +146,47 @@ ...@@ -128,36 +146,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="5">{{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 +244,7 @@ export default { ...@@ -215,6 +244,7 @@ export default {
updateNumberPlat: false, //是否重新配车 updateNumberPlat: false, //是否重新配车
dialogVisible: false, dialogVisible: false,
resetCarVisible: false, resetCarVisible: false,
goods: [],
resetCarForm: { resetCarForm: {
no: '', no: '',
numberPlate: '' //重新配车车牌号 numberPlate: '' //重新配车车牌号
...@@ -248,7 +278,7 @@ export default { ...@@ -248,7 +278,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 +298,32 @@ export default { ...@@ -268,6 +298,32 @@ export default {
this.getAllFn() this.getAllFn()
}, },
methods: { methods: {
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 @ a1065ca3
<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>
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
<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>/
<span>{{row.username}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -48,11 +49,13 @@ ...@@ -48,11 +49,13 @@
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="收车公司"> <el-form-item label="收车公司">
<span><span>{{row.endCompanyName}}</span> <span>
<span>({{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}})</span></span> <span>{{row.endCompanyName}}</span>
<span>({{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}})</span>
</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="违章截图" :style="{display:'block'}"> <el-form-item label="违章截图" :style="{display:'block'}">
...@@ -74,7 +77,8 @@ ...@@ -74,7 +77,8 @@
:on-remove="handleRemove" :on-remove="handleRemove"
:file-list="fileList2" :file-list="fileList2"
:on-success="handleSuccess" :on-success="handleSuccess"
list-type="picture-card"> list-type="picture-card"
>
<!--<div slot="tip" class="el-upload__tip">最多上传5张</div>--> <!--<div slot="tip" class="el-upload__tip">最多上传5张</div>-->
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
...@@ -82,8 +86,8 @@ ...@@ -82,8 +86,8 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="违章罚款" style="display: inline-block;"> <el-form-item label="违章罚款" style="display: inline-block;width:100%">
<el-input v-model="price" type="number" placeholder="请输入违章罚款金额"></el-input> <el-input style="width:300px" v-model="price" type="number" placeholder="请输入违章罚款金额"></el-input><span style="margin-left:10px">元</span>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
...@@ -95,27 +99,18 @@ ...@@ -95,27 +99,18 @@
</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
} 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', name: 'illegalDialog',
components: { components: {
ElForm, ElForm,
...@@ -127,64 +122,60 @@ ...@@ -127,64 +122,60 @@
data() { data() {
return { return {
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
price: undefined,//违章罚款金额 price: undefined, //违章罚款金额
isVisible: false, isVisible: false,
fileList2:[],//违章截图 fileList2: [] //违章截图
} }
}, },
created() { created() {},
},
watch: { watch: {
isVisible(newValue, oldValue){ isVisible(newValue, oldValue) {
if(!newValue){ if (!newValue) {
this.$emit('illegalEvent', false); this.$emit('illegalEvent', false)
}
} }
},
}, },
mounted() { mounted() {
let that = this; let that = this
// if(that.row.refundStatus == 3) { // if(that.row.refundStatus == 3) {
//refundStatus退款状态 0、未退款 1、已退还所有（取消订单时）2、 已退还部分（保留违章预备金）3、已退还所有押金（扣除该扣除的） //refundStatus退款状态 0、未退款 1、已退还所有（取消订单时）2、 已退还部分（保留违章预备金）3、已退还所有押金（扣除该扣除的）
that.getOne(that.row.detailId); that.getOne(that.row.detailId)
// } // }
this.isVisible = true; this.isVisible = true
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(['elements']),
'elements',
]),
getHeaderWithToken() { getHeaderWithToken() {
return {Authorization: getToken()}; return { Authorization: getToken() }
} }
}, },
methods: { methods: {
/** /**
* 根据id查询一条记录 * 根据id查询一条记录
* */ * */
getOne(id){ getOne(id) {
let t = this; let t = this
getOneIllegalRow(id).then(response => { getOneIllegalRow(id).then(response => {
if(response.status == 200){ if (response.status == 200) {
let arr = response.data.picture.split(","); let arr = response.data.picture.split(',')
let fileList2 = []; let fileList2 = []
let p = {}; let p = {}
arr.map(function(item){ arr.map(function(item) {
p = { p = {
url: item url: item
}; }
fileList2.push(p); fileList2.push(p)
}); })
t.price = parseFloat(response.data.price); t.price = parseFloat(response.data.price)
t.fileList2 = fileList2; t.fileList2 = fileList2
t.id = response.data.id?response.data.id: undefined; t.id = response.data.id ? response.data.id : undefined
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
message: response.menu, message: response.menu,
type: 'error', type: 'error',
duration: 2000 duration: 2000
}); })
} }
}) })
}, },
...@@ -192,30 +183,30 @@ ...@@ -192,30 +183,30 @@
* 上传成功 * 上传成功
* */ * */
handleSuccess(res, file) { handleSuccess(res, file) {
let c = {url: res.data}; let c = { url: res.data }
this.fileList2.push(c); this.fileList2.push(c)
this.showLoadingBody = false; this.showLoadingBody = false
}, },
/** /**
* 删除违章图片 * 删除违章图片
* */ * */
handleRemove(file, fileList){ handleRemove(file, fileList) {
this.fileList2 = fileList; this.fileList2 = fileList
}, },
/** /**
* 确定 * 确定
* */ * */
okHandler() { okHandler() {
let arr = []; let arr = []
this.fileList2.map(function(item){ this.fileList2.map(function(item) {
arr.push(item.url); arr.push(item.url)
}); })
let params = { let params = {
picture:arr.join(","), picture: arr.join(','),
price:this.price, price: this.price,
detailId: this.row.detailId, detailId: this.row.detailId,
id: this.id id: this.id
}; }
saveOrderViolation(params).then(response => { saveOrderViolation(params).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.$notify({ this.$notify({
...@@ -223,23 +214,23 @@ ...@@ -223,23 +214,23 @@
message: '创建成功', message: '创建成功',
type: 'success', type: 'success',
duration: 2000 duration: 2000
}); })
this.$emit('illegalEvent', false); this.$emit('illegalEvent', false)
} else { } else {
this.$notify({ this.$notify({
title: '创建失败', title: '创建失败',
message: '操作失败！', message: '操作失败！',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}); })
} }
}); })
}, },
/** /**
* 弹框-取消 * 弹框-取消
* */ * */
cancel() { cancel() {
this.$emit('illegalEvent', false); this.$emit('illegalEvent', false)
}, },
/** /**
* 格式化时间 * 格式化时间
...@@ -247,14 +238,14 @@ ...@@ -247,14 +238,14 @@
* @returns {*} * @returns {*}
*/ */
dateFormat(timestamp) { dateFormat(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 let date = new Date(timestamp) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss'); 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 @ a1065ca3
This diff is collapsed.
src/views/vehicle/bookRecord/index.vue
View file @ a1065ca3
This diff is collapsed.
src/views/vehicleType/priceList.vue
View file @ a1065ca3
...@@ -308,8 +308,6 @@ export default { ...@@ -308,8 +308,6 @@ 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.push(defaults) params.push(defaults)
}) })
} }
......
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