1 измењених фајлова са 22 додато и 16 уклоњено
Подељен поглед
Diff Options
+ 22
- 16
src/views/components_web/distWork/distWork.vue
Прегледај датотеку
| @@ -332,18 +332,18 @@ | |||
| <!-- 添加协作群与工作 --> | |||
| <el-collapse-item name="1" class="nomidline"> | |||
| <template slot="title"> | |||
| <span class="fr mr_20"> | |||
| <!-- <span class="fr mr_20"> | |||
| <el-checkbox class="checkBoxCol" v-model="ischeckAll" @change="handleCheckTopAll">全选</el-checkbox> | |||
| </span> | |||
| </span> --> | |||
| <span>从部门中选择职员</span> | |||
| </template> | |||
| <el-collapse accordion v-for="(dept, group_index) in listDept" v-show="dept.listUser.length>0" :key="group_index"> | |||
| <!-- 二级折叠面板 --> | |||
| <el-collapse-item> | |||
| <template slot="title"> | |||
| <span class="fr mr_20"> | |||
| <!-- <span class="fr mr_20"> | |||
| <el-checkbox class="checkBoxCol" v-model="dept.selected" :key="group_index" @change="handleCheckItemAll(group_index,$event)">全选</el-checkbox> | |||
| </span> | |||
| </span> --> | |||
| <span>{{ dept.deptName }} </span> | |||
| </template> | |||
| <!-- <div class="user_info_item" v-for="(user, index) in listUserManager( | |||
| @@ -509,10 +509,10 @@ | |||
| handleCheckItemAll(group_index, $event) | |||
| ">全选</el-checkbox> | |||
| </template> | |||
| <!-- <div class="user_info_item" v-for="(user, index) in listUserStaff( | |||
| <div class="user_info_item" v-for="(user, index) in listUserStaff( | |||
| dept.listUser | |||
| )" :label="user" :key="index"> --> | |||
| <div class="user_info_item" v-for="(user, index) in dept.listUser" :label="user" :key="index"> | |||
| )" :label="user" :key="index"> | |||
| <!-- <div class="user_info_item" v-for="(user, index) in dept.listUser" :label="user" :key="index"> --> | |||
| <el-checkbox class="checkBoxCol" v-model="user.selected" @change=" | |||
| handleCheckedOne(group_index, user, $event) | |||
| " :disabled="disabled"> | |||
| @@ -562,20 +562,19 @@ | |||
| <span>工作负责人</span> | |||
| <div class="yiyun_line"></div> | |||
| <!-- 项目负责人选择前 --> | |||
| <!-- <div class="main_workerBox" v-if="listManagerComputed(selectedUser).length == 0"> --> | |||
| <div class="main_workerBox" v-if="selectedUser.length == 0"> | |||
| <div class="main_workerBox" v-if="listManagerComputed(selectedUser).length == 0"> | |||
| <!-- <div class="main_workerBox" v-if="selectedUser.length == 0"> --> | |||
| <i class="icon font_family icon-icon_huangguan-weijihuo largehuangguan"></i> | |||
| <div class="rentou_alrge"></div> | |||
| </div> | |||
| <!-- 项目负责人选择后 --> | |||
| <!-- <div v-if="listManagerComputed(selectedUser).length != 0"> --> | |||
| <div v-if="selectedUser.length != 0"> | |||
| <div v-if="listManagerComputed(selectedUser).length != 0"> | |||
| <!-- <div v-if="selectedUser.length != 0"> --> | |||
| <!-- <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed( | |||
| selectedUser | |||
| )" :key="index"> --> | |||
| <div class="user_info_item mainpeople_H" v-for="(user, index) in selectedUser" :key="index"> | |||
| <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed(selectedUser)" :key="index"> | |||
| <i class="icon font_family icon-icon_huangguan-jihuo middlehuangguan fl" title="负责人"></i> | |||
| <!-- <img v-lazy="headSrc + user.headImgUrl" alt="" class="user_info_faceImg" /> --> | |||
| <img :src="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg" /> | |||
| <span class="user_info_name">{{ user.cnName }}</span> | |||
| <el-popover placement="bottom-start" width="180" trigger="hover"> | |||
| @@ -601,6 +600,7 @@ | |||
| }}，进行职员指派。 | |||
| </p> | |||
| </div> | |||
| <!-- 选择职员 --> | |||
| <div v-if="isShowStaffList"> | |||
| <div class="row_painfr" v-for="dept in listDept" v-show="dept.listUser.length > 0" :key="dept.id"> | |||
| <div v-for="deptID in listDeptUserNoZero(selectedUser)" :key="deptID"> | |||
| @@ -880,7 +880,11 @@ export default { | |||
| { | |||
| this.listManagerUser=[]; | |||
| this.selectedUser.forEach(user => { | |||
| if( user.userID != this.currUser.userID) | |||
| // if( user.userID != this.currUser.userID) | |||
| // { | |||
| // this.listManagerUser.push(user); | |||
| // } | |||
| if( user.id != this.currUser.id) | |||
| { | |||
| this.listManagerUser.push(user); | |||
| } | |||
| @@ -1114,8 +1118,10 @@ export default { | |||
| handleCheckTopAll(e) { | |||
| //首级全选 | |||
| for (var j = 0; j < this.listDept.length; j++) { | |||
| if (this.listDept[j].listUser.length > 0) { | |||
| // this.handleCheckItemAll(j, false); //清除已经被选中的状态 | |||
| //this.handleCheckItemAll(j, false); //清除已经被选中的状态 | |||
| this.handleCheckItemAll(j, e); | |||
| } | |||
| } | |||
| @@ -1128,7 +1134,7 @@ export default { | |||
| handleCheckItemAll(index, e) { | |||
| for (var i = 0; i < this.listDept[index].listUser.length; i++) { | |||
| if (e) { | |||
| this.handleCheckedOne(index, this.listDept[index].listUser[i], false); | |||
| //this.handleCheckedOne(index, this.listDept[index].listUser[i], false); | |||
| this.handleCheckedOne(index, this.listDept[index].listUser[i], e); | |||
| } else { | |||
| this.handleCheckedOne(index, this.listDept[index].listUser[i], e); | |||