bug修改

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

@@ -412,9 +412,10 @@ export default {
     },
     checkCanDel(row) {
       // console.log("checkCanEdit",this.$store.getters.orgId,row)
-      //计划创建机构为当前机构且不是顶级机构创建的计划才显示“删除”按钮
-      return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
-        && (row.issue != 1 || (row.issue == 1 && row.done != 1))
+      // 计划仅能够通过删除标准计划来删除
+     /* return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
+        && (row.issue != 1 || (row.issue == 1 && row.done != 1))*/
+      return row.standard == 1 && row.done != 1
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {

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

@@ -456,10 +456,11 @@ export default {
       return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
     },
     checkCanDel(row) {
-      // 计划所属机构or创建机构 =当前登陆人机构  && 创建机构为省联社  && 不是被下发的  && 计划下不存在已有执行任务的情况
-      return (row.belongOrgId == this.$store.getters.orgId)
-        && (row.issue != 1 || (row.issue == 1 && row.done != 1))
-        && !row.parentId
+      // 计划仅能够通过删除标准计划来删除
+     /* return (row.belongOrgId == this.$store.getters.orgId)
+       /!* && (row.issue != 1 || (row.issue == 1 && row.done != 1))*!/
+        && !row.parentId && row.createByTopOrg!=1*/
+      return row.standard == 1 && row.done != 1
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {