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 Hide 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/index.vue
View file @ 70f6ce63
This diff is collapsed.
src/views/summit/model/reviewPopup.vue
View file @ 70f6ce63
This diff is collapsed.
src/views/vehicle/bookRecord/index.vue
View file @ 70f6ce63
...@@ -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/vehicle/vehicleInfo/index.vue
View file @ 70f6ce63
This diff is collapsed.
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