update：搜索表单更新

@CONTROL/视图布局面板/@MACRO/GRID.vue.ftl

@@ -34,27 +34,29 @@ ${P.getCtrlCode('grid', 'CONTROL.html').code}
     <#if view.isEnableQuickGroup()>
     <app-quick-group :items="quickGroupModel" <#if appCounter??>:counterService="${appCounter.getCodeName()?lower_case}counterservice"</#if> @valuechange="quickGroupValueChange"></app-quick-group>
     </#if>
-    <#if view.getQuickPSDESearchForm()??>
-    <div class="quick-search-container">
-    <#assign quickSearchForm = view.getQuickPSDESearchForm() />
-    ${P.getCtrlCode(quickSearchForm, 'CONTROL.html').code}
-    </div>
-    </#if>
     <#if view.isEnableQuickSearch()>
     <i-input v-model="query" class='quick-search-input' @on-enter="onSearch($event)" placeholder="<@getQuickSearchPlaceholder view />" />
+    </#if>
+    <#if view.getQuickPSDESearchForm()??>
+    <div class="quick-search-container">
     <div class="search-form-toggle" @click="toggleSearchForm">
         <i v-if="!isExpandSearchForm" class="el-icon-plus" />
         <i v-else class="el-icon-minus" />
         筛选条件
     </div>
+    <#assign quickSearchForm = view.getQuickPSDESearchForm() />
+    ${P.getCtrlCode(quickSearchForm, 'CONTROL.html').code}
+    </div>
     </#if>
     <#if view.hasPSControl('searchform')>
     ${P.getCtrlCode('searchform', 'CONTROL.html').code}
     </#if>
 </template>
 <template #headerBottom>
+    <#if view.getQuickPSDESearchForm()??>
     <i-button @click="onReset">重置</i-button>
     <i-button type="primary" @click="onSearch">搜索</i-button>
+    </#if>
 </template>
   </#if>
   <#--  END：快速搜索或工具栏存在  -->