diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue
index f1e0064..e1c5425 100644
--- a/src/components/customField/Search.vue
+++ b/src/components/customField/Search.vue
@@ -59,16 +59,9 @@
         <!--   日期区间  -->
         <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
           <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-range-picker v-model="queryParam[item.dbFieldName]"
-                            :open="dateCurrentOpen === item.dbFieldName"
-                            @openChange="openChange(item.dbFieldName)"
-                            @calendarChange="calendarChange"
-                            format="YYYY-MM-DD" value-format="YYYY-MM-DD">
-              <!--                @change="onChange(item.dbFieldName)"-->
-              <template slot="renderExtraFooter" slot-scope="mode">
-                <a-button @click="confirm(mode, item.dbFieldName)">确定</a-button>
-              </template>
-            </a-range-picker>
+            <j-date-picker v-model="queryParam[item.dbFieldName]"
+                            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                            @change="onChange(item.dbFieldName)"></j-date-picker>
           </a-form-item>
         </template>
         <!--  字典单选框  -->
@@ -229,16 +222,9 @@
           <!--   日期区间选择器  -->
           <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
             <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-range-picker v-model="queryParam[item.dbFieldName]"
-                              :open="dateCurrentOpen === item.dbFieldName"
-                              @openChange="openChange(item.dbFieldName)"
-                              @calendarChange="calendarChange"
-                              format="YYYY-MM-DD" value-format="YYYY-MM-DD">
-<!--                @change="onChange(item.dbFieldName)"-->
-                <template slot="renderExtraFooter" slot-scope="mode">
-                  <a-button @click="confirm(mode, item.dbFieldName)">确定</a-button>
-                </template>
-              </a-range-picker>
+              <j-date-picker v-model="queryParam[item.dbFieldName]"
+                              format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                              @change="onChange(item.dbFieldName)"></j-date-picker>
             </a-form-item>
           </template>
           <!--   字典单选  -->
@@ -293,10 +279,11 @@ import { FieldType } from '../../enums/commonEnums'
 import eventBus from '@/common/event'
 import { getFormDictTreeList, queryDepartTreeList } from '../../api/api'
 import { getAction } from '../../api/manage'
+import JDatePicker from '../JDatePicker'
 
 export default {
   name: 'Search',
-  components: { JDictSelectTag },
+  components: { JDatePicker, JDictSelectTag },
   props: {
     // 获取查询条件的方法
     getQueryConditionFunc: {