!151 style(bg,dq): 查询区域高级查询按钮调整到重置前，统一列表代码格式

* style(bg,dq): 查询区域高级查询按钮调整到重置前，统一列表代码格式 * fix(inspectProblem): 年份筛选与表单字段改用年份选择器 * fix(bgpartymatter): 分管所领导下拉按角色跨部门查询 * style(xispeak,inspectTask): 表单整行字段 label 缩窄实现输入框左对齐 * fix(xispeak): 督办状态改读 bpmStatus，修复发起收集流程误置已完成 * fix(xispeak): 导出切 EasyExcel 端点
2026-08-13 03:16:15 +00:00
parent 5f2eee8d2a
commit 9742faf892
13 changed files with 316 additions and 286 deletions
@@ -9,7 +9,9 @@
              <template #label>
                <a-tooltip title="支持模糊查询，输入意见主题关键词">意见主题</a-tooltip>
              </template>
-              <a-tooltip title="支持模糊查询，输入意见主题关键词"><JInput v-model:value="queryParam.title" type="like" placeholder="请输入意见主题" allow-clear trim @change="debouncedSearchQuery" /></a-tooltip>
+              <a-tooltip title="支持模糊查询，输入意见主题关键词"
+                ><JInput v-model:value="queryParam.title" type="like" placeholder="请输入意见主题" allow-clear trim @change="debouncedSearchQuery"
+              /></a-tooltip>
            </a-form-item>
          </a-col>
          <a-col :xl="3" :lg="6" :md="8" :sm="12">
@@ -17,7 +19,14 @@
              <template #label>
                <a-tooltip title="按会议类型筛选">会议类型</a-tooltip>
              </template>
-              <a-tooltip title="按会议类型筛选"><JDictSelectTag v-model:value="queryParam.taskType" dictCode="super_takepulse_type" placeholder="请选择会议类型" allow-clear @change="searchQuery" /></a-tooltip>
+              <a-tooltip title="按会议类型筛选"
+                ><JDictSelectTag
+                  v-model:value="queryParam.taskType"
+                  dictCode="super_takepulse_type"
+                  placeholder="请选择会议类型"
+                  allow-clear
+                  @change="searchQuery"
+              /></a-tooltip>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="6" :md="8" :sm="12">
@@ -25,7 +34,16 @@
              <template #label>
                <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="4" :lg="6" :md="8" :sm="12">
@@ -33,7 +51,15 @@
              <template #label>
                <a-tooltip title="按牵头部门筛选">牵头部门</a-tooltip>
              </template>
-              <a-tooltip title="按牵头部门筛选"><sz-select-dept placeholder="请选择牵头部门" v-model:value="selectedResponDept" :checkable="false" checkStrictly allow-clear @change="handleResponDeptChange" /></a-tooltip>
+              <a-tooltip title="按牵头部门筛选"
+                ><sz-select-dept
+                  placeholder="请选择牵头部门"
+                  v-model:value="selectedResponDept"
+                  :checkable="false"
+                  checkStrictly
+                  allow-clear
+                  @change="handleResponDeptChange"
+              /></a-tooltip>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="6" :md="8" :sm="12">
@@ -41,51 +67,79 @@
              <template #label>
                <a-tooltip title="按协办部门筛选">协办部门</a-tooltip>
              </template>
-              <a-tooltip title="按协办部门筛选"><sz-select-dept placeholder="请选择协办部门" v-model:value="selectedAssistDept" :checkable="false" checkStrictly allow-clear @change="handleAssistDeptChange" /></a-tooltip>
+              <a-tooltip title="按协办部门筛选"
+                ><sz-select-dept
+                  placeholder="请选择协办部门"
+                  v-model:value="selectedAssistDept"
+                  :checkable="false"
+                  checkStrictly
+                  allow-clear
+                  @change="handleAssistDeptChange"
+              /></a-tooltip>
            </a-form-item>
          </a-col>
          <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>
+              <super-query :config="superQueryConfig" @search="handleSuperQuery" />
              <a-button preIcon="ant-design:reload-outlined" @click="searchReset">重置</a-button>
              <!-- 高级查询 -->
-              <super-query :config="superQueryConfig" @search="handleSuperQuery" />
            </div>
          </a-col>
        </a-row>
      </a-form>
    </div>
    <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" :expandIcon="expandIcon" :rowClassName="(r) => r.bpmStatus ? 'status-row-' + r.bpmStatus : ''">
-     <!--插槽:table标题-->
+    <BasicTable
+      @register="registerTable"
+      :rowSelection="rowSelection"
+      :expandedRowKeys="expandedRowKeys"
+      @expand="handleExpand"
+      :expandIcon="expandIcon"
+      :rowClassName="(r) => (r.bpmStatus ? 'status-row-' + r.bpmStatus : '')"
+    >
+      <!--插槽:table标题-->
      <template #tableTitle>
-          <a-button type="primary" v-auth="'bqtakepulse:bg_takepulse:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" v-auth="'bqtakepulse:bg_takepulse:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-<a-button type="primary" v-auth="'bqtakepulse:bg_takepulse:exportXls'" preIcon="ant-design:download-outlined" @click="handleDownloadTemplate">下载模板</a-button>
-          <j-upload-button type="primary" v-auth="'bqtakepulse:bg_takepulse:importExcel'" preIcon="ant-design:check-outlined" @click="handleCheckExcel">模板校验</j-upload-button>
-          <j-upload-button type="primary" v-auth="'bqtakepulse:bg_takepulse:importExcel'" preIcon="ant-design:import-outlined" @click="handleImportByTemplate">模板导入</j-upload-button>
-          <a-dropdown v-if="selectedRowKeys.length > 0">
-            <template #overlay>
-              <a-menu>
-                <a-menu-item key="1" @click="batchHandleDelete">
-                  <Icon icon="ant-design:delete-outlined"></Icon>
-                  删除
-                </a-menu-item>
-              </a-menu>
-            </template>
-            <a-button v-auth="'bqtakepulse:bg_takepulse:deleteBatch'">批量操作
-              <Icon icon="mdi:chevron-down"></Icon>
-            </a-button>
-          </a-dropdown>
+        <a-button type="primary" v-auth="'bqtakepulse:bg_takepulse:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" v-auth="'bqtakepulse:bg_takepulse:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">
+          导出</a-button
+        >
+        <a-button type="primary" v-auth="'bqtakepulse:bg_takepulse:exportXls'" preIcon="ant-design:download-outlined" @click="handleDownloadTemplate"
+          >下载模板</a-button
+        >
+        <j-upload-button type="primary" v-auth="'bqtakepulse:bg_takepulse:importExcel'" preIcon="ant-design:check-outlined" @click="handleCheckExcel"
+          >模板校验</j-upload-button
+        >
+        <j-upload-button
+          type="primary"
+          v-auth="'bqtakepulse:bg_takepulse:importExcel'"
+          preIcon="ant-design:import-outlined"
+          @click="handleImportByTemplate"
+          >模板导入</j-upload-button
+        >
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'bqtakepulse:bg_takepulse:deleteBatch'"
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
        <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>
          <a-tag color="success">已完成 {{ statsData.completed }}</a-tag>
        </a-space>
      </template>
-       <!--操作栏-->
+      <!--操作栏-->
      <template #action="{ record }">
-        <TableAction stopButtonPropagation :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction stopButtonPropagation :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
      </template>
      <!--字段回显插槽-->
      <template v-slot:bodyCell="{ column, record, index, text }">
@@ -108,8 +162,12 @@
                <a-tag class="feedback-expand-count" color="processing">加载中</a-tag>
              </template>
              <template v-else>
-                <a-tag class="feedback-expand-count" color="warning" style="color: #8c6900">未开始 {{ getFeedbackStatusCount(record).notStarted }}</a-tag>
-                <a-tag class="feedback-expand-count" color="error">进行中 {{ getFeedbackStatusCount(record).inProgress }}（已逾期 {{ getFeedbackStatusCount(record).overdue }}）</a-tag>
+                <a-tag class="feedback-expand-count" color="warning" style="color: #8c6900"
+                  >未开始 {{ getFeedbackStatusCount(record).notStarted }}</a-tag
+                >
+                <a-tag class="feedback-expand-count" color="error"
+                  >进行中 {{ getFeedbackStatusCount(record).inProgress }}（已逾期 {{ getFeedbackStatusCount(record).overdue }}）</a-tag
+                >
                <a-tag class="feedback-expand-count" color="success">已完成 {{ getFeedbackStatusCount(record).completed }}</a-tag>
                <a-tag class="feedback-expand-count">(共 {{ getFeedbackStatusCount(record).total }} 条)</a-tag>
              </template>
@@ -148,22 +206,33 @@
    </BasicTable>
    <!-- 表单区域 -->
    <BgTakepulseModal @register="registerModal" @success="handleSuccess"></BgTakepulseModal>
-      <!-- 审批记录 -->
-      <BpmPictureModal @register="registerBpmModal" />
+    <!-- 审批记录 -->
+    <BpmPictureModal @register="registerBpmModal" />
    <FlowScheduleStartModalForBG ref="flowScheduleModalRef" @confirm="handleFlowScheduleConfirm" />
    <BusinessProcessListModal ref="businessProcessListModalRef" />
  </div>
 </template>

 <script lang="ts" name="bqtakepulse-bgTakepulse" setup>
-  import {ref, reactive, h, onMounted} from 'vue';
-  import {BasicTable, TableAction} from '/@/components/Table';
+  import { ref, reactive, h, onMounted } from 'vue';
+  import { BasicTable, TableAction } from '/@/components/Table';
  import type { BasicColumn } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import {useModal} from '/@/components/Modal';
-  import BgTakepulseModal from './components/BgTakepulseModal.vue'
-  import {columns, superQuerySchema} from './BgTakepulse.data';
-  import {list, statusStats, deleteOne, getImportUrl, getExportXlsByEasyExcelUrl, getImportExcelByEasyExcelUrl, getCheckExcelByEasyExcelUrl, getExportXlsHeadersUrl, saveOrUpdate, bgTakepulseFeedbackList} from './BgTakepulse.api';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { useModal } from '/@/components/Modal';
+  import BgTakepulseModal from './components/BgTakepulseModal.vue';
+  import { columns, superQuerySchema } from './BgTakepulse.data';
+  import {
+    list,
+    statusStats,
+    deleteOne,
+    getImportUrl,
+    getExportXlsByEasyExcelUrl,
+    getImportExcelByEasyExcelUrl,
+    getCheckExcelByEasyExcelUrl,
+    getExportXlsHeadersUrl,
+    saveOrUpdate,
+    bgTakepulseFeedbackList,
+  } from './BgTakepulse.api';
  import { defHttp } from '/@/utils/http/axios';
  import { showImportValidationErrors } from '/@/utils/helper/importError';
  import { useMessage } from '/@/hooks/web/useMessage';
@@ -181,7 +250,7 @@
  import FlowScheduleStartModalForBG from '/src/components/semri/process/FlowScheduleStartModalForBG.vue';
  import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
  import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
-  import {batchDelete} from "@/views/bg/bqtakepulse/BgTakepulse.api";
+  import { batchDelete } from '@/views/bg/bqtakepulse/BgTakepulse.api';

  const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
  const FLOW_CODE = 'dev_task_task_001';
@@ -203,7 +272,7 @@
            class: iconCls,
            onClick: (e: Event) => onExpand(record, e),
          }),
-      },
+      }
    );
  }

@@ -216,45 +285,45 @@
  const statsData = reactive({ notStarted: 0, inProgress: 0, overdue: 0, completed: 0 });
  const feedbackTableLoading = reactive<Record<string, boolean>>({});
  //注册model
-  const [registerModal, {openModal}] = useModal();
+  const [registerModal, { openModal }] = useModal();
  const flowScheduleModalRef = ref();
  const businessProcessListModalRef = ref();
-   //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '我为四所把把脉',
-           api: list,
-           columns,
-           canResize:false,
-           useSearchForm: false,
-           expandRowByClick: true,
-           clickToRowSelect: false,
-           rowSelection: { type: 'checkbox' },
-           actionColumn: {
-               width: 120,
-               fixed:'right'
-           },
-           beforeFetch: async (params) => {
-             return Object.assign(params, queryParam);
-           },
-        pagination: {
-          current: 1,
-          pageSize: 12,
-          pageSizeOptions: ['12', '24', '36'],
-        },
-        },
-        exportConfig: {
-            name:"我为四所把把脉",
-            url: getExportXlsByEasyExcelUrl,
-            params: queryParam,
-        },
-        importConfig: {
-            url: getImportUrl,
-            success: handleSuccess
-        },
-    })
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '我为四所把把脉',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      expandRowByClick: true,
+      clickToRowSelect: false,
+      rowSelection: { type: 'checkbox' },
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: async (params) => {
+        return Object.assign(params, queryParam);
+      },
+      pagination: {
+        current: 1,
+        pageSize: 12,
+        pageSizeOptions: ['12', '24', '36'],
+      },
+    },
+    exportConfig: {
+      name: '我为四所把把脉',
+      url: getExportXlsByEasyExcelUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });

-  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;

  interface DeptOption {
    label: string;
@@ -274,7 +343,13 @@
      customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)),
    },
    { title: '实际执行情况', dataIndex: 'actualExect', align: 'left', width: 280 },
-    { title: '实际完成日期', dataIndex: 'actualTime', align: 'center', width: 155, customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)) },
+    {
+      title: '实际完成日期',
+      dataIndex: 'actualTime',
+      align: 'center',
+      width: 155,
+      customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)),
+    },
    { title: '调整落实措施及执行情况', dataIndex: 'actSt', align: 'left', width: 260 },
    {
      title: '完成状态',
@@ -398,108 +473,109 @@
    fetchStatusStats();
  });

-   /**
-    * 新增事件
-    */
+  /**
+   * 新增事件
+   */
  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
+    openModal(true, {
+      isUpdate: false,
+      showFooter: true,
+    });
  }
-   /**
-    * 编辑事件
-    */
+  /**
+   * 编辑事件
+   */
  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: true,
+    });
+  }
+  /**
+   * 详情
   */
  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: false,
+    });
+  }
+  /**
+   * 删除事件
+   */
  async function handleDelete(record) {
-     await deleteOne({id: record.id}, handleSuccess);
-   }
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
  /**
   * 批量删除事件
   */
  async function batchHandleDelete() {
-    await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
  }
