Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet_h5/src/views/task/editask.vue

@@ -593,6 +593,7 @@ export default {
                     this.taskform.createDate = null;
                     this.taskform.indate = null;
                     let projectManagement = false
+                    let authorityEditing = false
                     if(!this.taskform.taskDesc){
                         this.taskform.taskDesc = ''
                     }
@@ -610,8 +611,11 @@ export default {
                         if(this.user.functionList[i].name == '查看全部项目'){
                             projectManagement = true
                         }
+                        if(this.user.functionList[i].name == '编辑项目内任务') {
+                            authorityEditing = true
+                        }
                     }
-                    if(this.user.id == res.data.createrId || this.user.id == res.data.projectInchargerId || this.user.id == res.data.groupInchargerId || projectManagement || this.title == '新建任务'){
+                    if(authorityEditing || this.user.id == res.data.createrId || this.user.id == res.data.projectInchargerId || this.user.id == res.data.groupInchargerId || projectManagement || this.title == '新建任务'){
                         this.canEdit = true
                     }else{
                         this.canEdit = false