教育培训/预案演练 需求变动代码提交

src/views/core/drill/plan/index.vue

@@ -412,8 +412,7 @@ export default {
     //所属机构为当前用户登录机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {
       // console.log("checkCanEdit",this.$store.getters.orgId,row.belongOrgId)
-     // return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
-      return (row.belongOrgId == this.$store.getters.orgId)
+      return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
 
     },
     checkCanDel(row) {

src/views/core/drill/task/index.vue

@@ -300,12 +300,12 @@ export default {
       return row.status==2 && this.$store.getters.roleList.some(item=>item.roleId==120)&&this.isNotOverOrUnStart(row);
     },
     canPerform(row) {
-      // return true;
-      let flag = 0;
       if (row.status > 0) return false;
-      //if (!row.taskRoleList) return false;
-      return  this.isNotOverOrUnStart(row);
-     /* console.log("isNotOverOrUnStart", isOver);
+      let isCur=  row.orgId == this.$store.getters.orgId;
+      let isOver= this.isNotOverOrUnStart(row);
+      return  isCur && isOver;
+     /*   let flag = 0;
+     if (!row.taskRoleList) return false;
       row.taskRoleList.forEach((taskRole) => {
         this.$store.getters.roleList.forEach((role) => {
           if (taskRole.roleId == role.roleId) {

src/views/core/edu/plan/index.vue

@@ -456,7 +456,7 @@ export default {
     },
     //所属机构为当前用户登录机构或等于创建机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {
-      return (row.belongOrgId == this.$store.getters.orgId)
+      return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
     },
     checkCanDel(row) {
       // 计划仅能够通过删除标准计划来删除

src/views/core/edu/task/index.vue

@@ -330,7 +330,6 @@ export default {
       this.$refs["performDialog"].show(id,{});
     },
     handleAddTask(id) {
-      console.log(123123123)
       this.$refs["newTaskDialog"].show(id,{});
     },
     /** 导出按钮操作 */
@@ -340,11 +339,12 @@ export default {
       }, `eduTask_${new Date().getTime()}.xlsx`)
     },
     canPerform(row) {
-      return  row.orgId == this.$store.getters.orgId && row.status==0;
-      /*let flag = 0;
       if(row.status>0) return false;
-      if(!row.taskRoleList)   return false;
+      let isCur=  row.orgId == this.$store.getters.orgId;
       let isOver =this.isNotOverOrUnStart(row);
+      return isCur && isOver;
+      /*let flag = 0;
+      if(!row.taskRoleList)   return false;
       row.taskRoleList.forEach((taskRole) => {
         this.$store.getters.roleList.forEach((role) => {
           if (taskRole.roleId == role.roleId) {