From 2a7b50f3cb2f224a3d4aab597041467f03132b2a Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 10 Nov 2023 16:12:50 +0800
Subject: [PATCH] =?UTF-8?q?78224=20=E5=86=85=E5=A4=96=E9=83=A8=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E3=80=81=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98=E3=80=81?=
 =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=B3=95=E8=A7=84=E8=B5=84=E6=96=99=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=B8=AD=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/components/TopicsTable.vue        |  16 ++-
 src/pages/policyRegulation/meeting/index.vue  |  18 ++-
 .../policyRegulation/policyTopics/index.vue   |  18 ++-
 .../components/RegulatoryMaterialsMain.vue    |  18 ++-
 .../components/RetrieveTopics.vue             | 120 ++++++++++--------
 5 files changed, 129 insertions(+), 61 deletions(-)

diff --git a/src/pages/policyRegulation/meeting/components/TopicsTable.vue b/src/pages/policyRegulation/meeting/components/TopicsTable.vue
index 4dca28cd8..69ed77451 100644
--- a/src/pages/policyRegulation/meeting/components/TopicsTable.vue
+++ b/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="请选择课题状态"
diff --git a/src/pages/policyRegulation/meeting/index.vue b/src/pages/policyRegulation/meeting/index.vue
index 29a48004c..17b595e91 100644
--- a/src/pages/policyRegulation/meeting/index.vue
+++ b/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"
diff --git a/src/pages/policyRegulation/policyTopics/index.vue b/src/pages/policyRegulation/policyTopics/index.vue
index c0c95841e..af726654f 100644
--- a/src/pages/policyRegulation/policyTopics/index.vue
+++ b/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="请选择课题状态"
diff --git a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue
index cca50ff7d..7f82f7373 100644
--- a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue
+++ b/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"
diff --git a/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue b/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue
index 992e91ecb..c2e0c8330 100644
--- a/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue
@@ -2,7 +2,7 @@
   <el-drawer
      ref="standard"
      title="查询结果"
-     size="1300px"
+     size="1000px"
      :visible.sync="standardDrawer"
      direction="rtl"
      :before-close="beforeClose">
@@ -10,53 +10,71 @@
       <div class="content">
         <div class="standard-table-search">
           <el-form :model="searchForm" inline class="label-input-form search-area">
-            <el-formItem label="课题名称" prop="topicName" class="search-item">
-              <el-input v-model="searchForm.topicName" clearable placeholder="请输入课题名称" :maxlength="100" @keyup.enter.native="getData"/>
-            </el-formItem>
-            <el-formItem label="课题承办单位" prop="organizer" class="search-item">
-              <el-input v-model="searchForm.organizer" clearable placeholder="请输入课题承办单位" :maxlength="100" @keyup.enter.native="getData"/>
-            </el-formItem>
-            <el-formItem label="启动时间" prop="startTime" class="search-item">
-              <el-date-picker
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  type="date"
-                  clearable
-                  :editable="true"
-                  placeholder="请选择启动时间"
-                  v-model="searchForm.startTime"
-              >
-              </el-date-picker>
-            </el-formItem>
-            <el-formItem label="课题状态" prop="topicStatus" class="search-item">
-              <el-select v-model="searchForm.topicStatus"
-                         placeholder="请选择课题状态"
-                         clearable>
-                <el-option
-                    v-for="opt in topicStatusOptions"
-                    :key="opt.value"
-                    :value="!opt.value ? '' : opt.value" :label="opt.label"
-                >
-                  {{ opt.label }}
-                </el-option>
-              </el-select>
-            </el-formItem>
-            <el-form-item>
-              <el-button :disabled="disabled"
-                         type="primary"
-                         class="common-button-primary"
-                         size="mini"
-                         style="margin-left: 5px"
-                         @click="getData">
-                查询
-              </el-button>
-              <el-button :disabled="disabled"
-                         class="common-button-default"
-                         size="mini"
-                         @click="resetSearch">
-                清空
-              </el-button>
-            </el-form-item>
+            <el-row>
+              <el-col>
+                <el-formItem label="课题名称" prop="topicName" class="search-item">
+                  <el-input v-model="searchForm.topicName" clearable placeholder="请输入课题名称" :maxlength="100" @keyup.enter.native="getData"/>
+                </el-formItem>
+                <el-formItem label="课题承办单位" prop="organizer" class="search-item">
+                  <el-input v-model="searchForm.organizer" clearable placeholder="请输入课题承办单位" :maxlength="100" @keyup.enter.native="getData"/>
+                </el-formItem>
+                <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.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-col>
+              <el-col>
+                <el-formItem label="课题状态" prop="topicStatus" class="search-item">
+                  <el-select v-model="searchForm.topicStatus"
+                             placeholder="请选择课题状态"
+                             clearable>
+                    <el-option
+                        v-for="opt in topicStatusOptions"
+                        :key="opt.value"
+                        :value="!opt.value ? '' : opt.value" :label="opt.label"
+                    >
+                      {{ opt.label }}
+                    </el-option>
+                  </el-select>
+                </el-formItem>
+                <el-form-item>
+                  <el-button :disabled="disabled"
+                             type="primary"
+                             class="common-button-primary"
+                             size="mini"
+                             style="margin-left: 5px"
+                             @click="getData">
+                    查询
+                  </el-button>
+                  <el-button :disabled="disabled"
+                             class="common-button-default"
+                             size="mini"
+                             @click="resetSearch">
+                    清空
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </div>
         <div class="standard-table-wrap">
@@ -162,7 +180,8 @@ export default {
         pageSize: this.$store.getters.userInfo.configContent,
         topicName: '',
         organizer: '',
-        startTime: '',
+        startTimeBegin: '',
+        startTimeEnd: '',
         topicStatus: ''
       },
       total: 0,
@@ -207,7 +226,8 @@ export default {
         pageSize: this.$store.getters.userInfo.configContent,
         topicName: '',
         organizer: '',
-        startTime: '',
+        startTimeBegin: '',
+        startTimeEnd: '',
         topicStatus: ''
       }