|  | @@ -19,7 +19,7 @@
 | 
											
												
													
														|  |  			  </div>
 |  |  			  </div>
 | 
											
												
													
														|  |  			  <el-checkbox v-if="isChecKedAll" v-model="checked" @change="checkedChange" :indeterminate="indeterminate" >全选</el-checkbox>
 |  |  			  <el-checkbox v-if="isChecKedAll" v-model="checked" @change="checkedChange" :indeterminate="indeterminate" >全选</el-checkbox>
 | 
											
												
													
														|  |  		  </div>
 |  |  		  </div>
 | 
											
												
													
														|  | -          <el-scrollbar wrap-class="column-wrapper scrollable-items-container" :native="false" style="height: 354px;">
 |  | 
 | 
											
												
													
														|  | 
 |  | +          <el-scrollbar wrap-class="column-wrapper scrollable-items-container" :native="false" style="height: 354px;" v-loading="table_loading">
 | 
											
												
													
														|  |              <div class="choose_left">
 |  |              <div class="choose_left">
 | 
											
												
													
														|  |                <a href="javascript:void(0)" v-for="(item,index) in dept_list" :key="index">
 |  |                <a href="javascript:void(0)" v-for="(item,index) in dept_list" :key="index">
 | 
											
												
													
														|  |                  <div class="employee_cell" @click="select_dept(item)" v-show="item.pid == pid && item.name.indexOf(keyword) >= 0 && dept_not_select.indexOf(item.id) < 0">
 |  |                  <div class="employee_cell" @click="select_dept(item)" v-show="item.pid == pid && item.name.indexOf(keyword) >= 0 && dept_not_select.indexOf(item.id) < 0">
 | 
											
										
											
												
													
														|  | @@ -41,16 +41,14 @@
 | 
											
												
													
														|  |                <div class="persons_box" style="padding-top:4px;">
 |  |                <div class="persons_box" style="padding-top:4px;">
 | 
											
												
													
														|  |                  <a class="employee_cell_a" href="javascript:void(0)" v-for="(item,index) in list" :key="index" v-show="item.show">
 |  |                  <a class="employee_cell_a" href="javascript:void(0)" v-for="(item,index) in list" :key="index" v-show="item.show">
 | 
											
												
													
														|  |                    <div class="employee_cell flex-box flex-v-ce" v-if="can_select_employee" @click.prevent.stop="select_employee(item)" v-show="employee_not_select.indexOf(item.id) < 0">
 |  |                    <div class="employee_cell flex-box flex-v-ce" v-if="can_select_employee" @click.prevent.stop="select_employee(item)" v-show="employee_not_select.indexOf(item.id) < 0">
 | 
											
												
													
														|  | -					
 |  | 
 | 
											
												
													
														|  | -					<div class="employee_checkbox">
 |  | 
 | 
											
												
													
														|  | 
 |  | +					          <div class="employee_checkbox">
 | 
											
												
													
														|  |                        <el-checkbox v-model="item.checked"></el-checkbox>
 |  |                        <el-checkbox v-model="item.checked"></el-checkbox>
 | 
											
												
													
														|  |                      </div>
 |  |                      </div>
 | 
											
												
													
														|  | -					<userImage :user_name="item.name" :img_url="item.img_url" width="30px" height="30px"></userImage>
 |  | 
 | 
											
												
													
														|  | 
 |  | +					            <userImage :user_name="item.name" :img_url="item.img_url" width="30px" height="30px"></userImage>
 | 
											
												
													
														|  |                      <div class="employee_name">
 |  |                      <div class="employee_name">
 | 
											
												
													
														|  |                        {{item.name}}
 |  |                        {{item.name}}
 | 
											
												
													
														|  |                      </div>
 |  |                      </div>
 | 
											
												
													
														|  |                      <div class="employee_cell_clear"></div>
 |  |                      <div class="employee_cell_clear"></div>
 | 
											
												
													
														|  | -					
 |  | 
 | 
											
												
													
														|  |                    </div>
 |  |                    </div>
 | 
											
												
													
														|  |                  </a>
 |  |                  </a>
 | 
											
												
													
														|  |                </div>
 |  |                </div>
 | 
											
										
											
												
													
														|  | @@ -170,6 +168,7 @@
 | 
											
												
													
														|  |        let selected = JSON.parse(JSON.stringify(this.selected))
 |  |        let selected = JSON.parse(JSON.stringify(this.selected))
 | 
											
												
													
														|  |        let user_no_select = JSON.parse(JSON.stringify(this.user_no_select))
 |  |        let user_no_select = JSON.parse(JSON.stringify(this.user_no_select))
 | 
											
												
													
														|  |        return {
 |  |        return {
 | 
											
												
													
														|  | 
 |  | +        table_loading:false,
 | 
											
												
													
														|  |          dialogVisible: true,
 |  |          dialogVisible: true,
 | 
											
												
													
														|  |          employee_selected_list: selected.employee,
 |  |          employee_selected_list: selected.employee,
 | 
											
												
													
														|  |          dept_selected_list: selected.dept,
 |  |          dept_selected_list: selected.dept,
 | 
											
										
											
												
													
														|  | @@ -458,16 +457,36 @@
 | 
											
												
													
														|  |        },
 |  |        },
 | 
											
												
													
														|  |       //获取员工详情
 |  |       //获取员工详情
 | 
											
												
													
														|  |        get_user_list() {
 |  |        get_user_list() {
 | 
											
												
													
														|  | 
 |  | +        
 | 
											
												
													
														|  | 
 |  | +        this.table_loading = true;
 | 
											
												
													
														|  |          var _this=this;
 |  |          var _this=this;
 | 
											
												
													
														|  |          var employee_selected_list=this.employee_selected_list;
 |  |          var employee_selected_list=this.employee_selected_list;
 | 
											
												
													
														|  |          if (this.employee_list.length > 0) {
 |  |          if (this.employee_list.length > 0) {
 | 
											
												
													
														|  |            let list = this.employee_list
 |  |            let list = this.employee_list
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +          // for (let i in list) {
 | 
											
												
													
														|  | 
 |  | +          //   list[i]['checked'] = false
 | 
											
												
													
														|  | 
 |  | +          //   if (this.employee_selected.indexOf(list[i].id) >= 0) {
 | 
											
												
													
														|  | 
 |  | +          //     list[i]['checked'] = true
 | 
											
												
													
														|  | 
 |  | +          //   }
 | 
											
												
													
														|  | 
 |  | +          // }
 | 
											
												
													
														|  |            for (let i in list) {
 |  |            for (let i in list) {
 | 
											
												
													
														|  | 
 |  | +            list[i]['letter_index'] = '#'
 | 
											
												
													
														|  | 
 |  | +            if (this.$store.getters.employee_map[list[i].id]) {
 | 
											
												
													
														|  | 
 |  | +              list[i]['letter_index'] = this.$store.getters.employee_map[list[i].id].letter_index
 | 
											
												
													
														|  | 
 |  | +              if (this.$store.getters.employee_map[list[i].id].img_url == '') {
 | 
											
												
													
														|  | 
 |  | +                list[i]['img_url'] = 'static/images/head_default.png'
 | 
											
												
													
														|  | 
 |  | +              } else {
 | 
											
												
													
														|  | 
 |  | +                list[i]['img_url'] = this.$store.getters.employee_map[list[i].id].img_url
 | 
											
												
													
														|  | 
 |  | +              }
 | 
											
												
													
														|  | 
 |  | +            }
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |              list[i]['checked'] = false
 |  |              list[i]['checked'] = false
 | 
											
												
													
														|  |              if (this.employee_selected.indexOf(list[i].id) >= 0) {
 |  |              if (this.employee_selected.indexOf(list[i].id) >= 0) {
 | 
											
												
													
														|  |                list[i]['checked'] = true
 |  |                list[i]['checked'] = true
 | 
											
												
													
														|  |              }
 |  |              }
 | 
											
												
													
														|  |            }
 |  |            }
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |            this.list = list.sort((a, b) => {
 |  |            this.list = list.sort((a, b) => {
 | 
											
												
													
														|  |              return a.letter_index.charCodeAt(0) - b.letter_index.charCodeAt(0)
 |  |              return a.letter_index.charCodeAt(0) - b.letter_index.charCodeAt(0)
 | 
											
												
													
														|  |            })
 |  |            })
 | 
											
										
											
												
													
														|  | @@ -482,6 +501,7 @@
 | 
											
												
													
														|  |              page_size: 2000
 |  |              page_size: 2000
 | 
											
												
													
														|  |            }
 |  |            }
 | 
											
												
													
														|  |          }).then((res) => {
 |  |          }).then((res) => {
 | 
											
												
													
														|  | 
 |  | +          this.table_loading = false;
 | 
											
												
													
														|  |            var employee=res.data.data.list||[];
 |  |            var employee=res.data.data.list||[];
 | 
											
												
													
														|  |            employee.map((item)=>{
 |  |            employee.map((item)=>{
 | 
											
												
													
														|  |              if (this.not_user && item.is_creator == 1){
 |  |              if (this.not_user && item.is_creator == 1){
 |