??

src/components/body/department.vue

@@ -66,17 +66,21 @@
             </van-cell>
           </van-cell-group>
 
-          <div class="employee_item" :class="{'letter-first': index == 0 || (index > 0 && employee_list[index-1].letter_index != item.letter_index)}" v-for="(item,index) in employee_list " :key="index">
+          <div class="employee_item" :class="{'letter-first': index == 0 }" v-for="(item,index) in employee_list " :key="index">
             <van-cell class="employee_cell" :title="item.name">
               <template slot="icon">
                 <userImage  :user_name="item.name" :img_url="item.img_url" width="0.9rem" height="0.9rem" style="margin-right: 0.24rem;" ></userImage>
               </template>
               <template slot="title">
                 <Wxopendata type="userName" :openid="item.name"></Wxopendata>
+
               </template>
               <template slot="right-icon">
-                <van-tag plain v-if="item.manage_dept_ids.length>0" type="warning">主管</van-tag>
-                <van-tag plain v-if="item.status == 0">
+                <van-tag plain v-if="item.is_official == 1" type="success">
+                    <span>启用</span>
+                </van-tag>
+                <van-tag plain v-if="item.employee_detail.manage_dept_ids.length>0" type="warning">主管</van-tag>
+                <!-- <van-tag plain v-if="item.status == 0">
                     <span>未加入</span>
                 </van-tag>
                 <van-tag plain v-if="item.status == 2">
@@ -84,7 +88,7 @@
                 </van-tag>
                 <van-tag plain v-if="item.status == 3">
                     <span>再次邀请</span>
-                </van-tag>
+                </van-tag> -->
               </template>
             </van-cell>
           </div>
@@ -96,8 +100,8 @@
                     <img src='static/images/noPeople.png' style="width: 2.5rem;height: 2.5rem;"/>
                   </div>
                   <p class="text_center">暂无部门和人员</p>
-                  <p class="text_center">点击右上方的+</p>
-                   <p class="text_center">现加部门后加人</p>
+                  <!-- <p class="text_center">点击右上方的+</p>
+                   <p class="text_center">现加部门后加人</p> -->
                 </van-col>
               </van-row>
           </div>
@@ -137,6 +141,7 @@ export default {
   name: 'department',
   data () {
     return {
+      employeeList: [],
       bar_height: '',
       show_search_popup_: true,
       showDom: false,
@@ -426,7 +431,8 @@ export default {
     // 查询员工列表
     get_employee_list (d) {
       this.showLoading()
-      request('get', '/api/employee/list', {dept_id: this.deptId, page_size: 20000, keywords: this.keyOword}).then((res) => {
+      // request('get', '/api/employee/list', {dept_id: this.deptId, page_size: 20000, keywords: this.keyOword}).then((res) => {
+      request('get', '/api/employee/index', {dept_id: this.deptId, page_size: 20000, keywords: this.keyOword}).then((res) => {
         if (res.data.code == 1) {
           this.showDom = true
           this.employee_list = res.data.data.list
@@ -775,7 +781,7 @@ export default {
 }
 .employee_cell .van-tag{
   display: inline-table;
-  margin-top: 0.26rem;
+  margin: 0.26rem 0;
 }
 .employee_cell .van-tag+.van-tag{
   margin-left: 0.2rem;