新增已消耗筛选

src/views/accounts/caiwutongji/commission/index.vue

@@ -138,12 +138,12 @@
                 <el-table-column label="当前身份" min-width="130" >
                   <template slot-scope="scope">
                       <span v-if="scope.row.user_group == 1"> 消费者 </span>
-                      <span v-if="scope.row.user_group == 2"> V客 </span>
-                      <span v-if="scope.row.user_group == 3"> 大V经理 </span>
-                      <span v-if="scope.row.user_group == 4"> 创客 </span>
-                      <span v-if="scope.row.user_group == 5"> 区县代理 </span>
-                      <span v-if="scope.row.user_group == 6"> 省级代理 </span>
-
+                      <span v-if="scope.row.user_group == 2"> 业务员 </span>
+                      <span v-if="scope.row.user_group == 3"> 业务经理 </span>
+                      <span v-if="scope.row.user_group == 4"> 初级合伙人 </span>
+                      <span v-if="scope.row.user_group == 5"> 中级合伙人 </span>
+                      <span v-if="scope.row.user_group == 6"> 高级合伙人 </span>
+                      <span v-if="scope.row.user_group == 7"> 董事 </span>
                   </template>
                 </el-table-column>
                 <!-- <el-table-column label="隶属团队" min-width="130" prop="team_account"/> -->

src/views/accounts/caiwutongji/fugou/index.vue

@@ -37,6 +37,7 @@
                         <el-option label="有效" value="1" />
                         <el-option label="待确认" value="-1" />
                         <el-option label="已失效" value="0" />
+                        <el-option label="已消耗" value="99" />
                       </el-select>
                     </el-form-item>
 

src/views/accounts/caiwutongji/jingdou/index.vue

@@ -37,6 +37,7 @@
                         <el-option label="有效" value="1" />
                         <el-option label="待确认" value="-1" />
                         <el-option label="已失效" value="0" />
+                        <el-option label="已消耗" value="99" />
                       </el-select>
                     </el-form-item>
 

src/views/accounts/caiwutongji/point/index.vue

@@ -37,6 +37,7 @@
                         <el-option label="已结算" value="1" />
                         <el-option label="未结算" value="-1" />
                         <el-option label="已失效" value="0" />
+                        <el-option label="已消耗" value="99" />
                       </el-select>
                     </el-form-item>
 

src/views/accounts/caiwutongji/vr/index.vue

@@ -34,7 +34,7 @@
                         @change="getList(1)"
                       >
                         <el-option label="全部" value="" />
-                        <el-option label="兑换" value="1" />
+                        <el-option label="转入" value="1" />
                         <el-option label="消耗" value="2" />
                       </el-select>
                     </el-form-item>
@@ -71,7 +71,7 @@
             <el-table-column label="VR数" prop="number"  min-width="130" />
             <el-table-column label="vr类型" prop="type"  min-width="130">
               <template slot-scope="scope">
-                <span v-if="scope.row.type == 1">兑换</span>  
+                <span v-if="scope.row.type == 1">转入</span>  
                 <span v-if="scope.row.type == 2">消耗</span>
               </template>
             </el-table-column>
@@ -318,8 +318,8 @@ export default {
                 this.tableData.total = res.data.count;
 
                 this.cardLists = [
-                  { info: '', name: 'VR奖励总数', count: res.data.statistics.all },
-                  // { info: '', name: '兑换总数', count: res.data.statistics.clear },
+                  { info: '', name: '转入VR总数', count: res.data.statistics.all },
+                  // { info: '', name: '转入总数', count: res.data.statistics.clear },
                   { info: '', name: '已消耗VR', count: res.data.statistics.nclear },
                   // { info: '', name: '已失效VR', count: res.data.statistics.lost },
                   // {info: '', name: 'VR扣减总数', count: res.data.statistics.deduct},