Skip to content

C
cloud-platform-ui
Commit 2fddb9ef authored by hanfeng's avatar hanfeng
Browse files
Options

修改用户列表

parent 9f09c6a5
Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 196 deletions
src/main.js
View file @ 2fddb9ef
...@@ -95,6 +95,22 @@ Vue.directive('enterNumber', { ...@@ -95,6 +95,22 @@ Vue.directive('enterNumber', {
}); });
} }
}); });
Vue.directive('isNumber', {
inserted: function (el) {
el.addEventListener("keypress",function(e){
e = e || window.event;
let charcode = typeof e.charCode == 'number' ? e.charCode : e.keyCode;
let re = /\d/;
if(!re.test(String.fromCharCode(charcode)) && charcode > 9 && !e.ctrlKey){
if(e.preventDefault){
e.preventDefault();
}else{
e.returnValue = false;
}
}
});
}
});
// register global utility filters. // register global utility filters.
Object.keys(filters).forEach(key => { Object.keys(filters).forEach(key => {
......
src/views/userManagement/memberEnter.vue
View file @ 2fddb9ef
...@@ -125,14 +125,14 @@ ...@@ -125,14 +125,14 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="免费天数" placeholder="免费天数" prop="totalNumber"> <el-form-item label="免费天数" placeholder="免费天数" prop="totalNumber">
<el-input size="small " type="text" v-model="newMemberObject.totalNumber" v-enterNumber></el-input> <el-input size="small " type="number" v-model="newMemberObject.totalNumber" min="0" v-enterNumber></el-input>
</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="剩余天数" placeholder="剩余天数" prop="rentFreeDays"> <el-form-item label="剩余天数" placeholder="剩余天数" prop="rentFreeDays">
<el-input size="small " type="text" v-model="newMemberObject.rentFreeDays" v-enterNumber></el-input> <el-input size="small " type="number" v-model="newMemberObject.rentFreeDays" min="0" v-enterNumber></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
src/views/userManagement/userList/index.vue
View file @ 2fddb9ef
...@@ -3,63 +3,64 @@ ...@@ -3,63 +3,64 @@
<div class="filter-container"> <div class="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-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model.number="listQuery.mobile" placeholder="请输入手机号"></el-input> <el-input v-model.number="listQuery.mobile" placeholder="请输入手机号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="注册终端"> <el-form-item label="注册终端">
<el-select class="filter-item" v-model="listQuery.channel" placeholder="请选注册终端"> <el-select class="filter-item" v-model="listQuery.channel" 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 mobileList " :key="val.id" :label="val.name" <el-option v-for="(val, key, index) in mobileList " :key="val.id" :label="val.name"
:value="val.id"></el-option> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="会员类型"> <el-form-item label="会员类型">
<el-select class="filter-item" v-model="listQuery.memberLevel" placeholder="请选会员类型"> <el-select class="filter-item" v-model="listQuery.memberLevel" 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 queryMemberLevelList " :key="val.id" :label="val.name" <el-option v-for="(val, key, index) in queryMemberLevelList " :key="val.id" :label="val.name"
:value="val.id"></el-option> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="用户身份"> <el-form-item label="用户身份">
<el-select class="filter-item" v-model="listQuery.postionState" placeholder="选择会员身份"> <el-select class="filter-item" v-model="listQuery.postionState" 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 postionStatelList " :key="val.id" :label="val.name" <el-option v-for="(val, key, index) in postionStatelList " :key="val.id" :label="val.name"
:value="val.id"></el-option> :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="注册时间" prop="bookDateRange">--> <!-- <el-form-item label="注册时间" prop="bookDateRange">-->
<!-- <el-date-picker--> <!-- <el-date-picker-->
<!-- v-model="listQuery.registrationDate "--> <!-- v-model="listQuery.registrationDate "-->
<!-- type="daterange"--> <!-- type="daterange"-->
<!-- :editable="true"--> <!-- :editable="true"-->
<!-- format="yyyy-MM-dd"--> <!-- format="yyyy-MM-dd"-->
<!-- placeholder="请选择注册时间范围">--> <!-- placeholder="请选择注册时间范围">-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="注册时间"> <el-form-item label="注册时间">
<el-date-picker <el-date-picker
v-model="listQuery.registrationTimeBegin" v-model="listQuery.registrationTimeBegin"
type="date" type="date"
:editable="true" :editable="true"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
></el-date-picker>~ ></el-date-picker>
<el-date-picker ~
v-model="listQuery.registrationTimeEnd" <el-date-picker
type="date" v-model="listQuery.registrationTimeEnd"
:editable="true" type="date"
format="yyyy-MM-dd" :editable="true"
placeholder="选择日期" format="yyyy-MM-dd"
></el-date-picker> placeholder="选择日期"
</el-form-item> ></el-date-picker>
<el-form-item label="用户来源"> </el-form-item>
<el-select class="filter-item" v-model="listQuery.source" placeholder="请选用户来源"> <el-form-item label="用户来源">
<el-option :key="undefined" label="全部" :value="undefined"></el-option> <el-select class="filter-item" v-model="listQuery.source" placeholder="请选用户来源">
<el-option v-for="(val, key, index) in sourceList" :key="val.id" :label="val.name" <el-option :key="undefined" label="全部" :value="undefined"></el-option>
:value="val.id"></el-option> <el-option v-for="(val, key, index) in sourceList" :key="val.id" :label="val.name"
</el-select> :value="val.id"></el-option>
</el-form-item> </el-select>
</el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<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>
...@@ -131,19 +132,29 @@ ...@@ -131,19 +132,29 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column align="center" label="操作" width="400" fixed="right"> <el-table-column align="center" label="操作" width="400" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">查看详情 <el-button size="small" class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">
查看详情
</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" v-if="admin_btn_user_postion_put"
@click="peopleSetting(scope.row)">身份设置
</el-button> </el-button>
<el-button size="small" class="el-button el-button--text el-button--small" v-if="admin_btn_user_postion_put" @click="peopleSetting(scope.row)">身份设置 <el-button class="el-button el-button--text el-button--small" v-if="scope.row.status!=1&&userList_btn_edit"
size="small" @click=" setMember(scope.row)">设置会员信息
</el-button> </el-button>
<el-button class="el-button el-button--text el-button--small" v-if="scope.row.status!=1&&userList_btn_edit" size="small" @click=" setMember(scope.row)">设置会员信息 <el-button class="el-button el-button--text el-button--small" v-if="scope.row.status!=1" size="small"
@click="userOrder(scope.row)">用户订单
</el-button> </el-button>
<el-button class="el-button el-button--text el-button--small" v-if="scope.row.status!=1" size="small" @click="userOrder(scope.row)">用户订单 <el-button v-if="scope.row.status!=1&&userList_btn_forbidden" size="small"
class="el-button el-button--text el-button--small" style="color:red" @click="disable(scope.row)">
设为禁用
</el-button> </el-button>
<el-button v-if="scope.row.status!=1&&userList_btn_forbidden" size="small" class="el-button el-button--text el-button--small" style="color:red" @click="disable(scope.row)">设为禁用 <el-button v-if="scope.row.status==1&&userList_btn_unmute" size="small"
class="el-button el-button--text el-button--small" style="color:red" @click="available(scope.row)">
取消禁用
</el-button> </el-button>
<el-button v-if="scope.row.status==1&&userList_btn_unmute" size="small" class="el-button el-button--text el-button--small" style="color:red" @click="available(scope.row)">取消禁用 <el-button class="el-button el-button--text el-button--small" style="color:red" size="small"
v-if="userList_btn_del" @click="deleteUser(scope.row)">删除
</el-button> </el-button>
<el-button class="el-button el-button--text el-button--small" style="color:red" size="small" v-if="userList_btn_del" @click="deleteUser(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -154,7 +165,8 @@ ...@@ -154,7 +165,8 @@
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div> </div>
<!-- 用户详细信息窗口--> <!-- 用户详细信息窗口-->
<el-dialog title="用户详情" :visible.sync="detailsDialogFormVisible" type="text" label-width="95px" class="user-list-dialog"> <el-dialog title="用户详情" :visible.sync="detailsDialogFormVisible" type="text" label-width="95px"
class="user-list-dialog">
<el-form> <el-form>
<el-row> <el-row>
<el-form-item label="基础信息"> <el-form-item label="基础信息">
...@@ -302,12 +314,12 @@ ...@@ -302,12 +314,12 @@
<!-- 设置会员信息窗口--> <!-- 设置会员信息窗口-->
<el-dialog title="设置会员信息" @change="change" :visible.sync="setMemberArea" class="member"> <el-dialog title="设置会员信息" @change="change" :visible.sync="setMemberArea" class="member">
<el-form :model="userMembershipInformation" ref="userMembership" label-width="100px"> <el-form :model="userMembershipInformation" :rules="rules" ref="userMembership" label-width="100px">
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="会员等级" prop="memberLevel"> <el-form-item label="会员等级" prop="memberLevel">
<el-select class="filter-item" v-model="userMembershipInformation.memberLevel" placeholder="请选择会员等级"> <el-select class="filter-item" v-model="userMembershipInformation.memberLevel" 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 setMemberLevelList " :key="val.id" :label="val.name" <el-option v-for="(val, key, index) in setMemberLevelList " :key="val.id" :label="val.name"
:value="val.id"></el-option> :value="val.id"></el-option>
</el-select> </el-select>
...@@ -318,7 +330,7 @@ ...@@ -318,7 +330,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="有效期" prop="validTime"> <el-form-item label="有效期" prop="validTime">
<el-radio-group v-model="validityType"> <el-radio-group v-model="validityType">
<!-- <el-radio-button style="margin-bottom: 10px;" label="无"></el-radio-button>--> <!-- <el-radio-button style="margin-bottom: 10px;" label="无"></el-radio-button>-->
<el-radio-button style="margin-bottom: 10px;" label="永久"></el-radio-button> <el-radio-button style="margin-bottom: 10px;" label="永久"></el-radio-button>
<el-radio-button style="margin-bottom: 10px;" label="自定义"></el-radio-button> <el-radio-button style="margin-bottom: 10px;" label="自定义"></el-radio-button>
</el-radio-group> </el-radio-group>
...@@ -336,22 +348,23 @@ ...@@ -336,22 +348,23 @@
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="充值次数/次" prop="buyCount"> <el-form-item label="充值次数/次" prop="buyCount">
<el-input type="text" :disabled="true" v-model="userMembershipInformation.buyCount" <el-input type="number" :disabled="true" v-model="userMembershipInformation.buyCount"
placeholder="请填写充值次数"></el-input> placeholder="请填写充值次数"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="总天数" prop="totalNumber"> <el-form-item label="总天数" prop="totalNumber">
<el-input type="text" v-model="userMembershipInformation.totalNumber" placeholder="请填写赠送天数" v-enterNumber></el-input> <el-input type="number" v-model="userMembershipInformation.totalNumber" min="0" placeholder="请填写总天数"
v-enterNumber></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="剩余天数/天" prop="rentFreeDays" placeholder="请填写剩余天数"> <el-form-item label="剩余天数" prop="rentFreeDays">
<el-input type="text" v-model="userMembershipInformation.rentFreeDays" v-enterNumber></el-input> <el-input type="number" v-model="userMembershipInformation.rentFreeDays" min="0" v-enterNumber placeholder="请填写剩余天数"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -366,7 +379,9 @@ ...@@ -366,7 +379,9 @@
<el-dialog title="身份设置" :visible.sync="peopleSettingModal" width="10%"> <el-dialog title="身份设置" :visible.sync="peopleSettingModal" width="10%">
<el-form :model="peopleSettingObject" ref="" label-width="100px"> <el-form :model="peopleSettingObject" ref="" label-width="100px">
<el-form-item label="身份类型"> <el-form-item label="身份类型">
<el-radio v-model="peopleSettingObject.positionId" :label='item.id' v-for="(item,index) in settingList" :key="index">{{item.name}}</el-radio> <el-radio v-model="peopleSettingObject.positionId" :label='item.id' v-for="(item,index) in settingList"
:key="index">{{item.name}}
</el-radio>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -426,7 +441,9 @@ ...@@ -426,7 +441,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-button class="filter-item" type="primary" v-waves icon="search" @click="userOrder" style="margin-left: 10px;">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="userOrder"
style="margin-left: 10px;">搜索
</el-button>
</el-col> </el-col>
</el-row> </el-row>
...@@ -540,13 +557,14 @@ ...@@ -540,13 +557,14 @@
getrewardSetting getrewardSetting
} from 'api/purseManage'; } from 'api/purseManage';
import {formatDate} from "../../../utils/dateFormattor"; import {formatDate} from "../../../utils/dateFormattor";
import {getMembers} from "src/api/admin/member/index" import {getMembers} from "src/api/admin/member/index"
export default { export default {
name: 'appUser', name: 'appUser',
data() { data() {
return { return {
inline:true, inline: true,
peopleSettingModal:false, peopleSettingModal: false,
orderData: [], orderData: [],
validTime: '', validTime: '',
userMembershipInformation: { userMembershipInformation: {
...@@ -558,22 +576,22 @@ ...@@ -558,22 +576,22 @@
id: undefined, id: undefined,
userId: undefined userId: undefined
}, },
peopleSettingObject:{ peopleSettingObject: {
id:'', id: '',
positionId:undefined positionId: undefined
}, },
saveUserId: undefined, saveUserId: undefined,
validityType: '无', validityType: '无',
userOrderMessage: {}, userOrderMessage: {},
mobileList: [{id: 1, name: 'app'}, {id: 2, name: "小程序"}], mobileList: [{id: 1, name: 'app'}, {id: 2, name: "小程序"}],
queryMemberLevelList: [{id: -1, name: '全部会员'}], queryMemberLevelList: [{id: -1, name: '全部会员'}],
postionStatelList:[ postionStatelList: [
{ {
id:6, id: 6,
name:'普通用户' name: '普通用户'
},{ }, {
id:1, id: 1,
name:'非普通用户' name: '非普通用户'
} }
], ],
setMemberLevelList: [], setMemberLevelList: [],
...@@ -588,8 +606,8 @@ ...@@ -588,8 +606,8 @@
{id: 7, name: '已完成'} {id: 7, name: '已完成'}
], ],
orderTypeList: [ orderTypeList: [
{id: 1, name: '旅游'}, {id: 1, name: '租车'},
{id: 2, name: '租车'}, {id: 2, name: '旅游'},
{id: 3, name: '会员订单'} {id: 3, name: '会员订单'}
], ],
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
...@@ -619,6 +637,11 @@ ...@@ -619,6 +637,11 @@
type: undefined, type: undefined,
status: undefined status: undefined
}, },
rules: {
totalNumber: [this.integerValidator()],
rentFreeDays: [this.integerValidator()]
},
newMemberObjectVerify: { newMemberObjectVerify: {
phone: [ phone: [
{ {
...@@ -660,11 +683,11 @@ ...@@ -660,11 +683,11 @@
channel: undefined, channel: undefined,
registrationTimeEnd: undefined, registrationTimeEnd: undefined,
registrationTimeBegin: undefined, registrationTimeBegin: undefined,
postionState:undefined, postionState: undefined,
}, },
sexObj:{ sexObj: {
1:'女', 1: '女',
2:'男' 2: '男'
}, },
source: { source: {
0: '自来', 0: '自来',
...@@ -684,8 +707,8 @@ ...@@ -684,8 +707,8 @@
6: '已完成', 6: '已完成',
}, },
orderType: { orderType: {
1: '旅游', 1: '租车',
2: '租车', 2: '旅游',
3: '会员订单' 3: '会员订单'
}, },
detailsDialogFormVisible: false, detailsDialogFormVisible: false,
...@@ -703,18 +726,18 @@ ...@@ -703,18 +726,18 @@
selectedAccItem: undefined, selectedAccItem: undefined,
userList_btn_edit: false,//编辑 userList_btn_edit: false,//编辑
userList_btn_forbidden: false,//禁用 userList_btn_forbidden: false,//禁用
userList_btn_unmute:false,//取消禁用 userList_btn_unmute: false,//取消禁用
userList_btn_del: false,//删除 userList_btn_del: false,//删除
admin_btn_user_postion_put:false,//身份设置 admin_btn_user_postion_put: false,//身份设置
settingList:[], settingList: [],
} }
}, },
created() { created() {
this.userList_btn_edit=this.elements['userList:btn_edit'];//编辑 this.userList_btn_edit = this.elements['userList:btn_edit'];//编辑
this.userList_btn_forbidden=this.elements['userList:btn_forbidden'];//禁用 this.userList_btn_forbidden = this.elements['userList:btn_forbidden'];//禁用
this.userList_btn_unmute=this.elements['userList:btn_unmute'];//取消禁用 this.userList_btn_unmute = this.elements['userList:btn_unmute'];//取消禁用
this.userList_btn_del=this.elements['userList:btn_del'];//删除 this.userList_btn_del = this.elements['userList:btn_del'];//删除
this.admin_btn_user_postion_put=this.elements['admin:btn:user_postion:put'];//身份设置 this.admin_btn_user_postion_put = this.elements['admin:btn:user_postion:put'];//身份设置
this.getList(); this.getList();
this.getMembersLevel(); this.getMembersLevel();
} }
...@@ -735,19 +758,19 @@ ...@@ -735,19 +758,19 @@
}, },
methods: { methods: {
getMembersLevel(){ getMembersLevel() {
var _this = this; var _this = this;
getMembers().then(res=>{ getMembers().then(res => {
let members = res.data let members = res.data
// console.log('getMembersLevel:{}'+JSON.stringify(members)) // console.log('getMembersLevel:{}'+JSON.stringify(members))
// debugger // debugger
members.map(function (ele) { members.map(function (ele) {
_this.queryMemberLevelList.push({id:ele.level,name:ele.name}) _this.queryMemberLevelList.push({id: ele.level, name: ele.name})
_this.setMemberLevelList.push({id:ele.level,name:ele.name}) _this.setMemberLevelList.push({id: ele.level, name: ele.name})
}) })
// console.log('this.queryMemberLevelList'+JSON.stringify(this.queryMemberLevelList)) // console.log('this.queryMemberLevelList'+JSON.stringify(this.queryMemberLevelList))
} }
) )
}, },
...@@ -832,10 +855,10 @@ ...@@ -832,10 +855,10 @@
let query = JSON.parse(JSON.stringify(this.listQuery)) let query = JSON.parse(JSON.stringify(this.listQuery))
query.source = query.source ? query.source - 1 : '' query.source = query.source ? query.source - 1 : ''
// console.log('handleFilterStatus:this.listQuery=' + JSON.stringify(this.listQuery)) // console.log('handleFilterStatus:this.listQuery=' + JSON.stringify(this.listQuery))
query.registrationTimeBegin =this.listQuery.registrationTimeBegin query.registrationTimeBegin = this.listQuery.registrationTimeBegin
?(new Date(query.registrationTimeBegin).getTime()) / 1000:undefined ? (new Date(query.registrationTimeBegin).getTime()) / 1000 : undefined
query.registrationTimeEnd = this.listQuery.registrationTimeEnd query.registrationTimeEnd = this.listQuery.registrationTimeEnd
? (new Date( query.registrationTimeEnd).getTime()) / 1000:undefined ? (new Date(query.registrationTimeEnd).getTime()) / 1000 : undefined
// //
// console.log('handleFilterEnd:this.listQuery=' + JSON.stringify(this.listQuery)) // console.log('handleFilterEnd:this.listQuery=' + JSON.stringify(this.listQuery))
// console.log('query================' + JSON.stringify(query)) // console.log('query================' + JSON.stringify(query))
...@@ -857,14 +880,14 @@ ...@@ -857,14 +880,14 @@
listKey.timeOfMembership = listKey.timeOfMembership ? timestamp2Date(listKey.timeOfMembership) : ''; listKey.timeOfMembership = listKey.timeOfMembership ? timestamp2Date(listKey.timeOfMembership) : '';
listKey.recentRecharge = listKey.recentRecharge ? timestamp2Date(listKey.recentRecharge) : ''; listKey.recentRecharge = listKey.recentRecharge ? timestamp2Date(listKey.recentRecharge) : '';
listKey.lastTime = listKey.lastTime ? timestamp2Date(listKey.lastTime) : ''; listKey.lastTime = listKey.lastTime ? timestamp2Date(listKey.lastTime) : '';
listKey.createTime = listKey.createTime ? timestamp2Date(listKey.createTime*1000) : ''; listKey.createTime = listKey.createTime ? timestamp2Date(listKey.createTime * 1000) : '';
listKey.buyCount = listKey.buyCount ? listKey.buyCount : 0; listKey.buyCount = listKey.buyCount ? listKey.buyCount : 0;
listKey.channel = this.terminal[listKey.channel]; listKey.channel = this.terminal[listKey.channel];
listKey.source = this.source[listKey.source]; listKey.source = this.source[listKey.source];
listKey.validTime = listKey.validTime ? ((listKey.validTime == 0) ? '永久' : listKey.validTime) : '无'; listKey.validTime = listKey.validTime ? ((listKey.validTime == 0) ? '永久' : listKey.validTime) : '无';
listKey.visible2 =false listKey.visible2 = false
listKey.sex=(listKey.sex+1)?this.sexObj[(listKey.sex+1)]:'' listKey.sex = (listKey.sex + 1) ? this.sexObj[(listKey.sex + 1)] : ''
}, },
/** /**
...@@ -916,28 +939,28 @@ ...@@ -916,28 +939,28 @@
this.saveUserId = row.userId this.saveUserId = row.userId
getUserMemberByUserId(row.userId).then(response => { getUserMemberByUserId(row.userId).then(response => {
if (response.data){ if (response.data) {
if (response.data.validTime == 0) { if (response.data.validTime == 0) {
this.validityType = '永久' this.validityType = '永久'
} else if (response.data.validTime&&response.data.validTime !=-1) { } else if (response.data.validTime && response.data.validTime != -1) {
this.validityType = '自定义' this.validityType = '自定义'
response.data.validTime = timestamp2Date(response.data.validTime) response.data.validTime = timestamp2Date(response.data.validTime)
} }
// else if (response.data.validTime == -1) { // else if (response.data.validTime == -1) {
// this.validityType = '无' // this.validityType = '无'
// } // }
this.validTime = response.data.validTime; this.validTime = response.data.validTime;
this.userMembershipInformation.memberLevel = response.data.memberLevel; this.userMembershipInformation.memberLevel = response.data.memberLevel?response.data.memberLevel:'';
this.userMembershipInformation.validTime = response.data.validTime; this.userMembershipInformation.validTime = response.data.validTime;
this.userMembershipInformation.totalNumber = response.data.totalNumber; this.userMembershipInformation.totalNumber = response.data.totalNumber;
this.userMembershipInformation.rentFreeDays = response.data.rentFreeDays; this.userMembershipInformation.rentFreeDays = response.data.rentFreeDays;
this.userMembershipInformation.buyCount = response.data.buyCount; this.userMembershipInformation.buyCount = response.data.buyCount;
this.userMembershipInformation.id = response.data.id; this.userMembershipInformation.id = response.data.id;
// this.userMembershipInformation.memberLevel= this.userMembershipInformation.memberLevel?this.userMembershipInformation.memberLevel:undefined // this.userMembershipInformation.memberLevel= this.userMembershipInformation.memberLevel?this.userMembershipInformation.memberLevel:undefined
} }
this.setMemberArea = true this.setMemberArea = true
}) })
console.log('this.userMembershipInformation:'+JSON.stringify(this.userMembershipInformation)) // console.log('this.userMembershipInformation:' + JSON.stringify(this.userMembershipInformation))
this.userMembershipInformation.userId = this.saveUserId this.userMembershipInformation.userId = this.saveUserId
}, },
/** /**
...@@ -945,44 +968,49 @@ ...@@ -945,44 +968,49 @@
* @param formName * @param formName
*/ */
saveMember(formName) { saveMember(formName) {
if(Number(this.userMembershipInformation.totalNumber)<Number(this.userMembershipInformation.rentFreeDays)){ // if (this.$utils.isInteger(this.userMembershipInformation.totalNumber) ||
this.$notify({ // this.$utils.isInteger(this.userMembershipInformation.rentFreeDays) ||
title: '警告', // (this.userMembershipInformation.totalNumber && this.userMembershipInformation.rentFreeDays)) {
message: '剩余天数不能大于总天数',
type: 'warning',
duration: 2000
});
return false
}
if (this.validityType == '永久') {
this.userMembershipInformation.validTime = 0
} else if (this.validityType == '自定义') {
let date = new Date(this.validTime);
this.userMembershipInformation.validTime = date.getTime()
}
// else {
// this.userMembershipInformation.validTime = -1
// }
this.userMembershipInformation.userId = this.saveUserId if (Number(this.userMembershipInformation.totalNumber) < Number(this.userMembershipInformation.rentFreeDays)) {
this.userMembershipInformation.buyCount=undefined; this.$notify({
// console.log('userMembershipInformation:' + JSON.stringify(this.userMembershipInformation)) title: '警告',
seveObj(this.userMembershipInformation).then(res => { message: '剩余天数不能大于总天数',
if (res.rel) { type: 'warning',
this.$notify.success({ duration: 2000
title: '修改成功', });
message: `success` return false
})
} else {
this.$notify.warning({
title: '修改成功',
message: `failed`
})
} }
this.setMemberArea = false if (this.validityType == '永久') {
this.$refs[formName].resetFields() this.userMembershipInformation.validTime = 0
this.getList(); } else if (this.validityType == '自定义') {
}) let date = new Date(this.validTime);
this.userMembershipInformation.validTime = date.getTime()
}
// else {
// this.userMembershipInformation.validTime = -1
// }
this.userMembershipInformation.userId = this.saveUserId
this.userMembershipInformation.buyCount = undefined;
// console.log('userMembershipInformation:' + JSON.stringify(this.userMembershipInformation))
seveObj(this.userMembershipInformation).then(res => {
if (res.rel) {
this.$notify.success({
title: '修改成功',
message: `success`
})
} else {
this.$notify.warning({
title: '修改失败',
message: `failed`
})
}
this.setMemberArea = false
this.$refs[formName].resetFields()
this.getList();
})
// }
}, },
/** /**
* 显示新增会员窗口 * 显示新增会员窗口
...@@ -1050,10 +1078,10 @@ ...@@ -1050,10 +1078,10 @@
closeMembershipWindow() { closeMembershipWindow() {
this.detailsDialogFormVisible = false; this.detailsDialogFormVisible = false;
}, },
cancelPeopleSetting(){ cancelPeopleSetting() {
this.peopleSettingModal = false; this.peopleSettingModal = false;
}, },
setPeopleSetting(){ setPeopleSetting() {
userPosition(this.peopleSettingObject).then(response => { userPosition(this.peopleSettingObject).then(response => {
if (response.status == 200) { if (response.status == 200) {
this.$notify({ this.$notify({
...@@ -1064,7 +1092,7 @@ ...@@ -1064,7 +1092,7 @@
}); });
this.peopleSettingModal = false; this.peopleSettingModal = false;
this.getList(); this.getList();
}else{ } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
message: response.message, message: response.message,
...@@ -1074,17 +1102,17 @@ ...@@ -1074,17 +1102,17 @@
} }
}); });
}, },
peopleSetting(row){ peopleSetting(row) {
var that = this; var that = this;
this.peopleSettingObject.id = row.userId; this.peopleSettingObject.id = row.userId;
getrewardSetting().then(response => { getrewardSetting().then(response => {
this.settingList = response.data; this.settingList = response.data;
response.data.forEach(function(item){ response.data.forEach(function (item) {
if(row.positionName){ if (row.positionName) {
if(row.positionName==item.name){ if (row.positionName == item.name) {
that.peopleSettingObject.positionId = item.id; that.peopleSettingObject.positionId = item.id;
} }
}else{ } else {
that.peopleSettingObject.positionId = 1; that.peopleSettingObject.positionId = 1;
} }
}) })
...@@ -1211,26 +1239,26 @@ ...@@ -1211,26 +1239,26 @@
cleaningQuery() { cleaningQuery() {
this.listQuery.page = 1 this.listQuery.page = 1
this.listQuery.limit = 20 this.listQuery.limit = 20
this.listQuery.mobileList = undefined this.listQuery.mobileList = undefined
this.listQuery.mobile = undefined this.listQuery.mobile = undefined
this.listQuery.memberLevel = undefined this.listQuery.memberLevel = undefined
this.listQuery.source = undefined this.listQuery.source = undefined
this.listQuery.channel = undefined this.listQuery.channel = undefined
this.listQuery.registrationTimeEnd = undefined this.listQuery.registrationTimeEnd = undefined
this.listQuery.registrationTimeBegin = undefined this.listQuery.registrationTimeBegin = undefined
this.listQuery.postionState = undefined this.listQuery.postionState = undefined
}, },
change() { change() {
this.$forceUpdate() this.$forceUpdate()
}, },
deleteUser(row){ deleteUser(row) {
this.$confirm('确定删除吗?', '提示', { this.$confirm('确定删除吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteUser(row.userId).then( deleteUser(row.userId).then(
res=>{ res => {
if (res.rel) { if (res.rel) {
this.$notify.success({ this.$notify.success({
title: '删除成功', title: '删除成功',
...@@ -1245,7 +1273,21 @@ ...@@ -1245,7 +1273,21 @@
this.getList() this.getList()
}) })
}) })
} },
integerValidator: function () {
return {
validator: (rule, value, callback) => {
if (this.$utils.isUndefined(value) || this.$utils.isNull()) {
return callback();
}
if (!this.$utils.isInteger(value)) {
return callback(new Error('必须为整数'));
}
callback();
},
trigger: 'blur'
};
},
} }
} }
</script> </script>
...@@ -1253,7 +1295,8 @@ ...@@ -1253,7 +1295,8 @@
.member .el-dialog--small { .member .el-dialog--small {
width: 500px; width: 500px;
} }
.user-list-dialog .el-form-item{
.user-list-dialog .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
</style> </style>
......
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