diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index c9cbdf73c..c120116fd 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -2,7 +2,71 @@
   <a-form layout="inline" @keyup.enter.native="searchQuery">
     <a-row :gutter="24">
       <a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
-        <template>
+        <template v-if="index < 3">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-if="item.field_show_type == '1'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-date-picker class="box-input"
+                           :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                           @change="dateChange(item.db_field_name)"
+                           v-model="queryParam[item.db_field_name]"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template >
+
+        <template v-if="index >= 3 && toggleSearchStatus">
           <div class="box-title-text" v-if="item.field_show_type == '0'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
@@ -65,11 +129,16 @@
                                :triggerChange="false" :dictCode="item.dict_field"/>
           </div>
         </template>
+
       </a-col>
       <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
                </a-col>
       </span>
     </a-row>
@@ -131,7 +200,10 @@
         let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
         let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
         this.queryParam[item] = [dateOne, dateTwo]
-      }
+      },
+      handleToggleSearch(){
+         this.toggleSearchStatus = !this.toggleSearchStatus
+      },
     }
   }
 </script>