Selaa lähdekoodia

[Version] V.3.8

[Adds]
1.修复分配工作bug
master
rys 4 vuotta sitten
vanhempi
commit
cdbfc95bfc
1 muutettua tiedostoa jossa 23 lisäystä ja 26 poistoa
  1. +23
    -26
      src/views/components_web/distWork/distWork.vue

+ 23
- 26
src/views/components_web/distWork/distWork.vue Näytä tiedosto

@@ -87,7 +87,7 @@
</div> -->
<div class="clear"></div>
<!-- 分配业主工作 -->
<div class="line_from">
<div class="line_from">
<!-- 项目管理权限 start -->
<div class="fuzeren" v-if="isProjManager">
<div><span class="label_text">项目管理权限</span> </div>
@@ -112,21 +112,21 @@
<li v-for="(user, index) in listManagerUser" :key="index">
<div v-if="index < 14 || showAll ">
<div class="avtarface" :title="user.cnName">
<img src="" v-lazy="headSrc+user.headImgUrl" />
<img src="" v-lazy="headSrc+user.headImgUrl" />
</div>
<span class="Text_tiny tinyText_wirte">{{user.cnName}}</span>
</div>
</li>
</ul>
</ul>
</div>
</div>
</div>
<!-- 项目管理权限 end -->
<div>
<div class="tianjiaxiezuorenBox" v-for="(folder, folderIndex) in listNewFolder" :key="folderIndex">
<div v-if="tempIndex!=folderIndex||folderIndex==0" class="self_newitem">
<div v-if="tempIndex!=folderIndex||folderIndex==0" class="self_newitem">
<h5 class="fl label_text">
<i class="el-icon-caret-right hand" v-show="opentree" @click="openECtree"></i>
<i class="el-icon-caret-right hand" v-show="opentree" @click="openECtree"></i>
<i class="el-icon-caret-bottom hand" v-show="!opentree" @click="closeECtree"></i>
{{ folderIndex + 1 }} <span>.</span>
{{ folder.folderName }}
@@ -234,7 +234,7 @@
</div>
<span class="Text_tiny tinyText_wirte">工作负责人</span>
</div>
<li v-for="(user, index) in listManagerComputed(folderChild.manageUser)" :key="index">
<li v-for="(user, index) in folderChild.manageUser" :key="index">
<div>
<div class="avtarface" title="编辑">
<img src="" v-lazy="headSrc + user.headImgUrl" @click="aloneAddUserForFolder(folderChild)" />
@@ -701,6 +701,7 @@
isShowManager:true,// 当前是否是设置项目负责人
listManagerUser:[], //项目负责人
isProjManager: false,
currListDeptUserData:[]
};
},
created:function(){
@@ -746,7 +747,7 @@
return listUsers.filter(function(user) {
return user.folderPerm != 2;
});
};
};
},
/**
* 过滤后的左侧负责人列表
@@ -853,8 +854,7 @@
*返回文件夹页面
*/
backFirstPage: function () {
this.isShowFirstPage = true;
this.isAllhide();
this.listDept=JSON.parse(JSON.stringify(this.currListDeptUserData));
if(!this.isShowManager)
{
this.listManagerUser=[];
@@ -865,6 +865,9 @@
}
});
}
this.isAllhide();
this.isShowManager=true;
this.isShowFirstPage = true;
},
toFirstPage(){
this.$confirm("退出职员选择将清空您的所有操作!确定返回吗?", "", {
@@ -883,22 +886,12 @@
}
}
}
this.listDept=JSON.parse(JSON.stringify(this.currListDeptUserData));
this.isAllhide();
this.isShowFirstPage = true;
this.isShowManager=true;
});
},
/**
* 添加项目负责人
*/
addManager: function() {
this.isAllhide();
this.isShowFirstPeople = true;
this.marchWorkerDialog = true;
//左侧选中状态根据右侧人员状态改变
// this.setFolderPerm(this.newProjData.listFolder[parseInt(index)]);
// this.selectedUser = this.newProjData.projectData.listProjManager;

},
/*
*指派员工页面
*/
@@ -992,8 +985,8 @@
/**
* 分配人员
*/
aloneAddUserForFolder: function (data) {
this.currSelectData=JSON.parse(JSON.stringify(data));
aloneAddUserForFolder: function (data,index) {
this.currSelectData=data;
this.currWorkName = data.folderName;
if (data.listUser == null) {
data.listUser = [];
@@ -1012,6 +1005,7 @@
* 进入时,重置权限
*/
setFolderPerm: function (data) {
this.listDept=JSON.parse(JSON.stringify(this.currListDeptUserData));
for (var j = 0; j < this.listDept.length; j++) {
for (var k = 0; k < this.listDept[j].listUser.length; k++) {
this.listDept[j].listUser[k].selected = false;
@@ -1060,9 +1054,9 @@
this.isShowManager=false;
this.isShowStaffList = true;
var data={listUser:[]};
data.listUser=JSON.parse(JSON.stringify(this.listManagerUser));
data.listUser=this.listManagerUser;
; this.setFolderPerm(data);
this.selectedUser =data.listUser;
this.selectedManageUser = [];
this.isShowThreePage = true;
@@ -1229,7 +1223,7 @@
// user.roleName = "查看编辑";
for (var k = 0; k < this.selectedUser.length; k++) {
if (this.selectedUser[k].userID == user.userID) {
this.selectedUser[k].folderPerm = 0;
this.selectedUser[k].folderPerm = 0;
this.selectedUser.splice(k, 1);
}
}
@@ -1375,6 +1369,7 @@
})
.then(response => {
thisApp.listDept = response.data.data;
thisApp.currListDeptUserData=response.data.data;
})
.catch(error => {
console.log(error);
@@ -1413,6 +1408,8 @@
listFolder: thisApp.listNewFolder,
listManageUser:thisApp.listManagerUser
};
console.log(param);
return;
this.$axios({
method: sendMethod,
url: encodeURI(process.env.API_HOST + "folders/set"),