Skip to content

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

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

parents 39f0089b 9937b50c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3311 additions and 3021 deletions
config/dev.env.js
View file @ 70f6ce63
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"'
} }
config/sit.env.js
View file @ 70f6ce63
module.exports = { module.exports = {
NODE_ENV: '"sit"', NODE_ENV: '"sit"',
BASE_API: '"https://dev.dfangche.com"', BASE_API: '"https://xxtest.upyuns.com"',
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
}; };
package-lock.json
View file @ 70f6ce63
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
}, },
"async-validator": { "async-validator": {
"version": "1.6.9", "version": "1.6.9",
"resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.6.9.tgz", "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.6.9.tgz",
"integrity": "sha1-qDCdqouDQhzb1GKOAm1quyUZLTQ=" "integrity": "sha1-qDCdqouDQhzb1GKOAm1quyUZLTQ="
}, },
"asynckit": { "asynckit": {
...@@ -575,9 +575,9 @@ ...@@ -575,9 +575,9 @@
} }
}, },
"babel-helper-vue-jsx-merge-props": { "babel-helper-vue-jsx-merge-props": {
"version": "2.0.2", "version": "2.0.3",
"resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.2.tgz", "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
"integrity": "sha1-rOscNzWIJ54nVeoc/TXCI5T9M/g=" "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
}, },
"babel-helpers": { "babel-helpers": {
"version": "6.24.1", "version": "6.24.1",
...@@ -2646,7 +2646,7 @@ ...@@ -2646,7 +2646,7 @@
"deepmerge": { "deepmerge": {
"version": "1.5.2", "version": "1.5.2",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
"integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=" "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
}, },
"define-property": { "define-property": {
"version": "2.0.2", "version": "2.0.2",
...@@ -2938,7 +2938,7 @@ ...@@ -2938,7 +2938,7 @@
"element-ui": { "element-ui": {
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/element-ui/-/element-ui-1.4.1.tgz", "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-1.4.1.tgz",
"integrity": "sha1-9EccrbQ9x3nDCY3HNjSuqU0D8lU=", "integrity": "sha512-4jZu41iMuV8Semz0MG7nd8HIicyXlMJY923NvuIXoM3Q3llnwpwBVBqaPAgL3VrRnwzLKxyR/GjxxQDBqf/bvQ==",
"requires": { "requires": {
"async-validator": "1.6.9", "async-validator": "1.6.9",
"babel-helper-vue-jsx-merge-props": "^2.0.0", "babel-helper-vue-jsx-merge-props": "^2.0.0",
...@@ -10806,9 +10806,9 @@ ...@@ -10806,9 +10806,9 @@
"dev": true "dev": true
}, },
"throttle-debounce": { "throttle-debounce": {
"version": "1.0.1", "version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.0.1.tgz", "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
"integrity": "sha1-2tD+Ew+drzcZ/eoz3Dao5rp/MLU=" "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
}, },
"through": { "through": {
"version": "2.3.8", "version": "2.3.8",
......
package.json
View file @ 70f6ce63
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"codemirror": "5.26.0", "codemirror": "5.26.0",
"dropzone": "5.1.0", "dropzone": "5.1.0",
"echarts": "3.6.2", "echarts": "3.6.2",
"element-ui": "1.4.1", "element-ui": "^1.4.1",
"file-saver": "1.3.3", "file-saver": "1.3.3",
"jquery": "^3.4.0", "jquery": "^3.4.0",
"js-cookie": "2.1.4", "js-cookie": "2.1.4",
......
src/api/vehicleType.js
View file @ 70f6ce63
...@@ -132,6 +132,17 @@ export function updateVehicleModel(params) { ...@@ -132,6 +132,17 @@ export function updateVehicleModel(params) {
}); });
} }
/**
* App是否展示
* @param {Object} params
*/
export function updateAppShow(params) {
return fetch({
url: '/vehicle/vehicleModel/bg/updateAppShow',
method: 'post',
data: params
});
}
/* /*
* 新建一条车型数据 * 新建一条车型数据
* */ * */
......
src/views/campsiteManage/index.vue
View file @ 70f6ce63
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.crtTimeStr}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="150" label="操作" fixed="right"> <el-table-column align="center" width="150" label="操作">
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{campsiteshop_btn_update?"编辑":"查看"}} <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{campsiteshop_btn_update?"编辑":"查看"}}
</el-button> </el-button>
......
src/views/order/modal/rentOrderDetailModal.vue
View file @ 70f6ce63
<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="90px"> <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,28 +8,34 @@ ...@@ -8,28 +8,34 @@
</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.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.ststusName}}</span> <span>{{!!form.payTime ? timestamp(new Date(form.payTime)) : '无'}}</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="订单状态:">
<span>{{form.realName}}</span> <span>{{form.ststusName}}</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.telephone}}</span> <span>{{form.realName}}/{{form.telephone}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="会员等级/身份:">
<span>{{form.memberName}}/{{form. jobTitle}}</span>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="配车:"> <el-form-item label="配车:">
<span <span
style="margin-right: 10px;" style="margin-right: 10px;"
...@@ -42,9 +48,9 @@ ...@@ -42,9 +48,9 @@
@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">
<el-form-item label="取车:"> <el-form-item label="取车:">
<span>{{form.orderRentVehicleDetail.startTime}}</span> <span>{{form.orderRentVehicleDetail.startTime}}</span>
...@@ -60,8 +66,8 @@ ...@@ -60,8 +66,8 @@
<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="还车:">
<span>{{form.orderRentVehicleDetail.endTime}}</span> <span>{{form.orderRentVehicleDetail.endTime}}</span>
...@@ -75,45 +81,112 @@ ...@@ -75,45 +81,112 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="还车公司:"> <el-form-item label="还车公司:">
<span>{{form.endCompanyName}}</span> <span>{{form.endCompanyName}}</span>
<el-button v-show="form.status == 4 || form.status == 5" size="mini" type="primary" style="padding: 7px 9px;" @click="resetReturn = true">更换</el-button> <el-button
v-show="form.status == 4 || form.status == 5"
size="mini"
type="primary"
style="padding: 7px 9px;"
@click="resetReturn = true"
>更换</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>
</tr> </tr>
<tr> <tr>
<td>{{form.name}}{{rentCostDetail}}</td> <td>{{form.name}}</td>
<td>{{form.orderRentVehicleDetail.dayNum}}天</td> <td>
<td>{{rentCostDetail}}</td> <p>取:{{form.orderRentVehicleDetail.startTime}}</p>
<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
</td>
<td>{{form.startCompanyName}}</td>
<td>{{form.endCompanyName}}</td>
<td></td>
<td></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>
<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>
<el-button size="small" type="text" v-if="form.status==4" @click="resetCar">重新配车</el-button>
</td>
<td></td> <td></td>
<td></td> <td></td>
<td>共计:￥{{form.realAmount}}</td> <td>
<el-button
v-show="form.status == 4 || form.status == 5"
size="mini"
type="text"
@click="resetReturn = true"
>更换</el-button>
</td>
<td colspan="5">{{form.payWay == 1 ? '微信公众号支付' : form.payWay == 2 ? '支付宝即时支付' : form.payWay == 3 ? '银联支付' : ''}} 共计:￥{{form.realAmount}}</td>
</tr> </tr>
</table> </table>
<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> <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>
<!-- 重新配车 --> <!-- 重新配车 -->
...@@ -171,6 +244,7 @@ export default { ...@@ -171,6 +244,7 @@ export default {
updateNumberPlat: false, //是否重新配车 updateNumberPlat: false, //是否重新配车
dialogVisible: false, dialogVisible: false,
resetCarVisible: false, resetCarVisible: false,
goods: [],
resetCarForm: { resetCarForm: {
no: '', no: '',
numberPlate: '' //重新配车车牌号 numberPlate: '' //重新配车车牌号
...@@ -204,7 +278,7 @@ export default { ...@@ -204,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 = '取消'
...@@ -224,6 +298,32 @@ export default { ...@@ -224,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 => {
...@@ -252,10 +352,9 @@ export default { ...@@ -252,10 +352,9 @@ export default {
type: 'success', type: 'success',
duration: 3000 duration: 3000
}) })
this.resetReturn = false; this.resetReturn = false
this.dialogVisible = false; this.dialogVisible = false
this.$emit('rentOrderDetailDialogEvent', true) this.$emit('rentOrderDetailDialogEvent', true)
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
......
src/views/order/rentVehicleInfo/illegalModal.vue
View file @ 70f6ce63
<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 @ 70f6ce63
This diff is collapsed.
src/views/summit/model/reviewPopup.vue
View file @ 70f6ce63
...@@ -91,15 +91,15 @@ ...@@ -91,15 +91,15 @@
</template> </template>
<script> <script>
import ElRow from 'element-ui/packages/row/src/row' import ElRow from 'element-ui/packages/row/src/row'
import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue' import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
import ElCol from 'element-ui/packages/col/src/col' import ElCol from 'element-ui/packages/col/src/col'
import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue' import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
import { getToken } from 'src/utils/auth' import { getToken } from 'src/utils/auth'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { one, save } from 'src/api/summit/activityShow' import { one, save } from 'src/api/summit/activityShow'
export default { export default {
props: ['reviewRow'], props: ['reviewRow'],
name: 'reviewPopup', name: 'reviewPopup',
components: { components: {
...@@ -301,69 +301,69 @@ ...@@ -301,69 +301,69 @@
} }
} }
} }
} }
</script> </script>
<style> <style>
.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: 10px;
} }
.orderDetail tr th { .orderDetail tr th {
background: #eef1f6; background: #eef1f6;
} }
.orderDetail tr td, .orderDetail tr td,
.orderDetail tr th { .orderDetail tr th {
width: 500px; width: 500px;
text-align: center; text-align: center;
border: 1px solid #dfe6ec; border: 1px solid #dfe6ec;
margin-left: 100px; margin-left: 100px;
margin-right: 100px; margin-right: 100px;
padding: 10px; padding: 10px;
} }
.label-value { .label-value {
margin-left: 80px; margin-left: 80px;
margin-right: 100px; margin-right: 100px;
} }
#license-img { #license-img {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.order-details .el-form-item { .order-details .el-form-item {
margin-bottom: 10px !important; margin-bottom: 10px !important;
} }
.el-dialog__footer .dialog-footer1 { .el-dialog__footer .dialog-footer1 {
position: relative; position: relative;
text-align: center; text-align: center;
} }
.fhjj { .fhjj {
width: 500px; width: 500px;
} }
.content { .content {
margin-left: 4%; margin-left: 4%;
} }
.height { .height {
margin-bottom: 2%; margin-bottom: 2%;
} }
. el-form-item__content { . el-form-item__content {
margin-left: 5% !important; margin-left: 5% !important;
} }
.status { .status {
margin-top: 4%; margin-top: 4%;
} }
</style> </style>
src/views/vehicle/bookRecord/index.vue
View file @ 70f6ce63
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
</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
...@@ -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,7 +424,11 @@ ...@@ -421,7 +424,11 @@
</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">
<img v-for="src in departurePicList" :src="src" :key="src" class="voucher" />
</viewer>
<!-- <el-col
:span="3" :span="3"
v-for="(item, index) in departurePicList" v-for="(item, index) in departurePicList"
:key="index" :key="index"
...@@ -431,7 +438,7 @@ ...@@ -431,7 +438,7 @@
<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,7 +477,10 @@ ...@@ -470,7 +477,10 @@
</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">
<img v-for="src in arrivalPicList" :src="src" :key="src" class="voucher" />
</viewer>
<!-- <el-col
:span="3" :span="3"
v-for="(item, index) in arrivalPicList" v-for="(item, index) in arrivalPicList"
:key="index" :key="index"
...@@ -480,7 +490,7 @@ ...@@ -480,7 +490,7 @@
<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/vehicle/vehicleInfo/index.vue
View file @ 70f6ce63
...@@ -925,11 +925,11 @@ ...@@ -925,11 +925,11 @@
</template> </template>
<script> <script>
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' // 出车弹框
import 'static/css/uploadImg.css' // 引入图片上传组件对话框 import 'static/css/uploadImg.css' // 引入图片上传组件对话框
import { import {
page, page,
addObj, addObj,
getObj, getObj,
...@@ -944,65 +944,65 @@ ...@@ -944,65 +944,65 @@
checkVin, checkVin,
checkEngineNum, checkEngineNum,
getArea getArea
} from '../../../api/vehicle/vehicleInfo/' } from '../../../api/vehicle/vehicleInfo/'
import { import {
getAllVehicleModelList, getAllVehicleModelList,
getAllVehicleList getAllVehicleList
} from '../../../api/vehicleType' } from '../../../api/vehicleType'
import { import {
getConstantByTypeAndCode, getConstantByTypeAndCode,
getConstantListByType, getConstantListByType,
getAllInsuranceCompany, getAllInsuranceCompany,
getInsuranceCompany getInsuranceCompany
} from 'api/base_info/constant/' } from 'api/base_info/constant/'
import { import {
departureVehicle, departureVehicle,
arrivalVehicle, arrivalVehicle,
upkeepVehicle, upkeepVehicle,
upkeepEndVehicle upkeepEndVehicle
} from 'api/vehicle/active' } from 'api/vehicle/active'
import { getAllUpkeepItem, getUpkeepAll } from 'api/vehicle/upkeep' import { getAllUpkeepItem, getUpkeepAll } from 'api/vehicle/upkeep'
import { getSonRegionByCodes, getRegionByCodes } from 'api/base_info/region/' import { getSonRegionByCodes, getRegionByCodes } from 'api/base_info/region/'
import { import {
VEHICLE_CONSTANT_VEHICLE_BRAND, VEHICLE_CONSTANT_VEHICLE_BRAND,
VEHICLE_CONSTANT_VEHICLE_USE, VEHICLE_CONSTANT_VEHICLE_USE,
VEHICLE_CONSTANT_BRAND_CODE_UNKOWN, VEHICLE_CONSTANT_BRAND_CODE_UNKOWN,
BELONG_TO_TYPE_OWN, BELONG_TO_TYPE_OWN,
VEHICLE_CONSTANT_USE_TYPE_UNKOWN, VEHICLE_CONSTANT_USE_TYPE_UNKOWN,
VEHICLE_CONSTANT_STATUS_NORMAL VEHICLE_CONSTANT_STATUS_NORMAL
} from '../../../store/modules/baseInfo' } from '../../../store/modules/baseInfo'
import { getAllCompany, getAll } from 'api/base_info/branch_company/' import { getAllCompany, getAll } from 'api/base_info/branch_company/'
import { formatDate } from 'utils/dateFormattor' import { formatDate } from 'utils/dateFormattor'
import { import {
toEast8Date, toEast8Date,
deepCopyDate, deepCopyDate,
newEast8Date, newEast8Date,
convertDate2Str convertDate2Str
} from 'utils/dateUtils' } from 'utils/dateUtils'
import rsCode from '../../../utils/rsCode' import rsCode from '../../../utils/rsCode'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { getToken } from 'utils/auth' import { getToken } from 'utils/auth'
import bookInfoViewer from '../bookInfoViewer' import bookInfoViewer from '../bookInfoViewer'
import accItemSelector from '../accompanyingItem/accItemSelector.vue' import accItemSelector from '../accompanyingItem/accItemSelector.vue'
import Element1 from '../../admin/menu/components/element' import Element1 from '../../admin/menu/components/element'
import ElRow from 'element-ui/packages/row/src/row' import ElRow from 'element-ui/packages/row/src/row'
import ElCol from 'element-ui/packages/col/src/col' import ElCol from 'element-ui/packages/col/src/col'
import { getAllZone } from 'api/base_info/constant/' import { getAllZone } from 'api/base_info/constant/'
import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue' import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
export default { export default {
name: 'vehicleInfo', name: 'vehicleInfo',
components: { components: {
ElFormItem, ElFormItem,
...@@ -3057,5 +3057,5 @@ ...@@ -3057,5 +3057,5 @@
} }
} }
} }
} }
</script> </script>
src/views/vehicleType/index.vue
View file @ 70f6ce63
...@@ -84,10 +84,12 @@ ...@@ -84,10 +84,12 @@
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{vehicleTypeList_btn_edit?'编辑':'查看'}} <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{vehicleTypeList_btn_edit?'编辑':'查看'}}
</el-button> </el-button>
<el-button size="small"class="el-button el-button--text el-button--small" style="color: #6ce26c;" v-if="scope.row.status==2|| scope.row.status==0" @click="upStatus(scope.row)">上架 <el-button size="small" class="el-button el-button--text el-button--small" style="color: #6ce26c;" v-if="scope.row.status==2|| scope.row.status==0" @click="upStatus(scope.row)">上架
</el-button> </el-button>
<el-button size="small" class="el-button el-button--text el-button--small" style="color: #1d90e6" v-if="scope.row.status==1" @click="upStatus(scope.row)">下架 <el-button size="small" class="el-button el-button--text el-button--small" style="color: #1d90e6" v-if="scope.row.status==1" @click="upStatus(scope.row)">下架
</el-button> </el-button>
<el-button class="el-button el-button--text el-button--small" style="color:#1d90e6;" size="small" @click="handlerAppShow(scope.row)" v-if="scope.row.appShow==1">APP展示</el-button>
<el-button class="el-button el-button--text el-button--small" style="color:#1d90e6;" size="small" @click="handlerAppShow(scope.row)" v-if="scope.row.appShow==0">APP不展示</el-button>
<el-button class="el-button el-button--text el-button--small" style="color:red;" size="small" @click="deleteHandler(scope.row)" v-if="vehicleTypeList_btn_del">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red;" size="small" @click="deleteHandler(scope.row)" v-if="vehicleTypeList_btn_del">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -150,7 +152,8 @@ ...@@ -150,7 +152,8 @@
getLabelList, getLabelList,
getLabelByParentId, getLabelByParentId,
upStatusChange, upStatusChange,
updateVehicleModel updateVehicleModel,
updateAppShow
} from 'api/vehicleType'; } from 'api/vehicleType';
import Element1 from "../admin/menu/components/element"; import Element1 from "../admin/menu/components/element";
...@@ -257,6 +260,48 @@ ...@@ -257,6 +260,48 @@
}); });
} }
}); });
},
/**
* 是否在App展示
* @param {Object} row
*/
handlerAppShow(row) {
var text = "";
if (row.appShow == 0) {
text = "确定设置为在App展示吗?";
} else {
text = "确定设置为不在App展示吗?";
}
var status = row.appShow == 0 ? 1 : 0;
var param = {
"id" : row.id,
"appShow" : status
}
this.$confirm(text, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
updateAppShow(param).then(response => {
if (response.status === 200) {
this.$notify({
title: '成功',
message: '设置成功',
type: 'success',
duration: 2000
});
this.bannerDialogVisible = false;
this.getList();
} else {
this.$notify({
title: '设置失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
type: 'error',
duration: 2000
});
}
});
})
}, },
/** /**
* 删除 * 删除
......
src/views/vehicleType/priceList.vue
View file @ 70f6ce63
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<el-select <el-select
v-if="setForm.type ==3 && setForm.isGlobal == 1" v-if="setForm.type ==3 && setForm.isGlobal == 1"
v-model="setForm.level" v-model="setForm.level"
placeholder="请选择" placeholder="请选择会员等级"
> >
<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.level"></el-option> <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.level"></el-option>
</el-select> </el-select>
...@@ -273,11 +273,25 @@ export default { ...@@ -273,11 +273,25 @@ 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 { } else if(this.setForm.type == 1 && this.setForm.multiple == ''){
this.$message.error('请输入倍数')
return false
}else if(this.setForm.type == 2 && !this.setForm.price){
this.$message.error('请输入绝对值')
return false
}else if(this.setForm.type == 3 && this.setForm.level == ''){
this.$message.error('请选择会员等级')
return false
}else if(this.setForm.freeDays == ''){
this.$message.error('请设置天数')
return false
}else{
this.chooseData.forEach(element => { this.chooseData.forEach(element => {
let defaults = {} let defaults = {}
defaults.date = element defaults.date = element
...@@ -403,8 +417,6 @@ export default { ...@@ -403,8 +417,6 @@ export default {
matching(val) { matching(val) {
let diploid = '' let diploid = ''
this.dataList.forEach(element => { this.dataList.forEach(element => {
console.log(element)
if (element.vehicleModelDay == val) { if (element.vehicleModelDay == val) {
if (element.isGlobal == false) { if (element.isGlobal == false) {
diploid = '特殊设置' diploid = '特殊设置'
...@@ -459,8 +471,6 @@ export default { ...@@ -459,8 +471,6 @@ export default {
this.currentMonth.toString().length == 1 this.currentMonth.toString().length == 1
? '0' + this.currentMonth ? '0' + this.currentMonth
: this.currentMonth : this.currentMonth
console.log(month)
priceList(this.currentYear + '-' + month + '-01').then(data => { priceList(this.currentYear + '-' + month + '-01').then(data => {
if (data.status == 200) { if (data.status == 200) {
this.dataList = data.data this.dataList = data.data
......
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