Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_adminUI

src/views/fs/user/index.vue

@@ -51,13 +51,13 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="是否宠粉" align="center" prop="isRepeat">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.isRepeat === 1 ? 'success' : 'danger'">
-            {{ scope.row.status === 1 ? '是' : '否' }}
-          </el-tag>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="是否重粉" align="center" prop="isRepeat">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag :type="scope.row.isRepeat === 1 ? 'success' : 'danger'">-->
+<!--            {{ scope.row.status === 1 ? '是' : '否' }}-->
+<!--          </el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="看课数量" align="center" prop="watchCourseCount" />
       <el-table-column label="参与营期数量" align="center" prop="partCourseCount" />
       <el-table-column label="所属销售" align="center" prop="companyUserNickName" />
@@ -72,17 +72,17 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleQwAccount(scope.row)"
-            v-hasPermi="['fs:user:remove']"
-          >查看企微账号</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleQwAccount(scope.row)"-->
+<!--            v-hasPermi="['fs:user:remove']"-->
+<!--          >查看重粉列表</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination