|
@@ -509,10 +509,10 @@ |
|
|
handleCheckItemAll(group_index, $event)
|
|
|
handleCheckItemAll(group_index, $event)
|
|
|
">全选</el-checkbox>
|
|
|
">全选</el-checkbox>
|
|
|
</template>
|
|
|
</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
|
|
|
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="
|
|
|
<el-checkbox class="checkBoxCol" v-model="user.selected" @change="
|
|
|
handleCheckedOne(group_index, user, $event)
|
|
|
handleCheckedOne(group_index, user, $event)
|
|
|
" :disabled="disabled">
|
|
|
" :disabled="disabled">
|
|
@@ -570,10 +570,9 @@ |
|
|
<!-- 项目负责人选择后 -->
|
|
|
<!-- 项目负责人选择后 -->
|
|
|
<!-- <div v-if="listManagerComputed(selectedUser).length != 0"> -->
|
|
|
<!-- <div v-if="listManagerComputed(selectedUser).length != 0"> -->
|
|
|
<div v-if="selectedUser.length != 0">
|
|
|
<div v-if="selectedUser.length != 0">
|
|
|
<!-- <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed(
|
|
|
|
|
|
|
|
|
<div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed(
|
|
|
selectedUser
|
|
|
selectedUser
|
|
|
)" :key="index"> -->
|
|
|
|
|
|
<div class="user_info_item mainpeople_H" v-for="(user, index) in selectedUser" :key="index">
|
|
|
|
|
|
|
|
|
)" :key="index">
|
|
|
<i class="icon font_family icon-icon_huangguan-jihuo middlehuangguan fl" title="负责人"></i>
|
|
|
<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 v-lazy="headSrc + user.headImgUrl" alt="" class="user_info_faceImg" /> -->
|
|
|
<img :src="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg" />
|
|
|
<img :src="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg" />
|
|
@@ -880,7 +879,8 @@ export default { |
|
|
{
|
|
|
{
|
|
|
this.listManagerUser=[];
|
|
|
this.listManagerUser=[];
|
|
|
this.selectedUser.forEach(user => {
|
|
|
this.selectedUser.forEach(user => {
|
|
|
if( user.userID != this.currUser.userID)
|
|
|
|
|
|
|
|
|
// if( user.userID != this.currUser.userID)
|
|
|
|
|
|
if( user.id != this.currUser.id)
|
|
|
{
|
|
|
{
|
|
|
this.listManagerUser.push(user);
|
|
|
this.listManagerUser.push(user);
|
|
|
}
|
|
|
}
|
|
@@ -897,12 +897,13 @@ export default { |
|
|
showClose:false,
|
|
|
showClose:false,
|
|
|
type: "warning"
|
|
|
type: "warning"
|
|
|
}).then(() => {
|
|
|
}).then(() => {
|
|
|
|
|
|
// 注意这里将folderID修改为 id字段
|
|
|
for (var i = 0; i < this.listNewFolder.length; i++) {
|
|
|
for (var i = 0; i < this.listNewFolder.length; i++) {
|
|
|
if( this.listNewFolder[i].folderID==this.currSelectData.folderID){
|
|
|
|
|
|
|
|
|
if( this.listNewFolder[i].id == this.currSelectData.id){
|
|
|
this.listNewFolder[i] = this.currSelectData;
|
|
|
this.listNewFolder[i] = this.currSelectData;
|
|
|
}
|
|
|
}
|
|
|
for (var j = 0; j < this.listNewFolder[i].listChildren.length; j++) {
|
|
|
for (var j = 0; j < this.listNewFolder[i].listChildren.length; j++) {
|
|
|
if( this.listNewFolder[i].listChildren[j].folderID==this.currSelectData.folderID){
|
|
|
|
|
|
|
|
|
if( this.listNewFolder[i].listChildren[j].id == this.currSelectData.id){
|
|
|
this.listNewFolder[i].listChildren[j] = this.currSelectData;
|
|
|
this.listNewFolder[i].listChildren[j] = this.currSelectData;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -983,7 +984,8 @@ export default { |
|
|
// this.InitData.manageUser[0].roleName = "普通职员";
|
|
|
// this.InitData.manageUser[0].roleName = "普通职员";
|
|
|
for (var i = 0; i < this.selectedUser.length; i++) {
|
|
|
for (var i = 0; i < this.selectedUser.length; i++) {
|
|
|
if (
|
|
|
if (
|
|
|
this.selectedUser[i].userID == this.InitData.manageUser[0].userID
|
|
|
|
|
|
|
|
|
// this.selectedUser[i].userID == this.InitData.manageUser[0].userID
|
|
|
|
|
|
this.selectedUser[i].id == this.InitData.manageUser[0].id
|
|
|
) {
|
|
|
) {
|
|
|
this.InitData.manageUser[0].folderPerm = 0;
|
|
|
this.InitData.manageUser[0].folderPerm = 0;
|
|
|
this.selectedUser.splice(i, 1);
|
|
|
this.selectedUser.splice(i, 1);
|
|
@@ -993,11 +995,11 @@ export default { |
|
|
var listManageUser = [];
|
|
|
var listManageUser = [];
|
|
|
nowUser.folderPerm = 2;
|
|
|
nowUser.folderPerm = 2;
|
|
|
listManageUser.push(nowUser);
|
|
|
listManageUser.push(nowUser);
|
|
|
this.selectedUser.forEach(user => {
|
|
|
|
|
|
if (user.folderPerm == 2 && user.userID != nowUser.userID) {
|
|
|
|
|
|
|
|
|
this.selectedUser.forEach(user => {//将userID 修改为id
|
|
|
|
|
|
if (user.folderPerm == 2 && user.id != nowUser.id) {
|
|
|
user.folderPerm = 1;
|
|
|
user.folderPerm = 1;
|
|
|
}
|
|
|
}
|
|
|
if (user.userID == nowUser.userID) {
|
|
|
|
|
|
|
|
|
if (user.id == nowUser.id) {
|
|
|
user.folderPerm = 2;
|
|
|
user.folderPerm = 2;
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
});
|
|
@@ -1115,7 +1117,7 @@ export default { |
|
|
//首级全选
|
|
|
//首级全选
|
|
|
for (var j = 0; j < this.listDept.length; j++) {
|
|
|
for (var j = 0; j < this.listDept.length; j++) {
|
|
|
if (this.listDept[j].listUser.length > 0) {
|
|
|
if (this.listDept[j].listUser.length > 0) {
|
|
|
// this.handleCheckItemAll(j, false); //清除已经被选中的状态
|
|
|
|
|
|
|
|
|
this.handleCheckItemAll(j, false); //清除已经被选中的状态
|
|
|
this.handleCheckItemAll(j, e);
|
|
|
this.handleCheckItemAll(j, e);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|