From 55e441f56ca4a2cd5298452cdd368459d1d9738d Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Sat, 2 Apr 2022 09:30:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80=E7=9A=84?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=97=B6=E9=97=B4=E6=94=B9?=
 =?UTF-8?q?=E5=AE=8C=E8=8C=83=E5=9B=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/currencySearch/index.vue   | 21 +++++-----
 jero-web/src/components/search/index.vue      | 41 +++++++++----------
 .../components/DocumentLibrary.vue            | 17 ++++----
 3 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/jero-web/src/components/currencySearch/index.vue b/jero-web/src/components/currencySearch/index.vue
index 3703e26e6..1c15168b0 100644
--- a/jero-web/src/components/currencySearch/index.vue
+++ b/jero-web/src/components/currencySearch/index.vue
@@ -39,23 +39,22 @@
                                 :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="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
             <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 == '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>
diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index 74294eb6a..0a44b605f 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -39,7 +39,7 @@
                                 :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="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
@@ -47,15 +47,15 @@
                             :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 == '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>
@@ -104,23 +104,22 @@
                                 :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="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
             <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 == '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>
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 6045f3d7e..21a1198d4 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -45,17 +45,16 @@
                                 :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
                                 :triggerChange="false" :dictCode="item.dict_field"/>
           </div>
-          <div class="text-left-select" v-if="item.field_show_type == '5'">
-            <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-            <a-date-picker class="text-select"
-                           :placeholder="$t('PleaseSelect')+item.db_field_txt"
-                           @change="dateChange(item.db_field_name)"
-                           v-model="queryParamOne[item.db_field_name]"/>
-          </div>
-          <div class="text-left-select" v-if="item.field_show_type == '6'">
+<!--          <div class="text-left-select" v-if="item.field_show_type == '5'">-->
+<!--            <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>-->
+<!--            <a-date-picker class="text-select"-->
+<!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+<!--                           @change="dateChange(item.db_field_name)"-->
+<!--                           v-model="queryParamOne[item.db_field_name]"/>-->
+<!--          </div>-->
+          <div class="text-left-select" v-if="item.field_show_type == '6' || item.field_show_type == '5'">
             <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>
             <a-range-picker class="text-select" v-model="queryParamOne[item.db_field_name]"
-                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
                             @change="onChange(item.db_field_name)"></a-range-picker>
           </div>
         </div>