Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/benyun/components/selectTree/selectTree.vue

@@ -5,7 +5,7 @@
     trigger="click"
     >
     <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" highlight-current node-key="id"></el-tree>
-    <el-input v-model="value" slot="reference" readonly :placeholder="attrs.placeholder?attrs.placeholder:'请选择'" :clearable="attrs.clearable" suffix-icon="el-icon-arrow-down"></el-input>
+    <el-input :value="value" slot="reference" :placeholder="attrs.placeholder?attrs.placeholder:'请选择'" :clearable="attrs.clearable" @clear="clear" suffix-icon="el-icon-arrow-down"></el-input>
   </el-popover>
 </template>
 
@@ -66,7 +66,20 @@ export default class SelectTree extends VueViews {
       }
     })
   }
-
+  clear(){
+    this.value='';
+    let obj:any = {};
+    try{
+      if(this.attrs.retConfig){
+        for(const key in this.attrs.retConfig){
+          obj[key] = ''
+        }
+      }
+    }catch(e){
+      console.log('selectTree:retConfig报错！')
+    }
+    this.$emit('onChange',obj);
+  }
   setData(data:Array<any>){
     this.data = data;
   }

src/views/demo/form.vue

@@ -112,6 +112,7 @@ export default class DemoForm extends Vue {
         compConfig:{
           attr:{
             label:'name',
+            clearable:true,
             retConfig:{
               treeName:'name',
               treeId:'id'