Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

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

@@ -420,7 +420,7 @@ export default {
       // 计划仅能够通过删除标准计划来删除
       /* 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  && this.checkCanEdit(row);
+      return (row.standard == 1||row.standard==2) && row.done != 1  && this.checkCanEdit(row);
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {

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

@@ -498,7 +498,7 @@ export default {
       /* 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 && this.checkCanEdit(row);
+      return (row.standard == 1||row.standard == 2) && row.done != 1 && this.checkCanEdit(row);
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {