From ddccff0deedf2097d8f9e76882445ed47200be21 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Wed, 12 Aug 2026 20:27:23 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260812=20=E5=85=9A=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E3=80=81=E6=89=80=E5=8A=A1=E4=BC=9A=E6=9F=A5=E8=AF=A2=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bg/bgpartymatter/BgPartymatterList.vue    | 56 ++++++-------------
 src/views/bg/xispeak/BgXiSpeakList.vue        | 12 ++--
 2 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue
index da52c29..c89efdf 100644
--- a/src/views/bg/bgpartymatter/BgPartymatterList.vue
+++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue
@@ -3,24 +3,24 @@
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" @keyup.enter="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
-        <a-row :gutter="24" class="search-form-row">
-          <a-col :xl="6" :lg="6" :md="8" :sm="12">
-            <a-form-item name="year">
+        <a-row :gutter="24">
+          <a-col :xl="3" :lg="6" :md="8" :sm="12">
+            <a-form-item class="year-form-item" name="year">
               <template #label>
                 <a-tooltip title="按年份筛选">年份</a-tooltip>
               </template>
               <a-tooltip title="按年份筛选"><a-date-picker v-model:value="queryParam.year" picker="year" value-format="YYYY" placeholder="请选择年份" allow-clear style="width: 100%" @change="searchQuery" /></a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="6" :md="8" :sm="12">
+          <a-col :xl="4" :lg="6" :md="8" :sm="12">
             <a-form-item name="manageSuoleader">
               <template #label>
-                <a-tooltip title="按所党委分管所领导筛选">分管所领导</a-tooltip>
+                <a-tooltip title="按分管所领导筛选">分管所领导</a-tooltip>
               </template>
-              <a-tooltip title="按所党委分管所领导筛选"><DeptRoleUserSelectDropDown v-model:value="queryParam.manageSuoleader" :deptId="PARTY_COMMITTEE_DEPT_ID" :roleId="CHARGE_LEADER_ROLE_ID" placeholder="请选择分管所领导" allow-clear style="width: 100%" @change="searchQuery" /></a-tooltip>
+              <a-tooltip title="按分管所领导筛选"><DeptRoleUserSelectDropDown v-model:value="queryParam.manageSuoleader" :deptId="PARTY_COMMITTEE_DEPT_ID" :roleId="CHARGE_LEADER_ROLE_ID" placeholder="请选择分管所领导" allow-clear style="width: 100%" @change="searchQuery" /></a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="6" :md="8" :sm="12">
+          <a-col :xl="4" :lg="6" :md="8" :sm="12">
             <a-form-item name="title">
               <template #label>
                 <a-tooltip title="支持模糊查询，输入事项名称关键词">事项名称</a-tooltip>
@@ -28,7 +28,7 @@
               <a-tooltip title="支持模糊查询，输入事项名称关键词"><JInput v-model:value="queryParam.title" type="like" placeholder="请输入事项名称" allow-clear trim @update:value="searchQuery" /></a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="6" :md="8" :sm="12">
+          <a-col :xl="4" :lg="6" :md="8" :sm="12">
             <a-form-item name="content">
               <template #label>
                 <a-tooltip title="支持模糊查询，输入会议决议关键词">会议决议</a-tooltip>
@@ -36,7 +36,7 @@
               <a-tooltip title="支持模糊查询，输入会议决议关键词"><JInput v-model:value="queryParam.content" type="like" placeholder="请输入会议决议" allow-clear trim @update:value="searchQuery" /></a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col v-if="toggleSearchStatus" :xl="6" :lg="6" :md="8" :sm="12">
+          <a-col :xl="4" :lg="6" :md="8" :sm="12">
             <a-form-item name="bpmStatus">
               <template #label>
                 <a-tooltip title="按督办完成状态筛选">完成状态</a-tooltip>
@@ -50,18 +50,14 @@
               /></a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="6" :md="8" :sm="12">
-            <span class="table-page-search-submitButtons">
+          <a-col :xl="5" :lg="6" :md="8" :sm="12">
+            <div class="table-page-search-submitButtons">
               <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-              <a-button preIcon="ant-design:reload-outlined" style="margin-left: 8px" @click="searchReset">重置</a-button>
-            </span>
+              <a-button preIcon="ant-design:reload-outlined" @click="searchReset">重置</a-button>
+              <!-- 高级查询 -->
+              <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+            </div>
           </a-col>
-          <span class="search-toggle-btn">
-            <a @click="toggleSearchStatus = !toggleSearchStatus" style="cursor: pointer; user-select: none">
-              {{ toggleSearchStatus ? '收起' : '展开' }}
-              <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
-            </a>
-          </span>
         </a-row>
       </a-form>
     </div>
