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

src/components/elDialog/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog v-bind="$attrs" v-on="$listeners" :close-on-click-modal="false" class="centerDialog">
+    <el-dialog v-bind="$attrs" v-on="$listeners" @close="handleClose" :close-on-click-modal="false" class="centerDialog">
       <slot></slot>
       <slot name="footer" class="dialog-footer"></slot>
     </el-dialog>
@@ -17,7 +17,7 @@ export default {
   mounted() {},
 
   methods: {
-    close(){
+    handleClose(){
       this.$emit("close");
     }
   },

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

@@ -135,7 +135,7 @@
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
-    <DialogCom :title="title" :visible.sync="open" :close="cancel" width="800px" height="800px" append-to-body @close="clear">
+    <DialogCom :title="title" :visible.sync="open" @close="cancel" width="800px" height="800px" append-to-body >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -372,9 +372,9 @@ export default {
     this.orgId = this.$store.getters.orgId;
   },
   methods: {
-    clear() {
-      this.$refs['orgTreeSelect'].clear();
-    },
+    // clear() {
+    //   this.$refs['orgTreeSelect'].clear();
+    // },
     queryNode(nodes) {
       this.form.planExecOrgIdList = JSON.parse(nodes).map(v => {
         return v.id
@@ -449,9 +449,10 @@ export default {
     },
     // 取消按钮
     cancel() {
+      //console.log("xxx")
       this.open = false;
       this.reset();
-      this.$refs['orgTreeSelect'].clear();
+      this.$refs['orgTreeSelect'].clear();      
       this.$refs["upload"].clearFiles();
     },
     // 表单重置