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

@@ -4,7 +4,7 @@
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-                  @click="clickTreeNode" businessTree :defuaultCheckSub="false"></org-tree>
+                  @click="clickTreeNode" hangsheTree :defaultCheckSub="false"></org-tree>
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
@@ -115,7 +115,7 @@
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close="cancel" width="850px" height="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :before-close="closeDialog"  :close="cancel" width="850px" height="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="24">
@@ -429,8 +429,12 @@ export default {
     cancel() {
       this.open = false;
       this.reset();
+      this.$refs['orgTreeSelect'].clear();
       this.$refs["upload"].clearFiles();
     },
+    closeDialog(){
+     this.cancel();
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -522,6 +526,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           let request = {...this.form};
+          console.log("request", request)
           if (this.form.planExecOrgIdList) {
             const list = Array.isArray(this.form.planExecOrgIdList) ? this.form.planExecOrgIdList : [this.form.planExecOrgIdList];
             request.planExecOrgIdList = list;

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

@@ -4,7 +4,7 @@
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-                  @click="clickTreeNode" hangsheTree :defuaultCheckSub="false"></org-tree>
+                  @click="clickTreeNode" hangsheTree :defaultCheckSub="false"></org-tree>
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
@@ -142,7 +142,7 @@
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
-    <DialogCom :title="title" :visible.sync="open" @close="cancel" width="850px" height="800px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" :before-close="closeDialog"  @close="cancel" width="850px" height="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="24">
@@ -480,7 +480,9 @@ export default {
       this.reset();
       this.$refs['orgTreeSelect'].clear();
       this.$refs["upload"].clearFiles();
-      this
+    },
+    closeDialog(){
+     this.cancel();
     },
     // 表单重置
     reset() {