78224 内外部会议、政策课题、政策法规资料搜索条件中时间选择范围查询

src/pages/policyRegulation/meeting/components/TopicsTable.vue

@@ -17,7 +17,7 @@
         <el-formItem label="课题承办单位" prop="organizer" class="search-item">
           <el-input v-model="searchForm.organizer" clearable placeholder="请输入课题承办单位" :maxlength="100" @keyup.enter.native="onSearch"/>
         </el-formItem>
-        <el-formItem label="启动时间" prop="startTime" class="search-item">
+        <el-formItem label="启动时间" class="search-item" style="margin-right: 0">
           <el-date-picker
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
@@ -25,10 +25,22 @@
               clearable
               :editable="true"
               placeholder="请选择启动时间"
-              v-model="searchForm.startTime"
+              v-model="searchForm.startTimeBegin"
           >
           </el-date-picker>
         </el-formItem>
+        <el-form-item label="至" label-width="25px" class="search-item">
+          <el-date-picker
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              type="date"
+              clearable
+              :editable="true"
+              placeholder="选择结束时间"
+              v-model="searchForm.startTimeEnd"
+          >
+          </el-date-picker>
+        </el-form-item>
         <el-formItem label="课题状态" prop="topicStatus" class="search-item">
           <el-select v-model="searchForm.topicStatus"
                      placeholder="请选择课题状态"

src/pages/policyRegulation/meeting/index.vue

@@ -9,18 +9,30 @@
         <el-formItem label="会议主办单位" prop="meetingOrganizer" class="search-item">
           <el-input v-model="searchForm.meetingOrganizer" clearable placeholder="请输入会议主办单位" :maxlength="100" @keyup.enter.native="onSearch"/>
         </el-formItem>
-        <el-formItem label="会议时间" prop="meetingTime" class="search-item">
+        <el-formItem label="会议时间" class="search-item" style="margin-right: 0">
           <el-date-picker
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               type="date"
               clearable
               :editable="true"
-              placeholder="请选择会议时间"
-              v-model="searchForm.meetingTime"
+              placeholder="选择开始时间"
+              v-model="searchForm.meetingTimeBegin"
           >
           </el-date-picker>
         </el-formItem>
+        <el-form-item label="至" label-width="25px" class="search-item">
+          <el-date-picker
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              type="date"
+              clearable
+              :editable="true"
+              placeholder="选择结束时间"
+              v-model="searchForm.meetingTimeEnd"
+          >
+          </el-date-picker>
+        </el-form-item>
         <el-form-item class="search-item btn-box">
           <el-button
               type="primary"

src/pages/policyRegulation/policyTopics/index.vue

@@ -9,18 +9,30 @@
         <el-formItem label="课题承办单位" prop="organizer" class="search-item">
           <el-input v-model="searchForm.organizer" clearable placeholder="请输入课题承办单位" :maxlength="100" @keyup.enter.native="onSearch"/>
         </el-formItem>
-        <el-formItem label="启动时间" prop="startTime" class="search-item">
+        <el-formItem label="启动时间" class="search-item" style="margin-right: 0">
           <el-date-picker
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               type="date"
               clearable
               :editable="true"
-              placeholder="请选择启动时间"
-              v-model="searchForm.startTime"
+              placeholder="选择开始时间"
+              v-model="searchForm.startTimeBegin"
           >
           </el-date-picker>
         </el-formItem>
+        <el-form-item label="至" label-width="25px" class="search-item">
+          <el-date-picker
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              type="date"
+              clearable
+              :editable="true"
+              placeholder="选择结束时间"
+              v-model="searchForm.startTimeEnd"
+          >
+          </el-date-picker>
+        </el-form-item>
         <el-formItem label="课题状态" prop="topicStatus" class="search-item">
           <el-select v-model="searchForm.topicStatus"
                      placeholder="请选择课题状态"

src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue

@@ -32,18 +32,30 @@
         <el-formItem label="资料标题" prop="name" class="search-item">
           <el-input v-model="searchForm.name" clearable placeholder="请输入资料标题" :maxlength="100" @keyup.enter.native="onSearch"/>
         </el-formItem>
-        <el-formItem label="上传时间" prop="uploadTime" class="search-item">
+        <el-formItem label="上传时间" class="search-item" style="margin-right: 0">
           <el-date-picker
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               type="date"
               clearable
               :editable="true"
-              placeholder="请选择上传时间"
-              v-model="searchForm.uploadTime"
+              placeholder="选择开始时间"
+              v-model="searchForm.uploadTimeBegin"
           >
           </el-date-picker>
         </el-formItem>
+        <el-form-item label="至" label-width="25px" class="search-item">
+          <el-date-picker
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              type="date"
+              clearable
+              :editable="true"
+              placeholder="选择结束时间"
+              v-model="searchForm.uploadTimeEnd"
+          >
+          </el-date-picker>
+        </el-form-item>
         <el-form-item class="search-item btn-box">
           <el-button
               type="primary"