diff --git a/jero-web/src/components/currencySearch/index.vue b/jero-web/src/components/currencySearch/index.vue
index 1c15168b0..dac332a24 100644
--- a/jero-web/src/components/currencySearch/index.vue
+++ b/jero-web/src/components/currencySearch/index.vue
@@ -123,9 +123,13 @@
         this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
       },
       onChange(item) {
-        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]
+        if (this.queryParam[item] && this.queryParam[item].length > 0) {
+          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]
+        } else {
+          this.queryParam[item] = []
+        }
       }
     }
   }
diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index 0a44b605f..33678def2 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -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>
@@ -65,7 +65,7 @@
                                :type="'select'"
                                :triggerChange="false" :dictCode="item.dict_field"/>
           </div>
-        </template >
+        </template>
 
         <template v-if="index >= 3 && toggleSearchStatus">
           <div class="box-title-text" v-if="item.field_show_type == '0'">
@@ -111,15 +111,15 @@
             <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
                             @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>
@@ -198,13 +198,17 @@
         this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
       },
       onChange(item) {
-        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
+        if (this.queryParam[item] && this.queryParam[item].length > 0) {
+          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]
+        } else {
+          this.queryParam[item] = []
+        }
       },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      }
     }
   }
 </script>
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 21a1198d4..52685b6d0 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -45,13 +45,13 @@
                                 :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 == '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]"
@@ -449,10 +449,15 @@
         this.queryParamOne[item + '_name'] = this.queryParamOne[item + '_name'] ? moment(this.queryParamOne[item + '_name']).format('YYYY-MM-DD') : ''
       },
       onChange(item) {
-        let dateOne = moment(this.queryParamOne[item][0]).format('YYYY-MM-DD')
-        let dateTwo = moment(this.queryParamOne[item][1]).format('YYYY-MM-DD')
-        this.queryParamOne[item] = dateOne ? [dateOne, dateTwo] : []
-        this.queryParamOne[item + '_name'] = dateOne ? [dateOne, dateTwo] : []
+        if (this.queryParamOne[item] && this.queryParamOne[item].length > 0) {
+          let dateOne = moment(this.queryParamOne[item][0]).format('YYYY-MM-DD')
+          let dateTwo = moment(this.queryParamOne[item][1]).format('YYYY-MM-DD')
+          this.queryParamOne[item] = [dateOne, dateTwo]
+          this.queryParamOne[item + '_name'] = [dateOne, dateTwo]
+        } else {
+          this.queryParamOne[item] = []
+          this.queryParamOne[item + '_name'] = []
+        }
       },
       getCondition() {
         let query = {