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

src/views/resumption/plan/dialog.edit.vue

@@ -136,7 +136,6 @@
             <el-col :span="6">
               <el-form-item prop="roleList" label="履职角色:">
                 <el-select
-                  @visible-change="onOrgTypeChanged"
                   :disabled="isChildren()"
                   label="履职角色"
                   v-model="formData.roleList"
@@ -412,12 +411,11 @@ export default {
           break;
       }
     },
-    //是否子计划判断
+    //编辑内容判断
     isChildren() {
       if (
-        this.formData.distributePlanStatus != null ||
-        this.id == null ||
-        this.formData.children == null
+        this.formData.hasEdit != 1 ||
+        this.id == null 
       ) {
         return false;
       } else return true;

src/views/resumption/plan/index.vue

@@ -436,11 +436,21 @@ export default {
     },
     //开始撤回
     chhuile(row) {
-      this.loading = true;
-      api.cheHui(row.id).then((response) => {
-        this.getList();
-        this.loading = false;
-      });
+      this.$modal
+        .confirm("撤回计划会清除本周期所有任务!", "提示")
+        .then(() => {
+          // 用户点击了确认按钮
+          console.log("执行操作...");
+          this.loading = true;
+          api.cheHui(row.id).then((response) => {
+            this.getList();
+            this.loading = false;
+          });
+        })
+        .catch(() => {
+          // 用户点击了取消按钮
+          console.log("取消操作...");
+        });
     },
     //已下发的显示撤回
     chehui(row) {