-   /**
-    * 成功回调
-    */
+  /**
+   * 成功回调
+   */
  function handleSuccess() {
-      selectedRowKeys.value = [];
-      resetFeedbackExpand();
-      reload();
-      fetchStatusStats();
-   }
-   /**
-      * 操作栏
-      */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-           auth: 'bqtakepulse:bg_takepulse:edit'
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-       let dropDownAction = [
-         {
-           label: '详情',
-           onClick: handleDetail.bind(null, record),
-         }, {
-           label: '删除',
-           popConfirm: {
-             title: '是否确认删除',
-             confirm: handleDelete.bind(null, record)
-           },
-           auth: 'bqtakepulse:bg_takepulse:delete'
-         },
-           // {
-           //   label: '审批进度',
-           //   onClick: handlePreviewPic.bind(null, record),
-           //   ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
-           // },
-           {
-             label: '查询督办流程',
-             onClick: handleQueryProcess.bind(null, record),
-           }
-       ];
-       if(!record.bpmStatus || record.bpmStatus == '1'){
-         dropDownAction.push({
-           label: '发起督办流程',
-           onClick: handleProcess.bind(null, record),
-         })
-       }
-       if(record.bpmStatus == '2'){
-         dropDownAction.push({
-           label: '再次督办',
-           onClick: handleProcess.bind(null, record),
-         })
-       }
-       return dropDownAction;
-   }
+    selectedRowKeys.value = [];
+    resetFeedbackExpand();
+    reload();
+    fetchStatusStats();
+  }
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+        auth: 'bqtakepulse:bg_takepulse:edit',
+      },
+    ];
+  }
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    let dropDownAction = [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+        auth: 'bqtakepulse:bg_takepulse:delete',
+      },
+      // {
+      //   label: '审批进度',
+      //   onClick: handlePreviewPic.bind(null, record),
+      //   ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
+      // },
+      {
+        label: '查询督办流程',
+        onClick: handleQueryProcess.bind(null, record),
+      },
+    ];
+    if (!record.bpmStatus || record.bpmStatus == '1') {
+      dropDownAction.push({
+        label: '发起督办流程',
+        onClick: handleProcess.bind(null, record),
+      });
+    }
+    if (record.bpmStatus == '2') {
+      dropDownAction.push({
+        label: '再次督办',
+        onClick: handleProcess.bind(null, record),
+      });
+    }
+    return dropDownAction;
+  }

  /**
   * 提交流程
@@ -507,14 +583,15 @@
  const CN = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九'];

  function toChinese(num: number): string {
-    return String(num).split('').map(c => CN[Number(c)]).join('');
+    return String(num)
+      .split('')
+      .map((c) => CN[Number(c)])
+      .join('');
  }

  function handleProcess(record) {
    const nextCount = getNextSuperviseCount(record.superviseCount);
-    const title = nextCount > 1
-      ? `发起流程（${record?.title || ''} 第${toChinese(nextCount)}次督办）`
-      : '发起流程';
+    const title = nextCount > 1 ? `发起流程（${record?.title || ''} 第${toChinese(nextCount)}次督办）` : '发起流程';
    flowScheduleModalRef.value?.open({
      title,
      taskTitle: nextCount > 1 ? `${record?.title || ''} 第${nextCount}次督办` : record?.title,
@@ -650,15 +727,13 @@
    });
  }

-
-
  /* ----------------------以下为原生查询需要添加的-------------------------- */
  const { createMessage } = useMessage();
  const labelCol = reactive({
-    xs:24,
-    sm:4,
-    xl:6,
-    xxl:8
+    xs: 24,
+    sm: 4,
+    xl: 6,
+    xxl: 8,
  });
  const wrapperCol = reactive({
    xs: 24,
@@ -757,7 +832,6 @@
   * @param key
   * @param value
   */
-
 </script>
 <style lang="less" scoped>
  .jeecg-basic-table-form-container {
@@ -769,19 +843,20 @@
      margin-bottom: 24px;
      white-space: nowrap;
    }
-    .query-group-cust{
+    .query-group-cust {
      min-width: 100px !important;
    }
-    .query-group-split-cust{
+    .query-group-split-cust {
      width: 30px;
      display: inline-block;
-      text-align: center
+      text-align: center;
    }
-    .ant-form-item:not(.ant-form-item-with-help){
+    .ant-form-item:not(.ant-form-item-with-help) {
      margin-bottom: 16px;
      height: 32px;
    }
-    :deep(.ant-picker),:deep(.ant-input-number){
+    :deep(.ant-picker),
+    :deep(.ant-input-number) {
      width: 100%;
    }
  }