vbea пре 2 година
родитељ
комит
dfc30d073e
2 измењених фајлова са 34 додато и 3 уклоњено
  1. 3 0
      Strides-Admin/src/http/api/apiUser.js
  2. 31 3
      Strides-Admin/src/views/user/index.vue

+ 3 - 0
Strides-Admin/src/http/api/apiUser.js

@@ -10,6 +10,9 @@ const apiUser = {
   getUserTypeOptions() {
     return get("device-user/user-types")
   },
+  getGroupStatusOptions() {
+    return get("device-user/membership-statuses")
+  },
   pageAppUsers(params) {
     return post("device-user/user-pages", params)
   },

+ 31 - 3
Strides-Admin/src/views/user/index.vue

@@ -27,6 +27,19 @@
             :label="item.name"
             :value="item.value"/>
         </el-select>
+        <el-select
+          class="filter-select"
+          :class="{hide: groupList.length == 0}"
+          v-model="filters.pageVo.membershipStatus"
+          placeholder="Application Status"
+          @change="onClickSearch"
+          clearable>
+          <el-option
+            v-for="(item,index) in groupStatus"
+            :key="index"
+            :label="item"
+            :value="item"/>
+        </el-select>
         <el-select
           class="filter-select"
           v-model="filters.pageVo.accountStatus"
@@ -244,7 +257,8 @@ export default {
           groupPk: "",
           criteria: "",
           userType: "",
-          accountStatus: ""
+          accountStatus: "",
+          membershipStatus: ""
         }
       },
       table: {
@@ -259,6 +273,7 @@ export default {
       fileList: [],
       userTypes: [],
       groupList: [],
+      groupStatus: [],
       actionTopup: {
         row: {},
         visible: false
@@ -282,8 +297,9 @@ export default {
     TopUp
   },
   created() {
-    this.getUserTypeOption()
-    this.onClickSearch()
+    this.getUserTypeOption();
+    this.getGroupStatusOption();
+    this.onClickSearch();
   },
   methods: {
     onClickSearch() {
@@ -327,6 +343,18 @@ export default {
         }, 100)
       })
     },
+    getGroupStatusOption() {
+      api.getGroupStatusOptions().then(res => {
+        if (res.data) {
+          this.groupStatus = res.data
+        }
+      }).catch(err => {
+        this.$message({
+          message: error,
+          type: 'error'
+        })
+      })
+    },
     getTableData() {
       this.loading.table = true;
       api.pageAppUsers(this.filters).then(res => {