fix 添加页面筛选

template/admin/src/pages/user/list/index.vue

@@ -32,20 +32,22 @@
                     :label="item.name"
                   ></el-option>
                 </el-select>
-              </el-form-item>
-             <!-- <el-form-item label="用户分组：">
-                <el-select v-model="group_id" placeholder="请选择用户分组" clearable class="form_content_width">
+              </el-form-item>-->
+             <!--<el-form-item label="用户角色：">
+                <el-select v-model="role_id" placeholder="请选择用户分组" clearable class="form_content_width">
                   <el-option value="all" label="全部"></el-option>
-                  <el-option
+                <el-option
                     :value="item.id"
-                    v-for="(item, index) in groupList"
+                    v-for="(item, index) in roleList"
                     :key="index"
-                    :label="item.group_name"
+                    :label="item.role_name"
                   ></el-option>
                 </el-select>
               </el-form-item>-->
             </div>
             <el-form-item class="search-form-sub">
+              <el-button type="danger" v-if="scoreSort" @click="doScoreSort(false)">取消排序</el-button>
+               <el-button type="primary" v-if="!scoreSort" @click="doScoreSort(true)">积分排序</el-button>
               <el-button type="primary" v-db-click @click="userSearchs">搜索</el-button>
               <el-button class="ResetSearch" v-db-click @click="reset('userFrom')">重置</el-button>
             <!--  <a class="ivu-ml-8 font12 ml10" v-db-click @click="collapse = !collapse">
@@ -77,17 +79,17 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="用户分组：">
-                <el-select v-model="group_id" placeholder="请选择用户分组" clearable class="form_content_width">
+              <!--<el-form-item label="用户角色：">
+                <el-select v-model="role_id" placeholder="请选择用户角色" clearable class="form_content_width">
                   <el-option value="all" label="全部"></el-option>
                   <el-option
                     :value="item.id"
-                    v-for="(item, index) in groupList"
+                    v-for="(item, index) in roleList"
                     :key="index"
-                    :label="item.group_name"
+                    :label="item.role_name"
                   ></el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item>-->
               <el-form-item label="分销等级：">
                 <el-select v-model="agent_level" placeholder="请选择分销等级" clearable class="form_content_width">
                   <el-option value="all" label="全部"></el-option>
@@ -276,7 +278,7 @@
       </div>
     </el-card>
     <el-card :bordered="false" shadow="never" class="ivu-mt mt16" :body-style="{ padding: '0 20px 20px' }">
-      <el-tabs v-model="userFrom.user_type" @tab-click="onClickTab">
+      <el-tabs v-model="userFrom.goods_user_type" @tab-click="onClickTab">
         <el-tab-pane :label="item.name" :name="item.type" v-for="(item, index) in headeNum" :key="index" />
       </el-tabs>
       <!--<el-row :gutter="24" justify="space-between">
@@ -566,6 +568,23 @@ export default {
   },
   data() {
     return {
+      role_id:0 ,
+      scoreSort:false,
+      roleList:[{
+        id:0,
+        role_name:'全部'
+      },{
+        id:1,
+        role_name:'普通用户'
+      },
+        {
+          id:2,
+          role_name:'业务员'
+        },
+        {
+          id:3,
+          role_name:'经销商'
+        }],
       dataLabel: [],
       selectDataLabel: [],
       userData: {},
@@ -585,10 +604,9 @@ export default {
       pickerOptions: this.$timeOptions,
       collapse: false,
       headeNum: [
-        { type: '', name: '全部' },
-        // { type: 'wechat', name: '微信公众号' },
-        // { type: 'routine', name: '微信小程序' },
-        // { type: 'h5', name: 'H5' },
+        { type: '0', name: '普通用户' },
+        { type: '1', name: '业务员' },
+        { type: '2', name: '经销商' },
         // { type: 'pc', name: 'PC' },
         // { type: 'app', name: 'APP' },
       ],
@@ -618,7 +636,7 @@ export default {
       total: 0,
       userFrom: {
         label_id: '',
-        user_type: '',
+        goods_user_type: '-1',
         status: '',
         sex: '',
         is_promoter: '',
@@ -682,6 +700,10 @@ export default {
     // this.groupLists();
   },
   methods: {
+    doScoreSort(flag){
+      this.scoreSort = flag;
+      this.userSearchs();
+    },
     getUserRole(roleName){
       if(roleName == null){
         roleName = 0;
@@ -1070,7 +1092,8 @@ export default {
       //   });
       //   this.userFrom.label_id = activeIds.join(',');
       // }
-      this.userFrom.user_type = this.userFrom.user_type || '';
+      this.userFrom.score_sort = this.scoreSort? 1 : 0 ;
+      this.userFrom.goods_user_type = this.userFrom.goods_user_type == -1 ? '' : this.userFrom.goods_user_type;
       this.userFrom.status = this.userFrom.status || '';
       this.userFrom.sex = this.userFrom.sex || '';
       this.userFrom.is_promoter = this.userFrom.is_promoter || '';
@@ -1081,6 +1104,7 @@ export default {
       this.userFrom.level = this.level === 'all' ? '' : this.level;
       this.userFrom.group_id = this.group_id === 'all' ? '' : this.group_id;
       this.userFrom.agent_level = this.agent_level === 'all' ? '' : this.agent_level;
+      this.userFrom.user_type = ''
       this.loading = true;
       userList(this.userFrom)
         .then(async (res) => {