Skip to content

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

租车价格日历,筛选样式调整

parent 27ae43ee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1706 additions and 1669 deletions
src/views/appManagement/modalManagement/index.vue
View file @ 04e21fba
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="60px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="60px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="6">
<el-form-item label="描述"> <el-form-item label="描述">
<el-input v-model.number="listQuery.popupName" placeholder="请输入描述"></el-input> <el-input v-model.number="listQuery.popupName" placeholder="请输入描述"></el-input>
</el-form-item> </el-form-item>
......
src/views/appManagement/selectedActivities/index.vue
View file @ 04e21fba
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="60px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="60px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="6">
<el-form-item label="描述"> <el-form-item label="描述">
<el-input v-model.number="listQuery.activitiesName" placeholder="请输入描述"></el-input> <el-input v-model.number="listQuery.activitiesName" placeholder="请输入描述"></el-input>
</el-form-item> </el-form-item>
......
src/views/cunponManagements/conponList.vue
View file @ 04e21fba
This diff is collapsed.
src/views/order/memberOrderInfo/index.vue
View file @ 04e21fba
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="6">
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
v-model="createTime" v-model="createTime"
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<!-- <el-date-picker v-model="createTime" type="datetimerange" placeholder="选择时间范围" @change="changeCreate"></el-date-picker> --> <!-- <el-date-picker v-model="createTime" type="datetimerange" placeholder="选择时间范围" @change="changeCreate"></el-date-picker> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="6">
<el-form-item label="支付时间"> <el-form-item label="支付时间">
<!-- <el-date-picker v-model="aplyTime" type="datetimerange" placeholder="选择支付时间范围" @change="changePay"></el-date-picker> --> <!-- <el-date-picker v-model="aplyTime" type="datetimerange" placeholder="选择支付时间范围" @change="changePay"></el-date-picker> -->
<el-date-picker <el-date-picker
......
src/views/order/orderStatistics/index.vue
View file @ 04e21fba
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="filter-container"> <div class="filter-container">
<el-form ref="queryForm" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row> <el-row>
<el-col :span="5"> <el-col :span="6">
<el-form-item label="统计时间:"> <el-form-item label="统计时间:">
<el-date-picker <el-date-picker
v-model="listQuery.time" v-model="listQuery.time"
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="6">
<el-form-item label="统计方式:" class="wayMsg"> <el-form-item label="统计方式:" class="wayMsg">
<span <span
v-for="(item,index) in way" v-for="(item,index) in way"
......
src/views/purseManage/incomeOverview.vue
View file @ 04e21fba
...@@ -4,16 +4,14 @@ ...@@ -4,16 +4,14 @@
<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="5"> <el-form-item label="姓名">
<el-form-item label="姓名"> <el-input v-model="listQuery.username" placeholder="请输入姓名"></el-input>
<el-input v-model="listQuery.username" placeholder="请输入姓名"></el-input> </el-form-item>
</el-form-item> <el-form-item label="手机号">
</el-col> <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
<el-col :span="5"> </el-form-item>
<el-form-item label="手机号"> <el-col :span="5"></el-col>
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input> <el-col :span="5"></el-col>
</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-button class="filter-item" type="primary" v-waves icon="search" @click="clearFilter">清除搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="clearFilter">清除搜索</el-button>
</el-row> </el-row>
...@@ -32,11 +30,11 @@ ...@@ -32,11 +30,11 @@
</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.commissionRate+'%'}}</span> <span>{{scope.row.commissionRate+'%'}}</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">
...@@ -44,19 +42,18 @@ ...@@ -44,19 +42,18 @@
</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.balance}}</span> <span>{{scope.row.balance}}</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.withdrawals}}</span> <span>{{scope.row.withdrawals}}</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.withdrawaling}}</span> <span>{{scope.row.withdrawaling}}</span>
...@@ -71,7 +68,7 @@ ...@@ -71,7 +68,7 @@
<template scope="scope"> <template scope="scope">
<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"> <!-- <el-table-column align="center" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button <el-button
...@@ -80,7 +77,7 @@ ...@@ -80,7 +77,7 @@
@click="deposit(scope.row)" @click="deposit(scope.row)"
>{{scope.row.isFrozen == 0 ? '禁止提现' : '允许提现'}}</el-button> >{{scope.row.isFrozen == 0 ? '禁止提现' : '允许提现'}}</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 <el-pagination
...@@ -151,8 +148,8 @@ export default { ...@@ -151,8 +148,8 @@ export default {
}, },
methods: { methods: {
//清除搜索 //清除搜索
clearFilter(){ clearFilter() {
this.listQuery.username = this.listQuery.phone = null; this.listQuery.username = this.listQuery.phone = null
this.getList() this.getList()
}, },
//提现 //提现
......
src/views/userManagement/memberEnter.vue
View file @ 04e21fba
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<div class="filter-container"> <div class="filter-container">
<el-form ref="queryForm" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row> <el-row>
<el-col :span="4"> <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>
<el-col :span="8"> <el-col :span="16">
<el-form-item label="导入时间"> <el-form-item label="导入时间">
<el-date-picker <el-date-picker
v-model="listQuery.startTime" v-model="listQuery.startTime"
......
src/views/userManagement/userList/index.vue
View file @ 04e21fba
...@@ -861,6 +861,9 @@ ...@@ -861,6 +861,9 @@
if(queryJson.mobile){ if(queryJson.mobile){
t.listQuery.mobile = queryJson.mobile; t.listQuery.mobile = queryJson.mobile;
} }
if(queryJson.realName){
t.listQuery.realName = queryJson.realName;
}
if(queryJson.memberLevel){ if(queryJson.memberLevel){
t.listQuery.memberLevel = queryJson.memberLevel; t.listQuery.memberLevel = queryJson.memberLevel;
} }
......
src/views/vehicle/bookRecord/index.vue
View file @ 04e21fba
This diff is collapsed.
src/views/vehicleType/priceList.vue
View file @ 04e21fba
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
@click="setVal(GMTToStrs(dayobject.day),index,dayobject.day.getMonth()+1 != currentMonth)" @click="setVal(GMTToStrs(dayobject.day),index,dayobject.day.getMonth()+1 != currentMonth)"
> >
<!-- 选中的状态 --> <!-- 选中的状态 -->
<span ref="activeDay"></span> <span ref="activeDay" v-show="dayobject.day.getMonth()+1 == currentMonth"></span>
<!-- <span :class="{isChosse:isChosses}" ref="activeDay"></span> --> <!-- <span :class="{isChosse:isChosses}" ref="activeDay"></span> -->
<!--本月--> <!--本月-->
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
>{{ dayobject.day.getDate() }}</span> >{{ dayobject.day.getDate() }}</span>
<!--如果是本月 还需要判断是不是这一天--> <!--如果是本月 还需要判断是不是这一天-->
<span v-else ref="allDays"> <span v-else>
<span <span
v-if="dayobject.day.getFullYear() == new Date().getFullYear() && dayobject.day.getMonth() == new Date().getMonth() && dayobject.day.getDate() == new Date().getDate()" v-if="dayobject.day.getFullYear() == new Date().getFullYear() && dayobject.day.getMonth() == new Date().getMonth() && dayobject.day.getDate() == new Date().getDate()"
class="active" class="active"
...@@ -229,6 +229,7 @@ export default { ...@@ -229,6 +229,7 @@ export default {
this.levelsFn() this.levelsFn()
}, },
methods: { methods: {
//通用规则设置
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
if (valid) { if (valid) {
...@@ -249,8 +250,9 @@ export default { ...@@ -249,8 +250,9 @@ export default {
} }
}) })
}, },
//清空设置样式
changeIsGlobal(val) { changeIsGlobal(val) {
let activeStatus = this.$refs.activeDay let activeStatus = this.$refs.activeDay || ''
if (val == 0) { if (val == 0) {
for (let index = 0; index < activeStatus.length; index++) { for (let index = 0; index < activeStatus.length; index++) {
activeStatus[index].className = '' activeStatus[index].className = ''
...@@ -353,7 +355,6 @@ export default { ...@@ -353,7 +355,6 @@ export default {
}) })
} else { } else {
// console.log(params); // console.log(params);
add_edit(params, this.activeTime).then(data => { add_edit(params, this.activeTime).then(data => {
if (data.status == 200) { if (data.status == 200) {
this.$message.success('设置成功') this.$message.success('设置成功')
...@@ -439,6 +440,8 @@ export default { ...@@ -439,6 +440,8 @@ export default {
let date = new Date(time) let date = new Date(time)
let year = date.getFullYear() let year = date.getFullYear()
let month = date.getMonth() + 1 let month = date.getMonth() + 1
month = month.toString().length == 1 ? '0' + month : month
// console.log(month);
let datas = let datas =
date.getDate().toString().length == 1 date.getDate().toString().length == 1
? '0' + date.getDate() ? '0' + date.getDate()
...@@ -450,6 +453,7 @@ export default { ...@@ -450,6 +453,7 @@ export default {
let date = new Date(time) let date = new Date(time)
let year = date.getFullYear() let year = date.getFullYear()
let month = date.getMonth() + 1 let month = date.getMonth() + 1
month = month.toString().length == 1 ? '0' + month : month
let datas = let datas =
date.getDate().toString().length == 1 date.getDate().toString().length == 1
? '0' + date.getDate() ? '0' + date.getDate()
...@@ -559,6 +563,7 @@ export default { ...@@ -559,6 +563,7 @@ export default {
} }
}, },
pickPre: function(year, month) { pickPre: function(year, month) {
var activeStatus = this.$refs.activeDay || ''
// setDate(0); 上月最后一天 // setDate(0); 上月最后一天
// setDate(-1); 上月倒数第二天 // setDate(-1); 上月倒数第二天
// setDate(dx) 参数dx为 上月最后一天的前后dx天 // setDate(dx) 参数dx为 上月最后一天的前后dx天
...@@ -567,33 +572,49 @@ export default { ...@@ -567,33 +572,49 @@ export default {
this.initData(this.formatDate(d.getFullYear(), d.getMonth() + 1, 1)) this.initData(this.formatDate(d.getFullYear(), d.getMonth() + 1, 1))
this.getList() this.getList()
this.changeIsGlobal(0) if (this.calendarStatus == 1) {
this.chooseData = [] this.changeIsGlobal(0)
for (let index = 0; index < this.days.length; index++) {
if (
this.GMTToStr(
this.days[index] == this.chooseData[index]
)
) {
if (this.chooseData[index]) {
const indexs = this.days.findIndex(
item =>
this.GMTToStrs(item.day) ==
this.chooseData[index]
)
if (activeStatus[indexs]) activeStatus[indexs].className = 'isChosse'
}
}
}
}
}, },
pickNext: function(year, month) { pickNext: function(year, month) {
var activeStatus = this.$refs.activeDay || ''
var d = new Date(this.formatDate(year, month, 1)) var d = new Date(this.formatDate(year, month, 1))
d.setDate(35) d.setDate(35)
this.initData(this.formatDate(d.getFullYear(), d.getMonth() + 1, 1)) this.initData(this.formatDate(d.getFullYear(), d.getMonth() + 1, 1))
this.getList() this.getList()
this.changeIsGlobal(0) this.changeIsGlobal(0)
this.chooseData = [] for (let index = 0; index < this.days.length; index++) {
// this.reset() if (this.GMTToStr(this.days[index] == this.chooseData[index])) {
if (this.chooseData[index]) {
const indexs = this.days.findIndex(
item =>
this.GMTToStrs(item.day) ==
this.chooseData[index]
)
if (activeStatus[indexs]) activeStatus[indexs].className = 'isChosse'
// activeStatus[indexs].className = 'isChosse'
}
}
}
}, },
// reset() {
// if ((this.calendarStatus = 1)) {
// let activeStatus = this.$refs.activeDay
// let allDays = this.$refs.allDays
// for (let index = 0; index < activeStatus.length; index++) {
// if (
// this.days[index].day.getMonth() + 1 !=
// this.currentMonth
// ) {
// activeStatus[index].className = '';
// }
// }
// }
// },
// 返回 类似 2016-01-02 格式的字符串 // 返回 类似 2016-01-02 格式的字符串
formatDate: function(year, month, day) { formatDate: function(year, month, day) {
var y = year var y = year
......
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