diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 926a3e5..32ab374 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" :disabled="disabled"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearble>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable/>
+    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -20,81 +20,70 @@
   components: {
     SelectTree
   },
-  model: {
-    prop: 'value',
-    event: 'change'
-  },
   props: {
     // 数据绑定
     value: {
-      type: String,
-      required: true
-    },
+      type: [Number, String],
+      default: ''
+    }, // 输入
     placeholder: {
       type: String,
       default: '请选择父级'
-    },
-    needTop: { // 是否需要顶级
+    }, // 占位符
+    needTop: {
       type: Boolean,
       default: true
-    },
+    }, // 是否需要显示顶级
     deptType: {
       type: String,
       default: ''
-    },
+    }, // 显示的下拉组织类型：公司/部门
     deptShow: {
       type: Boolean,
       default: false
-    },
-    maxHeight: {
+    }, // 是否强制显示部门下拉列表
+    size: {
       type: String,
       default: ''
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    }
+    } // 输入框大小
   }, // 接收绑定参数
   data() {
     return {
       deptTreeList: [],
-      multiData: false,
+      multiData: false, // 是否是多级数据，多级使用select-tree控件
       defaultProps: {
         parent: 'pid',
         value: 'id',
         label: 'name',
         children: 'children'
       },
-      selected: '',
-      showDeptSelect: true
+      // selected: '' + this.value, // 选项
+      showDeptSelect: true // 是否显示该组件
     }
   },
-  watch: {
-    value: function(val) {
-      this.selected = '' + this.value
-    },
-    selected: function(val) {
-      console.log('watch selected: ' + val)
-      if (val === 0) {
-        val = '0'
+  computed: {
+    selected: {
+      get: function() {
+        return '' + this.value
+      },
+      set: function(val) {
+        console.log('watch selected:' + val)
+        this.$emit('input', val)
+        this.$emit('change')
       }
-      this.$emit('change', val)
     }
   },
-  created() {
-    this.fetchPcode()
-  },
+  // watch: {
+  //   selected: function(val) {
+  //     console.log('watch selected')
+  //     this.$emit('input', val)
+  //     this.$emit('change')
+  //   }
+  // },
   mounted() {
     this.fetchPcode()
   },
   methods: {
-    selectedChange: function(val) {
-      console.log('watch selected: ' + val)
-      if (val === 0) {
-        val = '0'
-      }
-      this.$emit('change', val)
-    },
     // 加载父组织树形下拉菜单
     fetchPcode: function() {
       let listQuery = {}
@@ -105,23 +94,30 @@
       }
       getDeptTreeList(listQuery).then(response => {
         const list = response.data.list
+        // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
         } else {
-          // list.push({ id: '0', name: '顶级', open: true, value: '0' })
+          // 如果有数据
           if (list) {
-            // 如果有必要转树
+            // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
               this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
-            } else {
+              // 如果不需要顶级,将顶级去掉
+              if (!this.needTop && this.deptTreeList.length === 1) {
+                this.deptTreeList = this.deptTreeList[0].children
+              }
+            } else { // 否则不需要转树，直接使用el-select控件
               this.deptTreeList = list
               this.multiData = false
             }
-            console.log(this.deptTreeList)
           }
         }
       })
+    },
+    selectChange: function(val) {
+      console.log('selectChange:', val)
     }
   }
 }

diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 926a3e5..32ab374 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" :disabled="disabled"/>
-    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearble>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable/>
+    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -20,81 +20,70 @@
   components: {
     SelectTree
   },
-  model: {
-    prop: 'value',
-    event: 'change'
-  },
   props: {
     // 数据绑定
     value: {
-      type: String,
-      required: true
-    },
+      type: [Number, String],
+      default: ''
+    }, // 输入
     placeholder: {
       type: String,
       default: '请选择父级'
-    },
-    needTop: { // 是否需要顶级
+    }, // 占位符
+    needTop: {
       type: Boolean,
       default: true
-    },
+    }, // 是否需要显示顶级
     deptType: {
       type: String,
       default: ''
-    },
+    }, // 显示的下拉组织类型：公司/部门
     deptShow: {
       type: Boolean,
       default: false
-    },
-    maxHeight: {
+    }, // 是否强制显示部门下拉列表
+    size: {
       type: String,
       default: ''
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    }
+    } // 输入框大小
   }, // 接收绑定参数
   data() {
     return {
       deptTreeList: [],
-      multiData: false,
+      multiData: false, // 是否是多级数据，多级使用select-tree控件
       defaultProps: {
         parent: 'pid',
         value: 'id',
         label: 'name',
         children: 'children'
       },
-      selected: '',
-      showDeptSelect: true
+      // selected: '' + this.value, // 选项
+      showDeptSelect: true // 是否显示该组件
     }
   },
-  watch: {
-    value: function(val) {
-      this.selected = '' + this.value
-    },
-    selected: function(val) {
-      console.log('watch selected: ' + val)
-      if (val === 0) {
-        val = '0'
+  computed: {
+    selected: {
+      get: function() {
+        return '' + this.value
+      },
+      set: function(val) {
+        console.log('watch selected:' + val)
+        this.$emit('input', val)
+        this.$emit('change')
       }
-      this.$emit('change', val)
     }
   },
-  created() {
-    this.fetchPcode()
-  },
+  // watch: {
+  //   selected: function(val) {
+  //     console.log('watch selected')
+  //     this.$emit('input', val)
+  //     this.$emit('change')
+  //   }
+  // },
   mounted() {
     this.fetchPcode()
   },
   methods: {
-    selectedChange: function(val) {
-      console.log('watch selected: ' + val)
-      if (val === 0) {
-        val = '0'
-      }
-      this.$emit('change', val)
-    },
     // 加载父组织树形下拉菜单
     fetchPcode: function() {
       let listQuery = {}
@@ -105,23 +94,30 @@
       }
       getDeptTreeList(listQuery).then(response => {
         const list = response.data.list
+        // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
         } else {
-          // list.push({ id: '0', name: '顶级', open: true, value: '0' })
+          // 如果有数据
           if (list) {
-            // 如果有必要转树
+            // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
               this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
-            } else {
+              // 如果不需要顶级,将顶级去掉
+              if (!this.needTop && this.deptTreeList.length === 1) {
+                this.deptTreeList = this.deptTreeList[0].children
+              }
+            } else { // 否则不需要转树，直接使用el-select控件
               this.deptTreeList = list
               this.multiData = false
             }
-            console.log(this.deptTreeList)
           }
         }
       })
+    },
+    selectChange: function(val) {
+      console.log('selectChange:', val)
     }
   }
 }
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index d4f6dad..58ff60c 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -108,7 +108,7 @@
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.value = ''
+          // this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''