Merge remote-tracking branch 'origin/develop' into develop

src/components/workTree/index.vue

@@ -12,14 +12,23 @@
         :inline="true"
         @submit.native.prevent
       >
-        <el-form-item class="form-item-disabled" style="margin: 10px;">
+        <el-form-item class="form-item-disabled" style="margin: 0px 10px;">
           <el-input
             v-model="filterText"
             placeholder="请输入姓名"
-            @input="changeInput"
           ></el-input>
-        </el-form-item>
-      </el-form>
+        </el-form-item> 
+        <el-form-item label="" class="search-item btn-box">
+            <el-button class="common-button-primary" type="primary" size="mini" @click="changeInput(filterText)">
+              查询
+            </el-button>
+          </el-form-item>
+          <el-form-item label="" class="search-item btn-box">
+            <el-button class="common-button-default" @click="resetSelect" size="mini">
+              清空
+            </el-button>
+          </el-form-item>
+      </el-form> 
       <el-tree
         v-if="open1 && isVisible2"
         node-key="id"
@@ -142,6 +151,10 @@ export default {
         this.open1 = true
       }
     }),
+    resetSelect(){
+      this.filterText=''
+      this.changeInput(this.filterText)
+    },
     checkChange2 (row, type, c) {
       if (this.checkBox) {
       } else {
@@ -350,4 +363,7 @@ export default {
     }
   }
 }
+/deep/.el-input__inner{
+  height: 28px;
+}
 </style>