@@ -95,8 +91,6 @@
               <Icon icon="mdi:chevron-down"></Icon>
             </a-button>
           </a-dropdown>
-          <!-- 高级查询 -->
-          <super-query :config="superQueryConfig" @search="handleSuperQuery" />
           <a-space style="float: right; font-size: 14px; font-weight: bold">
             <a-tag color="warning" style="color: #8c6900">未开始 {{ statsData.notStarted }}</a-tag>
             <a-tag color="error">督办中 {{ statsData.inProgress }}（已逾期 {{ statsData.overdue }}）</a-tag>
@@ -252,7 +246,6 @@
   const registerModal = ref();
   const flowScheduleModalRef = ref();
   const businessProcessListModalRef = ref();
-  const toggleSearchStatus = ref<boolean>(true);
   const queryParam = reactive<any>({});
   const expandedRowKeys = ref<Array<string | number>>([]);
   const feedbackTableData = reactive<Record<string, Recordable[]>>({});
@@ -804,23 +797,10 @@
   .jeecg-basic-table-form-container {
     padding: 0;
 
-    .search-form-row {
-      position: relative;
-      padding-right: 64px;
-
-      .search-toggle-btn {
-        position: absolute;
-        right: 12px;
-        top: 0;
-        height: 32px;
-        display: flex;
-        align-items: center;
-        white-space: nowrap;
-      }
-    }
-
     .table-page-search-submitButtons {
-      display: block;
+      display: flex;
+      align-items: center;
+      gap: 8px;
       margin-bottom: 24px;
       white-space: nowrap;
     }
diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue
index 00fdd5e..731ad4b 100644
--- a/src/views/bg/xispeak/BgXiSpeakList.vue
+++ b/src/views/bg/xispeak/BgXiSpeakList.vue
@@ -7,7 +7,7 @@
           <a-col :xl="6" :lg="6" :md="8" :sm="12">
             <a-form-item name="speakStatus">
               <template #label>
-                <a-tooltip title="支持模糊查询，输入重要讲话指示批示情况关键词">讲话指示批示</a-tooltip>
+                <a-tooltip title="支持模糊查询，输入重要讲话指示批示情况关键词">习总书记重要讲话指示批示</a-tooltip>
               </template>
               <a-tooltip title="支持模糊查询，输入重要讲话指示批示情况关键词"><JInput v-model:value="queryParam.speakStatus" type="like" placeholder="请输入重要讲话指示批示情况" allow-clear trim @change="debouncedSearchQuery" /></a-tooltip>
             </a-form-item>
@@ -17,13 +17,13 @@
               <template #label>
                 <a-tooltip title="按牵头部门筛选">牵头部门</a-tooltip>
               </template>
-              <a-tooltip title="按牵头部门筛选"><SzSelectDept v-model:value="selectedImplDept" :multiple="true" placeholder="选择牵头部门" allow-clear style="width: 100%" @change="handleImplDeptChange" /></a-tooltip>
+              <a-tooltip title="按牵头部门筛选"><SzSelectDept v-model:value="selectedImplDept" :multiple="true" placeholder="选择牵头部门" checkStrictly allow-clear style="width: 100%" @change="handleImplDeptChange" /></a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="6" :md="8" :sm="12">
+          <a-col :xl="4" :lg="6" :md="8" :sm="12">
             <a-form-item name="responsiblePerson">
               <template #label>
-                <a-tooltip title="按所党委责任领导筛选">责任领导</a-tooltip>
+                <a-tooltip title="按所党委责任领导筛选">所党委责任领导</a-tooltip>
               </template>
               <a-tooltip title="按所党委责任领导筛选"><DeptRoleUserSelectDropDown v-model:value="queryParam.responsiblePerson" :deptId="PARTY_COMMITTEE_DEPT_ID" :roleId="SDW_LEADER_ROLE_ID" placeholder="请选择所党委责任领导" allow-clear style="width: 100%" @change="searchQuery" /></a-tooltip>
             </a-form-item>
@@ -33,7 +33,7 @@
 <!--              <JDictSelectTag v-model:value="queryParam.completionStatus" dictCode="db_status" placeholder="请选择完成状态" allow-clear @change="searchQuery" />-->
 <!--            </a-form-item>-->
 <!--          </a-col>-->
-          <a-col :xl="6" :lg="6" :md="8" :sm="12">
+          <a-col :xl="4" :lg="6" :md="8" :sm="12">
             <a-form-item name="bpmStatus">
               <template #label>
                 <a-tooltip title="按督办状态筛选">督办状态</a-tooltip>
@@ -45,7 +45,7 @@
               </a-select></a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="6" :md="8" :sm="12">
+          <a-col :xl="4" :lg="6" :md="8" :sm="12">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
               <a-button preIcon="ant-design:reload-outlined" style="margin-left: 8px" @click="searchReset">重置</a-button>