bug修改

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

@@ -136,12 +136,17 @@
 
           <el-col :span="12" v-show="form.planCycle != 0">
             <el-form-item label="立即生效" prop="buildTaskNow">
-              <el-checkbox v-model="form.buildTaskNow">
+<!--              <el-checkbox v-model="form.buildTaskNow">
                 默认从下个周期...
                 <el-popover placement="top-start" title="" width="200" trigger="hover"
                             content="默认从下个周期生成任务，勾选后从当前周期立即生成任务">
                   <i class="el-icon-warning-outline change-icon" slot="reference"></i>
                 </el-popover>
+              </el-checkbox>-->
+              <el-checkbox v-model="form.buildTaskNow">
+                默认从下个周期生成任务，
+                <br/>
+                勾选后从当前周期立即生成任务
               </el-checkbox>
             </el-form-item>
           </el-col>
@@ -579,7 +584,7 @@ export default {
     //撤回计划
     handleRevocation(row) {
       if (row.id != null) {
-        this.$modal.confirm('撤回计划会清除本周期所有任务？').then(function () {
+        this.$modal.confirm('撤回计划会清除本周期所有任务,是否继续?').then(function () {
           return revocationPlan(row.id);
         }).then(() => {
           this.$modal.msgSuccess("计划撤回成功");

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

@@ -165,11 +165,13 @@
           <el-col :span="12" v-show="form.planCycle != 0">
             <el-form-item label="立即生效" prop="buildTaskNow">
               <el-checkbox v-model="form.buildTaskNow">
-                默认从下个周期...
-                <el-popover placement="top-start" title="" width="200" trigger="hover"
+                默认从下个周期生成任务，
+                <br/>
+                勾选后从当前周期立即生成任务
+<!--                <el-popover placement="top-start" title="" width="200" trigger="hover"
                             content="默认从下个周期生成任务，勾选后从当前周期立即生成任务">
                   <i class="el-icon-warning-outline change-icon" slot="reference"></i>
-                </el-popover>
+                </el-popover>-->
               </el-checkbox>
             </el-form-item>
 
@@ -455,8 +457,9 @@ export default {
     },
     checkCanDel(row) {
       // 计划所属机构or创建机构 =当前登陆人机构  && 创建机构为省联社  && 不是被下发的  && 计划下不存在已有执行任务的情况
-      return (row.createOrgId == this.$store.getters.orgId)
+      return (row.belongOrgId == this.$store.getters.orgId)
         && (row.issue != 1 || (row.issue == 1 && row.done != 1))
+        && !row.parentId
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {
@@ -638,7 +641,7 @@ export default {
     //撤回计划
     handleRevocation(row) {
       if (row.id != null) {
-        this.$modal.confirm('撤回计划会清除本周期所有任务？').then(function () {
+        this.$modal.confirm('撤回计划会清除本周期所有任务,是否继续?').then(function () {
           return revocationPlan(row.id);
         }).then(() => {
           this.$modal.msgSuccess("计划撤回成功");

src/views/core/edu/task/dialog.info.vue

@@ -224,7 +224,7 @@ export default {
             } else {
                 let link = document.createElement("a");
                 let body = document.querySelector("body");
-
+/*
                  link.href = URL.createObjectURL(blob);
                  link.download = filename;
 
@@ -235,7 +235,7 @@ export default {
                  link.click();
                  body.removeChild(link);
 
-                window.URL.revokeObjectURL(link.href);
+                window.URL.revokeObjectURL(link.href);*/
            }
         },
         // 事件