Skip to content

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

钱包

parent 329709ea
Show whitespace changes
Inline Side-by-side
Showing with 1196 additions and 862 deletions
src/api/purseManage.js
View file @ de2339a5
...@@ -71,3 +71,21 @@ export function editObj(obj) { ...@@ -71,3 +71,21 @@ export function editObj(obj) {
params: obj params: obj
}); });
} }
// 禁止||允许提现
export function forbidden(query) {
return fetch({
url: '/api/admin/wallet/admin/forbidden',
method: 'put',
params: query
});
}
// 佣金记录
export function recordList(params) {
return fetch({
url: 'api/admin/sellingwater/admin/page',
method: 'post',
data: params
});
}
src/router/index.js
View file @ de2339a5
...@@ -489,6 +489,12 @@ export const asyncRouterMap = [{ ...@@ -489,6 +489,12 @@ export const asyncRouterMap = [{
component: _import('purseManage/discountRecord'), component: _import('purseManage/discountRecord'),
name: '提现记录', name: '提现记录',
authority: 'discountRecord' authority: 'discountRecord'
},
{
path: 'commissionRecord',
component: _import('purseManage/commissionRecord'),
name: '佣金记录',
authority: 'commissionRecord'
} }
] ]
}, },
......
src/views/order/memberOrderInfo/index.vue
View file @ de2339a5
...@@ -190,6 +190,7 @@ ...@@ -190,6 +190,7 @@
created() { created() {
let t = this; let t = this;
let query = localStorage.getItem("memberOrderInfo"); let query = localStorage.getItem("memberOrderInfo");
this.listQuery.no = this.$route.query.id || null
if(query !="null" && query){ if(query !="null" && query){
let queryJson = JSON.parse(query); let queryJson = JSON.parse(query);
if(queryJson.page){ if(queryJson.page){
......
src/views/order/orderStatistics/index.vue
View file @ de2339a5
...@@ -135,15 +135,15 @@ export default { ...@@ -135,15 +135,15 @@ export default {
: (this.listQuery.startTime = null) : (this.listQuery.startTime = null)
!!this.listQuery.time[1] !!this.listQuery.time[1]
? (this.listQuery.endTime = this.listQuery.time[1].getTime()) ? (this.listQuery.endTime = this.listQuery.time[1].getTime())
: (this.listQuery.endTime = null); : (this.listQuery.endTime = null)
this.listQuery.page = 1; this.listQuery.page = 1
this.getList() this.getList()
}, },
//统计方式筛选 //统计方式筛选
changeWay(val) { changeWay(val) {
this.isactive = val.label this.isactive = val.label
this.listQuery.type = val.id; this.listQuery.type = val.id
this.listQuery.page = 1; this.listQuery.page = 1
this.getList() this.getList()
}, },
//导出 //导出
...@@ -205,7 +205,7 @@ export default { ...@@ -205,7 +205,7 @@ export default {
} }
} }
}) })
this.total = data.data.total; this.total = data.data.total
this.list = data.data.list this.list = data.data.list
} }
setTimeout(() => { setTimeout(() => {
......
src/views/order/rentVehicleInfo/index.vue
View file @ de2339a5
...@@ -645,6 +645,7 @@ export default { ...@@ -645,6 +645,7 @@ export default {
created() { created() {
let t = this; let t = this;
let query = localStorage.getItem("rentVehicleInfo"); let query = localStorage.getItem("rentVehicleInfo");
this.listQuery.no = this.$route.query.id || null
if(query !="null" && query){ if(query !="null" && query){
let queryJson = JSON.parse(query); let queryJson = JSON.parse(query);
if(queryJson.type){ if(queryJson.type){
......
src/views/order/tourOrderInfo/index.vue
View file @ de2339a5
...@@ -288,6 +288,7 @@ ...@@ -288,6 +288,7 @@
created() { created() {
let t = this; let t = this;
let query = localStorage.getItem("tourOrderInfo"); let query = localStorage.getItem("tourOrderInfo");
this.listQuery.no = this.$route.query.id || null
if(query !="null" && query){ if(query !="null" && query){
let queryJson = JSON.parse(query); let queryJson = JSON.parse(query);
if(queryJson.page){ if(queryJson.page){
......
src/views/purseManage/commissionRecord.vue 0 → 100644
View file @ de2339a5
<template>
<div class="app-container calendar-list-container">
<div class="filter-container">
<el-row :gutter="20">
<el-col :span="4">
<el-input v-model="search.userName" placeholder="请输入用户姓名"></el-input>
</el-col>
<el-col :span="4">
<el-input v-model="search.phone" placeholder="请输入手机号"></el-input>
</el-col>
<el-col :span="6">
<el-date-picker v-model="time" type="datetimerange" placeholder="选择时间范围"></el-date-picker>
</el-col>
<el-col :span="4">
<el-button type="primary" @click="searchBtn">搜索</el-button>
</el-col>
</el-row>
<el-table
:data="list"
border
fit
highlight-current-row
style="width: 100%;margin-top:10px"
v-loading="loading"
>
<el-table-column align="center" label="姓名">
<template scope="scope">
<span>{{scope.row.userName}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="手机号">
<template scope="scope">
<span>{{scope.row.phone}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="来源">
<template scope="scope">
<span>{{scope.row.sourceName}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="订单金额">
<template scope="scope">
<span>{{scope.row.price}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="提成比例">
<template scope="scope">
<span>{{scope.row.extract}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="金额变动">
<template scope="scope">
<span>{{scope.row.commission}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="状态">
<template scope="scope">
<span>{{scope.row.waiting == 1 ? '入账' : '未入账'}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="时间">
<template scope="scope">
<span>{{getLocalTime(scope.row.crtTime)}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right">
<template scope="scope">
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="deposit(scope.row)"
>详情</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="search.page"
:page-sizes="[10,20,30, 50]"
:page-size="search.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
style="margin-top:20px"
></el-pagination>
</div>
</div>
</template>
<script>
import { recordList } from 'api/purseManage'
export default {
created() {
this.getList()
},
data() {
return {
loading: false,
time: [],
list: [],
total: null,
search: {
page: 1,
limit: 10,
userName: null,
phone: null,
startTime: null,
endTime: null
}
}
},
methods: {
deposit(row) {
switch (row.orderType) {
case 1:
this.$router.push({
path: '/order/rentVehicleInfo',
query: {
id: row.orderNo
}
})
break
case 2:
this.$router.push({
path: '/order/tourOrderInfo',
query: {
id: row.orderNo
}
})
break
case 3:
this.$router.push({
path: '/order/memberOrderInfo',
query: {
id: row.orderNo
}
})
break
default:
break
}
},
handleSizeChange(val) {
this.search.limit = val
this.getList()
},
handleCurrentChange(val) {
this.search.page = val
this.getList()
},
getList() {
this.loading = true
this.search.startTime = new Date(this.time[0]).getTime() || null
this.search.endTime = new Date(this.time[1]).getTime() || null
recordList(this.search).then(data => {
if (data.status == 200) {
this.list = data.data.data
this.total = data.data.totalCount
}
setTimeout(() => {
this.loading = false
}, 300)
})
},
searchBtn() {
this.search.page = 1
this.getList()
},
getLocalTime(nS) {
//将时间戳（十三位时间搓，也就是带毫秒的时间搓）转换成时间格式
// d.cTime = 1539083829787
let date = new Date(nS)
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = date.getDate()
let hours = date.getHours()
let minutes = date.getMinutes()
let secibds = date.getSeconds()
month = month < 10 ? '0' + month : month
day = day < 10 ? '0' + day : day
hours = hours < 10 ? '0' + hours : hours
minutes = minutes < 10 ? '0' + minutes : minutes
secibds = secibds < 10 ? '0' + secibds : secibds
date =
year +
'-' +
month +
'-' +
day +
' ' +
hours +
':' +
minutes +
':' +
secibds
return date
}
}
}
</script>
<style>
</style>
\ No newline at end of file
src/views/purseManage/commissionSettings.vue
View file @ de2339a5
...@@ -3,43 +3,70 @@ ...@@ -3,43 +3,70 @@
<el-form ref="form" label-width="140px" style="margin-top: 20px;"> <el-form ref="form" label-width="140px" style="margin-top: 20px;">
<el-row v-for="(item,index) in settingList" :key="index"> <el-row v-for="(item,index) in settingList" :key="index">
<el-col :span="24" v-if="item.level==1"> <el-col :span="24" v-if="item.level==1">
<el-form-item label="总部股东分销提成"> <el-form-item label="股东分销提成">
<el-input v-model="item.extract" placeholder="请输入总部股东分销提成" type="number" v-enterNumber></el-input> <el-input
v-model="item.extract"
placeholder="请输入股东分销提成"
type="number"
v-enterNumber
style="width:200px"
></el-input>
<span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span> <span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="item.level==2"> <el-col :span="24" v-if="item.level==2">
<el-form-item label="分公司股东分销提成"> <el-form-item label="合伙人分销提成">
<el-input v-model="item.extract" placeholder="请输入分公司股东分销提成" type="number" v-enterNumber></el-input> <el-input
v-model="item.extract"
placeholder="请输入合伙人分销提成"
type="number"
v-enterNumber
style="width:200px"
></el-input>
<span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span> <span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="item.level==3"> <el-col :span="24" v-if="item.level==3">
<el-form-item label="合伙人分销提成"> <el-form-item label="代理人分销提成">
<el-input v-model="item.extract" placeholder="请输入合伙人分销提成" type="number" v-enterNumber></el-input> <el-input
v-model="item.extract"
placeholder="请输入代理人分销提成"
type="number"
v-enterNumber
style="width:200px"
></el-input>
<span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span> <span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="item.level==4"> <el-col :span="24" v-if="item.level==4">
<el-form-item label="员工分销提成"> <el-form-item label="员工分销提成">
<el-input v-model="item.extract" placeholder="请输入员工分销提成" type="number" v-enterNumber></el-input> <el-input
<span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span> v-model="item.extract"
</el-form-item> placeholder="请输入员工分销提成"
</el-col> type="number"
<el-col :span="24" v-if="item.level==5"> v-enterNumber
<el-form-item label="代理人分销提成"> style="width:200px"
<el-input v-model="item.extract" placeholder="请输入代理人分销提成" type="number" v-enterNumber></el-input> ></el-input>
<span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span> <span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="item.level==0"> <el-col :span="24" v-if="item.level==0">
<el-form-item label="普通用户分销提成"> <el-form-item label="普通用户分销提成">
<el-input v-model="item.extract" placeholder="请输入普通用户分销提成" type="number" v-enterNumber></el-input> <el-input
v-model="item.extract"
placeholder="请输入普通用户分销提成"
type="number"
v-enterNumber
style="width:200px"
></el-input>
<span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span> <span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="create()">立即提交</el-button> <el-button type="primary" @click="create()">立即提交</el-button>
...@@ -49,79 +76,69 @@ ...@@ -49,79 +76,69 @@
</template> </template>
<script> <script>
import { import { formatDate } from 'utils/dateFormattor'
formatDate
} from 'utils/dateFormattor';
import { import {
toEast8Date, toEast8Date,
deepCopyDate, deepCopyDate,
newEast8Date, newEast8Date,
convertDate2Str, convertDate2Str,
timestamp2Date timestamp2Date
} from 'utils/dateUtils'; } from 'utils/dateUtils'
import {mapGetters} from 'vuex'; import { mapGetters } from 'vuex'
import { import { getToken } from 'utils/auth'
getToken import { getrewardSetting, rewardSetting } from 'api/purseManage'
} from 'utils/auth'; import Element1 from '../admin/menu/components/element'
import { import ElRow from 'element-ui/packages/row/src/row'
getrewardSetting,rewardSetting import ElCol from 'element-ui/packages/col/src/col'
} from 'api/purseManage';
import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col";
export default { export default {
name: 'tourManage', name: 'tourManage',
components: { components: {
ElCol, ElCol,
ElRow, ElRow,
Element1, Element1
}, },
data() { data() {
return { return {
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
showLoadingBody: false, showLoadingBody: false,
listLoading: true, listLoading: true,
form: { form: {},
},
inline: true, inline: true,
tableKey: 0, tableKey: 0,
settingList:[] settingList: []
} }
}, },
created() { created() {
this.getSetting(); this.getSetting()
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(['elements'])
'elements'
])
}, },
methods: { methods: {
getSetting:function(){ getSetting: function() {
this.listLoading = true; this.listLoading = true
getrewardSetting().then(response => { getrewardSetting().then(response => {
this.settingList = response.data; this.settingList = response.data
this.listLoading = false; this.listLoading = false
}) })
}, },
create(formName) { create(formName) {
var that = this; var that = this
var arr = []; var arr = []
that.settingList.forEach(function(item){ that.settingList.forEach(function(item) {
if(item.extract==''){ if (item.extract == '') {
this.$notify({ this.$notify({
title: '警告', title: '警告',
message: '请输入'+item.name+'提成', message: '请输入' + item.name + '提成',
type: 'warning' type: 'warning'
}); })
return false; return false
} }
var obj = {} var obj = {}
obj.id = item.id; obj.id = item.id
obj.extract = item.extract obj.extract = item.extract
arr.push(obj) arr.push(obj)
}) })
...@@ -132,16 +149,16 @@ ...@@ -132,16 +149,16 @@
title: '修改成功', title: '修改成功',
message: '修改成功', message: '修改成功',
type: 'success' type: 'success'
}); })
this.getSetting(); this.getSetting()
}) })
}, },
cancel:function(formName){ cancel: function(formName) {
var that = this; var that = this
that.settingList.forEach(function(item){ that.settingList.forEach(function(item) {
item.extract = '' item.extract = ''
}) })
} }
} }
} }
</script> </script>
src/views/purseManage/discountRecord.vue
View file @ de2339a5
...@@ -3,31 +3,37 @@ ...@@ -3,31 +3,37 @@
<div> <div>
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
<el-row>
<el-col :span="6">
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input> <el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input> <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6"> <el-form-item label="提现单号">
<el-input v-model.number="listQuery.orderNo" placeholder="请输入提现单号" style="width:250px"></el-input>
</el-form-item>
<el-form-item label="状态" prop="type"> <el-form-item label="状态" prop="type">
<el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态"> <el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态">
<el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name" <el-option
:value="item.val"></el-option> v-for="(item,index) in typeOptions"
:key="index"
:label="item.name"
:value="item.val"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-form-item label="提现时间">
<el-date-picker v-model="time" type="datetimerange" placeholder="选择时间范围"></el-date-picker>
</el-form-item>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-row>
</el-form> </el-form>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;">
style="width: 100%;">
<el-table-column type="index" align="center" label="姓名" width="200"> <el-table-column type="index" align="center" label="姓名" width="200">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.username}}</span> <span>{{scope.row.username}}</span>
...@@ -39,14 +45,20 @@ ...@@ -39,14 +45,20 @@
<span>{{scope.row.phone}}</span> <span>{{scope.row.phone}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="提现账号"> <el-table-column align="center" label="金额">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.accountNumber}}</span> <span>{{scope.row.amount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="金额">
<el-table-column align="center" label="提现方式">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.amount}}</span> <span>{{scope.row.cathType == 1 ? '支付宝' : '微信'}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="收款账号">
<template scope="scope">
<span>{{scope.row.accountName}}</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -57,35 +69,47 @@ ...@@ -57,35 +69,47 @@
<span v-if="scope.row.stauts==2">驳回</span> <span v-if="scope.row.stauts==2">驳回</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="申请时间">
<el-table-column align="center" label="提现单号/申请时间" width="300">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <p>{{scope.row.orderNo}}</p>
<p>{{scope.row.crtTimeStr}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到账时间"> <el-table-column align="center" label="商户订单号/到账时间" width="300">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.finishTimeStr}}</span> <p>{{scope.row.cono}}</p>
<p>{{scope.row.finishTimeStr}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="65" fixed="right"> <el-table-column align="center" label="操作" width="65" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.stauts==0" <el-button
@click="handleUpdate(scope.row)">审核 size="small"
</el-button> class="el-button el-button--text el-button--small"
v-if="scope.row.stauts==0"
@click="handleUpdate(scope.row)"
>审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination
:current-page.sync="listQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="listQuery.limit" @size-change="handleSizeChange"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> @current-change="handleCurrentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10,20,30,40,50]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination>
</div> </div>
</div> </div>
<el-dialog title="审核" :visible.sync="dialogVisible"> <el-dialog title="审核" :visible.sync="dialogVisible">
<el-form :model="dialogFrom" ref="dialogFrom" label-width="80px"> <el-form :model="dialogFrom" ref="dialogFrom" label-width="80px">
<el-form-item label="审核类型"> <el-form-item label="审核类型">
<el-radio v-model="dialogFrom.status" label='1'>通过</el-radio> <el-radio v-model="dialogFrom.status" label="1">通过</el-radio>
<el-radio v-model="dialogFrom.status" label='2'>拒绝</el-radio> <el-radio v-model="dialogFrom.status" label="2">拒绝</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="订单号" v-if="dialogFrom.status==1" required> <el-form-item label="订单号" v-if="dialogFrom.status==1" required>
<el-input v-model="dialogFrom.cono" placeholder="请输入订单号"></el-input> <el-input v-model="dialogFrom.cono" placeholder="请输入订单号"></el-input>
...@@ -103,54 +127,48 @@ ...@@ -103,54 +127,48 @@
</template> </template>
<script> <script>
import { import { formatDate } from 'utils/dateFormattor'
formatDate
} from 'utils/dateFormattor';
import { import {
toEast8Date, toEast8Date,
deepCopyDate, deepCopyDate,
newEast8Date, newEast8Date,
convertDate2Str, convertDate2Str,
timestamp2Date timestamp2Date
} 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 { import { getToken } from 'utils/auth'
getToken import { discountList, editObj } from 'api/purseManage'
} from 'utils/auth'; import Element1 from '../admin/menu/components/element'
import { import ElRow from 'element-ui/packages/row/src/row'
discountList, import ElCol from 'element-ui/packages/col/src/col'
editObj
} from 'api/purseManage';
import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col";
export default { export default {
name: 'discountRecord', name: 'discountRecord',
components: { components: {
ElCol, ElCol,
ElRow, ElRow,
Element1, Element1
}, },
data() { data() {
return { return {
time:[],//提现时间
typeOptions: [ typeOptions: [
{ {
"name": '全部', name: '全部',
"val": '' val: ''
}, },
{ {
"name": '未到账', name: '未到账',
"val": '0' val: '0'
}, },
{ {
"name": '已到账', name: '已到账',
"val": '1' val: '1'
}, }
], ],
dialogVisible: false, dialogVisible: false,
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
...@@ -161,9 +179,12 @@ ...@@ -161,9 +179,12 @@
listQuery: { listQuery: {
page: 1, page: 1,
limit: 20, limit: 20,
phone: '',//手机号 phone: '', //手机号
username: '',//姓名 username: '', //姓名
state: '',//状态 state: '', //状态
startTime:null,
endTime:null,
orderNo: '', //提现单号
}, },
inline: true, inline: true,
tableKey: 0, tableKey: 0,
...@@ -171,70 +192,73 @@ ...@@ -171,70 +192,73 @@
status: '1', status: '1',
cono: '', cono: '',
reason: '' reason: ''
}, }
} }
}, },
created() { created() {
this.getList(); this.getList()
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(['elements'])
'elements'
])
}, },
methods: { methods: {
/** /**
* 获取提现列表 * 获取提现列表
* */ * */
getList() { getList() {
this.listLoading = true; this.listLoading = true
discountList(this.listQuery).then(response => { discountList(this.listQuery).then(response => {
let totalCountRs = undefined; let totalCountRs = undefined
let listRs = undefined; let listRs = undefined
if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) { if (
listRs = response.data.data; !this.$utils.isEmpty(response.data.data) &&
totalCountRs = response.data.totalCount; this.$utils.isInteger(response.data.totalCount)
listRs.map(function (item) { ) {
item.crtTimeStr = timestamp2Date(item.crtTime); listRs = response.data.data
totalCountRs = response.data.totalCount
listRs.map(function(item) {
item.crtTimeStr = timestamp2Date(item.crtTime)
if (item.finishTime != 0 && item.finishTime != null) { if (item.finishTime != 0 && item.finishTime != null) {
item.finishTimeStr = timestamp2Date(item.finishTime); item.finishTimeStr = timestamp2Date(item.finishTime)
} }
}); })
} }
this.listLoading = false; this.listLoading = false
this.list = listRs; this.list = listRs
this.total = totalCountRs; this.total = totalCountRs
}) })
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1; this.listQuery.page = 1
this.listQuery.startTime = new Date(this.time[0]).getTime() || null;
this.listQuery.endTime = new Date(this.time[1]).getTime() || null;
delete this.listQuery.time
this.$refs.queryForm.validate(valid => { this.$refs.queryForm.validate(valid => {
if (valid) { if (valid) {
this.getList(); this.getList()
} else { } else {
return false; return false
} }
}); })
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.listQuery.limit = val; this.listQuery.limit = val
this.getList(); this.getList()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.listQuery.page = val; this.listQuery.page = val
this.getList(); this.getList()
}, },
cancelHandel() { cancelHandel() {
this.dialogVisible = false; this.dialogVisible = false
}, },
handleUpdate(row) { handleUpdate(row) {
this.dialogFrom.cathId = row.id; this.dialogFrom.cathId = row.id
this.dialogVisible = true; this.dialogVisible = true
}, },
edit(formName) { edit(formName) {
var that = this; var that = this
const set = this.$refs; const set = this.$refs
set[formName].validate(valid => { set[formName].validate(valid => {
if (this.dialogFrom.status == 1) { if (this.dialogFrom.status == 1) {
if (this.dialogFrom.cono == '') { if (this.dialogFrom.cono == '') {
...@@ -243,8 +267,8 @@ ...@@ -243,8 +267,8 @@
message: '请输入订单号', message: '请输入订单号',
type: 'warning', type: 'warning',
duration: 2000 duration: 2000
}); })
return false; return false
} }
} }
if (this.dialogFrom.status == 2) { if (this.dialogFrom.status == 2) {
...@@ -254,35 +278,37 @@ ...@@ -254,35 +278,37 @@
message: '请输入拒绝原因', message: '请输入拒绝原因',
type: 'warning', type: 'warning',
duration: 2000 duration: 2000
}); })
return false; return false
} }
} }
if (valid) { if (valid) {
editObj(that.dialogFrom).then(response => { editObj(that.dialogFrom).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.dialogVisible = false; this.dialogVisible = false
this.getList(); this.getList()
this.$notify({ this.$notify({
title: '成功', title: '成功',
message: '审核成功', message: '审核成功',
type: 'success', type: 'success',
duration: 2000 duration: 2000
}); })
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！', message: rsCode.msg[response.code]
? rsCode.msg[response.code]
: '操作失败！',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}); })
} }
}); })
} else { } else {
return false; return false
} }
}); })
},
} }
} }
}
</script> </script>
src/views/purseManage/gainRecord.vue
View file @ de2339a5
...@@ -4,33 +4,35 @@ ...@@ -4,33 +4,35 @@
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
<el-row> <el-row>
<el-col :span="6">
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input> <el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input> <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item> </el-form-item>
</el-col> <el-form-item label="时间">
<el-col :span="6"> <el-date-picker v-model="time" type="datetimerange" placeholder="选择时间范围"></el-date-picker>
</el-form-item>
<el-form-item label="流水类型" prop="type"> <el-form-item label="流水类型" prop="type">
<el-select class="filter-item" v-model="listQuery.source" placeholder="请输入资源类型"> <el-select class="filter-item" v-model="listQuery.source" placeholder="请输入资源类型">
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option> <el-option
v-for="(item, index) in typeOptions"
:key="index"
:label="item.name"
:value="item.val"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;">
style="width: 100%;"> <el-table-column align="center" label="流水类型">
<el-table-column type="index" width="150" align="center" label="流水类型">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.source==0">活动奖励</span> <span v-if="scope.row.source==0">活动奖励</span>
<span v-if="scope.row.source==1">一级提成</span> <!-- <span v-if="scope.row.source==1">一级提成</span> -->
<span v-if="scope.row.source==2">会员充值</span> <span v-if="scope.row.source==2">会员充值</span>
<span v-if="scope.row.source==10">成功提现</span> <span v-if="scope.row.source==10">成功提现</span>
<span v-if="scope.row.source==11">转账</span> <span v-if="scope.row.source==11">转账</span>
...@@ -44,120 +46,116 @@ ...@@ -44,120 +46,116 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="手机号"> <el-table-column align="center" label="手机号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.phone}}</span> <span>{{scope.row.phone}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="来源"> <el-table-column align="center" label="来源">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.sourceUserName}}</span> <span>{{scope.row.sourceName || '-'}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="订单号"> <!-- <el-table-column width="200" align="center" label="订单金额">
<template scope="scope">
<span>{{scope.row.orderNo}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="订单金额">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.price}}</span> <span>{{scope.row.price || '-'}}</span>
</template> </template>
</el-table-column> </el-table-column>-->
<el-table-column width="200" align="center" label="提成比例"> <!-- <el-table-column width="200" align="center" label="提成比例">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.extract">{{scope.row.extract}}%</span> <span v-if="scope.row.extract">{{scope.row.extract}}</span>
<span else></span> <span else></span>
</template> </template>
</el-table-column> </el-table-column>-->
<el-table-column width="100" align="center" label="金额变动"> <el-table-column align="center" label="金额变动">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.itype==0">+{{scope.row.amount}}</span> <span v-if="scope.row.itype==0">+{{scope.row.amount}}</span>
<span v-if="scope.row.itype==1">-{{scope.row.amount}}</span> <span v-if="scope.row.itype==1">-{{scope.row.amount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100" align="center" label="状态"> <!-- <el-table-column width="100" align="center" label="状态">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.source==12">已消费</span> <span v-if="scope.row.source==12">已消费</span>
<span v-if="scope.row.source==1">已到账</span> <span v-if="scope.row.source==1">已到账</span>
</template> </template>
</el-table-column> </el-table-column>-->
<el-table-column width="200" align="center" label="时间"> <el-table-column align="center" label="时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.crtTimeStr}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination
:current-page.sync="listQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="listQuery.limit" @size-change="handleSizeChange"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> @current-change="handleCurrentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10,20,30,40,50]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import 'static/css/uploadImg.css';// 引入图片上传组件对话框 import 'static/css/uploadImg.css' // 引入图片上传组件对话框
import { import { formatDate } from 'utils/dateFormattor'
formatDate
} from 'utils/dateFormattor';
import { import {
toEast8Date, toEast8Date,
deepCopyDate, deepCopyDate,
newEast8Date, newEast8Date,
convertDate2Str, convertDate2Str,
timestamp2Date timestamp2Date
} 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 { import { getToken } from 'utils/auth'
getToken import { rewardList } from 'api/purseManage'
} from 'utils/auth'; import Element1 from '../admin/menu/components/element'
import { import ElRow from 'element-ui/packages/row/src/row'
rewardList import ElCol from 'element-ui/packages/col/src/col'
} from 'api/purseManage';
import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col";
export default { export default {
name: 'tourManage', name: 'tourManage',
components: { components: {
ElCol, ElCol,
ElRow, ElRow,
Element1, Element1
}, },
data() { data() {
return { return {
typeOptions: [ typeOptions: [
{ {
"name":'全部', name: '全部',
"val":'' val: ''
}, },
{ {
"name":'一级提成', name: '一级提成',
"val":'1' val: '1'
}, },
{ {
"name":'活动奖励', name: '活动奖励',
"val":'0' val: '0'
}, },
{ {
"name":'消费使用', name: '消费使用',
"val":'12' val: '12'
}, },
{ {
"name":'成功提现', name: '成功提现',
"val":'10' val: '10'
} }
], ],
time: '',
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
showLoadingBody: false, showLoadingBody: false,
list: null, list: null,
...@@ -166,62 +164,65 @@ ...@@ -166,62 +164,65 @@
listQuery: { listQuery: {
page: 1, page: 1,
limit: 20, limit: 20,
phone: '',//手机号 phone: '', //手机号
username: '',//姓名 username: '', //姓名
source:'',//来源 source: '', //来源
}, },
inline: true, inline: true,
tableKey: 0 tableKey: 0
} }
}, },
created() { created() {
this.getList(); this.getList()
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(['elements'])
'elements'
])
}, },
methods: { methods: {
/** /**
* 获取旅游列表 * 获取旅游列表
* */ * */
getList() { getList() {
this.listLoading = true; this.listLoading = true
rewardList(this.listQuery).then(response => { rewardList(this.listQuery).then(response => {
let totalCountRs = undefined; let totalCountRs = undefined
let listRs = undefined; let listRs = undefined
if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) { if (
listRs = response.data.data; !this.$utils.isEmpty(response.data.data) &&
totalCountRs = response.data.totalCount; this.$utils.isInteger(response.data.totalCount)
listRs.map(function(item){ ) {
item.crtTimeStr = timestamp2Date(item.crtTime); listRs = response.data.data
}); totalCountRs = response.data.totalCount
listRs.map(function(item) {
item.crtTimeStr = timestamp2Date(item.crtTime)
})
} }
this.listLoading = false; this.listLoading = false
this.list = listRs; this.list = listRs
this.total = totalCountRs; this.total = totalCountRs
}) })
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1; this.listQuery.page = 1
this.listQuery.startTime = new Date(this.time[0]).getTime();
this.listQuery.endTime = new Date(this.time[1]).getTime();
delete this.listQuery.time
this.$refs.queryForm.validate(valid => { this.$refs.queryForm.validate(valid => {
if (valid) { if (valid) {
this.getList(); this.getList()
} else { } else {
return false; return false
} }
}); })
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.listQuery.limit = val; this.listQuery.limit = val
this.getList(); this.getList()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.listQuery.page = val; this.listQuery.page = val
this.getList(); this.getList()
}
} }
} }
}
</script> </script>
src/views/purseManage/incomeOverview.vue
View file @ de2339a5
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;">
style="width: 100%;">
<el-table-column width="150" align="center" label="姓名" type="index"> <el-table-column width="150" align="center" label="姓名" type="index">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.username}}</span> <span>{{scope.row.username}}</span>
...@@ -32,22 +31,31 @@ ...@@ -32,22 +31,31 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="佣金比例">
<template scope="scope">
<span>{{scope.row.commissionRate+'%'}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="总收益"> <el-table-column width="200" align="center" label="总收益">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.totalAmount}}</span> <span>{{scope.row.totalAmount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="总提现"> <el-table-column width="200" align="center" label="当前余额">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.withdrawals}}</span> <span>{{scope.row.balance}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="总消费">
<el-table-column width="200" align="center" label="总提现">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.totalConsumption}}</span> <span>{{scope.row.withdrawals}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="提现中"> <el-table-column width="200" align="center" label="提现中">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.withdrawaling}}</span> <span>{{scope.row.withdrawaling}}</span>
...@@ -63,50 +71,59 @@ ...@@ -63,50 +71,59 @@
<span>{{scope.row.balance}}</span> <span>{{scope.row.balance}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" fixed="right">
<template scope="scope">
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="deposit(scope.row)"
>{{scope.row.isFrozen == 0 ? '禁止提现' : '允许提现'}}</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination
:current-page.sync="listQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="listQuery.limit" @size-change="handleSizeChange"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> @current-change="handleCurrentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10,20,30,40,50]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import 'static/css/uploadImg.css';// 引入图片上传组件对话框 import 'static/css/uploadImg.css' // 引入图片上传组件对话框
import { import { formatDate } from 'utils/dateFormattor'
formatDate
} from 'utils/dateFormattor';
import { import {
toEast8Date, toEast8Date,
deepCopyDate, deepCopyDate,
newEast8Date, newEast8Date,
convertDate2Str, convertDate2Str,
timestamp2Date timestamp2Date
} 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 { import { getToken } from 'utils/auth'
getToken import { incomList, forbidden } from 'api/purseManage'
} from 'utils/auth'; import Element1 from '../admin/menu/components/element'
import { import ElRow from 'element-ui/packages/row/src/row'
incomList import ElCol from 'element-ui/packages/col/src/col'
} from 'api/purseManage';
import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col";
export default { export default {
name: 'tourManage', name: 'tourManage',
components: { components: {
ElCol, ElCol,
ElRow, ElRow,
Element1, Element1
}, },
data() { data() {
return { return {
...@@ -118,33 +135,52 @@ ...@@ -118,33 +135,52 @@
listQuery: { listQuery: {
page: 1, page: 1,
limit: 20, limit: 20,
phone: '',//手机号 phone: '', //手机号
username: '',//姓名 username: '' //姓名
}, },
inline: true, inline: true,
tableKey: 0 tableKey: 0
} }
}, },
created() { created() {
this.getList(); this.getList()
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(['elements'])
'elements'
])
}, },
methods: { methods: {
//提现
deposit(row) {
let titleMsg =
row.isFrozen == 0 ? '请确定设为允许提现' : '请确定设为禁止提现'
let setId = row.isFrozen == 0 ? 1 : 0
this.$confirm(titleMsg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
forbidden({ id: row.id, state: setId }).then(data => {
if (data.status == 200) {
this.$message.success('设置成功')
this.getList()
}
})
})
},
/** /**
* 获取旅游列表 * 获取旅游列表
* */ * */
getList() { getList() {
this.listLoading = true; this.listLoading = true
incomList(this.listQuery).then(response => { incomList(this.listQuery).then(response => {
let totalCountRs = undefined; let totalCountRs = undefined
let listRs = undefined; let listRs = undefined
if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) { if (
listRs = response.data.data; !this.$utils.isEmpty(response.data.data) &&
totalCountRs = response.data.totalCount; this.$utils.isInteger(response.data.totalCount)
) {
listRs = response.data.data
totalCountRs = response.data.totalCount
// listRs.map(function(item){ // listRs.map(function(item){
// item.visible2 = false; // item.visible2 = false;
// item.crtTimeStr = timestamp2Date(item.crtTime); // item.crtTimeStr = timestamp2Date(item.crtTime);
...@@ -153,30 +189,29 @@ ...@@ -153,30 +189,29 @@
// } // }
// }); // });
} }
this.listLoading = false; this.listLoading = false
this.list = listRs; this.list = listRs
this.total = totalCountRs; this.total = totalCountRs
}) })
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1; this.listQuery.page = 1
this.$refs.queryForm.validate(valid => { this.$refs.queryForm.validate(valid => {
if (valid) { if (valid) {
this.getList(); this.getList()
} else { } else {
return false; return false
} }
}); })
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.listQuery.limit = val; this.listQuery.limit = val
this.getList(); this.getList()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.listQuery.page = val; this.listQuery.page = val
this.getList(); this.getList()
}
} }
} }
}
</script> </script>
src/views/vehicleType/mockSun.vue
View file @ de2339a5
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
type="daterange" type="daterange"
placeholder="选择日期范围" placeholder="选择日期范围"
style="width:100%" style="width:100%"
@chage="changeData" @change="changeData"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="倍数" prop="multiple" style="width:500px"> <el-form-item label="倍数" prop="multiple" style="width:500px">
...@@ -150,12 +150,12 @@ export default { ...@@ -150,12 +150,12 @@ export default {
} }
}, },
methods: { methods: {
deleteData(row){ deleteData(row) {
deleteList(row.id).then(data=>{ deleteList(row.id).then(data => {
if (data.status == 200) { if (data.status == 200) {
this.$message.success('删除成功') this.$message.success('删除成功')
this.getList() this.getList()
}else{ } else {
this.$message.error(data.message) this.$message.error(data.message)
} }
}) })
...@@ -165,6 +165,7 @@ export default { ...@@ -165,6 +165,7 @@ export default {
this.popTitle = '添加节假日' this.popTitle = '添加节假日'
}, },
changeData(val) { changeData(val) {
console.log(!val);
if (!val) { if (!val) {
this.ruleForm.date = [] this.ruleForm.date = []
} }
...@@ -224,6 +225,10 @@ export default { ...@@ -224,6 +225,10 @@ export default {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
if (valid) { if (valid) {
console.log(this.ruleForm) console.log(this.ruleForm)
if (this.ruleForm.date == '') {
this.$message.error('请选择节假日')
return false
} else {
if (this.popTitle == '添加节假日') { if (this.popTitle == '添加节假日') {
this.ruleForm.startDate = this.format( this.ruleForm.startDate = this.format(
this.ruleForm.date[0] this.ruleForm.date[0]
...@@ -236,13 +241,20 @@ export default { ...@@ -236,13 +241,20 @@ export default {
} else { } else {
this.ruleForm.startDate = this.ruleForm.date[0] this.ruleForm.startDate = this.ruleForm.date[0]
this.ruleForm.endDate = this.ruleForm.date[1] this.ruleForm.endDate = this.ruleForm.date[1]
!this.activeId ? '' : (this.ruleForm.id = this.activeId) !this.activeId
? ''
: (this.ruleForm.id = this.activeId)
this.successApi() this.successApi()
} }
} }
}
}) })
}, },
successApi() { successApi() {
if (this.ruleForm.date == '') {
this.$message.error('请选择节假日')
return false
} else {
delete this.ruleForm.date delete this.ruleForm.date
add_edit_set(this.ruleForm).then(data => { add_edit_set(this.ruleForm).then(data => {
console.log(data) console.log(data)
...@@ -254,6 +266,7 @@ export default { ...@@ -254,6 +266,7 @@ export default {
this.$message.error(data.message) this.$message.error(data.message)
} }
}) })
}
}, },
pickerOptions0: { pickerOptions0: {
disabledDate(time) { disabledDate(time) {
......
src/views/vehicleType/priceList.vue
View file @ de2339a5
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
</div> </div>
</template> </template>
<script> <script>
import { priceList, dayList, add_edit, levels,rule } from 'api/vehicleType' import { priceList, dayList, add_edit, levels, rule } from 'api/vehicleType'
export default { export default {
data() { data() {
...@@ -209,12 +209,11 @@ export default { ...@@ -209,12 +209,11 @@ export default {
}, },
rules: { rules: {
multiple: [ multiple: [
{ required: true, message: '请输入倍/天', trigger: 'blur' }, { required: true, message: '请输入倍/天', trigger: 'blur' }
], ],
freeDays: [ freeDays: [
{ required: true, message: '请输入/天', trigger: 'blur' }, { required: true, message: '请输入/天', trigger: 'blur' }
], ]
}, },
dialogVisible: false, dialogVisible: false,
isSetBorder: false, isSetBorder: false,
...@@ -246,11 +245,14 @@ export default { ...@@ -246,11 +245,14 @@ export default {
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
if (valid) { if (valid) {
rule({multiple:this.ruleForm.multiple,freeDays:this.ruleForm.freeDays}).then(data=>{ rule({
multiple: this.ruleForm.multiple,
freeDays: this.ruleForm.freeDays
}).then(data => {
if (data.status == 200) { if (data.status == 200) {
this.$message.success('设置成功') this.$message.success('设置成功')
this.dialogVisible = false this.dialogVisible = false
}else{ } else {
this.$message.error(data.message) this.$message.error(data.message)
} }
}) })
...@@ -401,14 +403,21 @@ export default { ...@@ -401,14 +403,21 @@ 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) {
diploid = '特殊设置'
} else {
if (element.type == 1) { if (element.type == 1) {
if (element.vehicleModelDay == val) if (element.vehicleModelDay == val)
!!element.multiple !!element.multiple
? (diploid = element.multiple + '倍') ? (diploid = element.multiple + '倍')
: '' : ''
} else if (element.type == 2) { } else if (element.type == 2) {
!!element.price ? (diploid = element.price + '元') : '' !!element.price
? (diploid = element.price + '元')
: ''
} else if (element.type == 3) { } else if (element.type == 3) {
diploid = diploid =
element.level === 1 element.level === 1
...@@ -418,6 +427,7 @@ export default { ...@@ -418,6 +427,7 @@ export default {
: '钻石会员' : '钻石会员'
} }
} }
}
}) })
return diploid return diploid
}, },
......
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