|
@@ -6,7 +6,7 @@
|
|
|
class="filter-select"
|
|
class="filter-select"
|
|
|
v-model="filters.pageVo.userType"
|
|
v-model="filters.pageVo.userType"
|
|
|
placeholder="All User Type"
|
|
placeholder="All User Type"
|
|
|
- @change="onClickSearch"
|
|
|
|
|
|
|
+ @change="changeUserType"
|
|
|
clearable>
|
|
clearable>
|
|
|
<el-option
|
|
<el-option
|
|
|
v-for="item in userTypes"
|
|
v-for="item in userTypes"
|
|
@@ -14,6 +14,19 @@
|
|
|
:label="item"
|
|
:label="item"
|
|
|
:value="item" />
|
|
:value="item" />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ class="filter-select"
|
|
|
|
|
+ :class="{hide: groupList.length == 0}"
|
|
|
|
|
+ v-model="filters.pageVo.groupPk"
|
|
|
|
|
+ placeholder="Group Name"
|
|
|
|
|
+ @change="onClickSearch"
|
|
|
|
|
+ clearable>
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="(item,index) in groupList"
|
|
|
|
|
+ :key="index"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.value"/>
|
|
|
|
|
+ </el-select>
|
|
|
<el-select
|
|
<el-select
|
|
|
class="filter-select"
|
|
class="filter-select"
|
|
|
v-model="filters.pageVo.accountStatus"
|
|
v-model="filters.pageVo.accountStatus"
|
|
@@ -34,7 +47,7 @@
|
|
|
placeholder="Email, Name, License Plate"
|
|
placeholder="Email, Name, License Plate"
|
|
|
@change="onClickSearch"
|
|
@change="onClickSearch"
|
|
|
clearable/>
|
|
clearable/>
|
|
|
- <div>
|
|
|
|
|
|
|
+ <div v-if="false">
|
|
|
<el-button
|
|
<el-button
|
|
|
@click="onClickSearch"
|
|
@click="onClickSearch"
|
|
|
icon="el-icon-search"
|
|
icon="el-icon-search"
|
|
@@ -228,6 +241,7 @@ export default {
|
|
|
pageNo: 1,
|
|
pageNo: 1,
|
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
|
pageVo: {
|
|
pageVo: {
|
|
|
|
|
+ groupPk: "",
|
|
|
criteria: "",
|
|
criteria: "",
|
|
|
userType: "",
|
|
userType: "",
|
|
|
accountStatus: ""
|
|
accountStatus: ""
|
|
@@ -244,6 +258,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
fileList: [],
|
|
fileList: [],
|
|
|
userTypes: [],
|
|
userTypes: [],
|
|
|
|
|
+ groupList: [],
|
|
|
actionTopup: {
|
|
actionTopup: {
|
|
|
row: {},
|
|
row: {},
|
|
|
visible: false
|
|
visible: false
|
|
@@ -287,6 +302,31 @@ export default {
|
|
|
})
|
|
})
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
|
|
+ changeUserType() {
|
|
|
|
|
+ this.filters.pageVo.groupPk = "";
|
|
|
|
|
+ this.getGroupOptions();
|
|
|
|
|
+ },
|
|
|
|
|
+ getGroupOptions() {
|
|
|
|
|
+ if (this.filters.pageVo.userType == "") {
|
|
|
|
|
+ this.groupList = [];
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ this.loading.table = true;
|
|
|
|
|
+ api.getGroupByType(this.filters.pageVo.userType).then(res => {
|
|
|
|
|
+ if (res.data) {
|
|
|
|
|
+ this.groupList = res.data
|
|
|
|
|
+ }
|
|
|
|
|
+ }).catch(err => {
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: err,
|
|
|
|
|
+ type: 'error'
|
|
|
|
|
+ })
|
|
|
|
|
+ }).finally(() => {
|
|
|
|
|
+ setTimeout(() => {
|
|
|
|
|
+ this.onClickSearch();
|
|
|
|
|
+ }, 100)
|
|
|
|
|
+ })
|
|
|
|
|
+ },
|
|
|
getTableData() {
|
|
getTableData() {
|
|
|
this.loading.table = true;
|
|
this.loading.table = true;
|
|
|
api.pageAppUsers(this.filters).then(res => {
|
|
api.pageAppUsers(this.filters).then(res => {
|
|
@@ -426,6 +466,13 @@ export default {
|
|
|
.filter-select {
|
|
.filter-select {
|
|
|
min-width: 100px;
|
|
min-width: 100px;
|
|
|
max-width: 180px;
|
|
max-width: 180px;
|
|
|
|
|
+ overflow: hidden;
|
|
|
|
|
+ transition: all .3s;
|
|
|
|
|
+ }
|
|
|
|
|
+ .filter-select.hide {
|
|
|
|
|
+ margin: 0;
|
|
|
|
|
+ min-width: 0;
|
|
|
|
|
+ max-width: 0;
|
|
|
}
|
|
}
|
|
|
.status-Pending {
|
|
.status-Pending {
|
|
|
color: $yellow;
|
|
color: $yellow;
|