sz-team/supervision-test-frontend-repo
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* style(bg,dq): 查询区域高级查询按钮调整到重置前，统一列表代码格式
* fix(inspectProblem): 年份筛选与表单字段改用年份选择器
* fix(bgpartymatter): 分管所领导下拉按角色跨部门查询
* style(xispeak,inspectTask): 表单整行字段 label 缩窄实现输入框左对齐
* fix(xispeak): 督办状态改读 bpmStatus，修复发起收集流程误置已完成
* fix(xispeak): 导出切 EasyExcel 端点
This commit is contained in:
wsm
2026-08-13 03:16:15 +00:00
parent 5f2eee8d2a
commit 9742faf892
13 changed files with 316 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/semri/userComponent/DeptRoleUserSelectDropDown.vue
+3 -5
View File
@@ -38,18 +38,16 @@ const modelValue = defineModel<string>('value', { default: '' });
const userList = ref<Array<{ username: string; realname: string }>>([]);
async function fetchUserList() {
if (!props.deptId) {
userList.value = [];
return;
}
try {
const params = {
departId: props.deptId,
roleId: props.roleId,
searchSecurityLevel: 5,
pageNo: 1,
pageSize: 999,
};
if (props.deptId) {
params.departId = props.deptId;
}
const res = await defHttp.get({ url: '/sys/user/queryUserRoleComponentData', params });
const records = res?.records || res?.result?.records || [];
userList.value = records.sort((a, b) => (a.sortno ?? Infinity) - (b.sortno ?? Infinity));
src/views/bg/bgpartymatter/BgPartymatterList.vue
+3 -3
View File
@@ -17,7 +17,7 @@
<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" :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">
@@ -53,9 +53,9 @@
<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>
@@ -181,7 +181,7 @@
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision';
import { CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision';
import { Tooltip } from 'ant-design-vue';
import Icon from '/@/components/Icon/index';
import BgPartymatterModal from './components/BgPartymatterModal.vue';
src/views/bg/bqtakepulse/BgTakepulseList.vue
+259 -184
View File
@@ -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%;
}
}
src/views/bg/xispeak/BgXiSpeak.api.ts
+3
View File
@@ -10,6 +10,7 @@ enum Api {
deleteBgXiSpeak = '/bg/xispeak/bgXiSpeak/delete',
importExcel = '/bg/xispeak/bgXiSpeak/importExcel',
exportXls = '/bg/xispeak/bgXiSpeak/exportXls',
exportXlsByEasyExcel = '/bg/xispeak/bgXiSpeak/exportXlsByEasyExcel',
exportXlsHeaders = '/bg/xispeak/bgXiSpeak/exportXlsHeaders',
importExcelByEasyExcel = '/bg/xispeak/bgXiSpeak/importExcelByEasyExcel',
checkExcelByEasyExcel = '/bg/xispeak/bgXiSpeak/checkExcelByEasyExcel',
@@ -26,6 +27,8 @@ enum Api {
*/
export const getExportUrl = Api.exportXls;
export const getExportXlsByEasyExcelUrl = Api.exportXlsByEasyExcel;
export const getExportXlsHeadersUrl = Api.exportXlsHeaders;
export const getImportExcelByEasyExcelUrl = Api.importExcelByEasyExcel;
src/views/bg/xispeak/BgXiSpeak.data.ts
+2 -3
View File
@@ -128,9 +128,8 @@ export const columns: BasicColumn[] = [
dataIndex: 'bpmStatus',
width: 90,
customRender: ({ record }) => {
// 督办状态以关联流程实时推导结果为准（superviseStatus），未取到时才回退到存储值
const status = record?.superviseStatus ?? record?.bpmStatus;
return { '1': '未开始', '2': '督办中', '3': '已完成' }[status] ?? '';
// 督办状态（流程状态）以 bpmStatus 为准，与反馈状态无关
return { '1': '未开始', '2': '督办中', '3': '已完成' }[record?.bpmStatus] ?? '';
},
},
// {
src/views/bg/xispeak/BgXiSpeakList.vue
+14 -69
View File
@@ -4,7 +4,7 @@
<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">
<a-col :xl="6" :lg="6" :md="8" :sm="12">
<a-col :xl="5" :lg="6" :md="8" :sm="12">
<a-form-item name="speakStatus">
<template #label>
<a-tooltip title="支持模糊查询，输入重要讲话指示批示情况关键词">习总书记重要讲话指示批示</a-tooltip>
@@ -12,8 +12,8 @@
<a-tooltip title="支持模糊查询，输入重要讲话指示批示情况关键词"><JInput v-model:value="queryParam.speakStatus" type="like" placeholder="请输入重要讲话指示批示情况" allow-clear trim @change="debouncedSearchQuery" /></a-tooltip>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="6" :md="8" :sm="12">
<a-form-item name="implDept">
<a-col :xl="6" :lg="6" :md="8" :sm="12">
<a-form-item name="implDept" :label-col="{ xs: 24, sm: 8, xl: 6 }" :wrapper-col="{ xs: 24, sm: 16, xl: 18 }">
<template #label>
<a-tooltip title="按牵头部门筛选">牵头部门</a-tooltip>
</template>
@@ -48,9 +48,9 @@
<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" @click="searchReset">重置</a-button>
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<a-button preIcon="ant-design:reload-outlined" @click="searchReset">重置</a-button>
</div>
</a-col>
</a-row>
@@ -63,7 +63,7 @@
:expandedRowKeys="expandedRowKeys"
@expand="handleExpand"
@fetch-success="onFetchSuccess"
:rowClassName="(r) => (r.superviseStatus || r.bpmStatus) ? 'status-row-' + (r.superviseStatus || r.bpmStatus) : ''"
:rowClassName="(r) => r.bpmStatus ? 'status-row-' + r.bpmStatus : ''"
>
<!--插槽:table标题-->
<template #tableTitle>
@@ -162,7 +162,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
list,
deleteBgXiSpeak,
batchDeleteBgXiSpeak,
getExportUrl,
getExportXlsByEasyExcelUrl,
getImportUrl,
getExportXlsHeadersUrl,
getImportExcelByEasyExcelUrl,
@@ -174,7 +174,6 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
withDrawXiSpeak,
queryFeedbackCounts,
statusStats,
getBusinessStatus,
} from './BgXiSpeak.api';
const FLOW_CODE = 'dev_bg_xi_speak_001';
@@ -220,7 +219,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
},
exportConfig: {
name: '习总书记重要讲话指示批示情况',
url: getExportUrl,
url: getExportXlsByEasyExcelUrl,
},
importConfig: {
url: getImportUrl,
@@ -390,7 +389,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
result = result.records ? result.records : result;
if (result && result.length > 0) {
record.children = getDataByResult(result);
await Promise.all([refreshFeedbackCounts(record.children), refreshSuperviseStatus(record.children)]);
await refreshFeedbackCounts(record.children);
// 触发表格重新渲染
updateTableDataRecord(record.id, { ...record });
} else {
@@ -444,18 +443,9 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
const ids = collectAllIds(records);
if (ids.length === 0) return;
try {
const res = await queryFeedbackCounts({ ids: ids.join(',') });
const data = Array.isArray(res) ? res : res?.records || res?.result || [];
const countsMap: Record<string, { total: number; closed: number }> = {};
for (const item of data) {
const id = item.mainId || item.id || item.main_id;
if (id) {
countsMap[id] = {
total: item.total ?? item.implCount ?? 0,
closed: item.closed ?? item.closedCount ?? 0,
};
}
}
// 后端返回 Map<mainId, {total, closed}>，直接作为 countsMap 使用
const countsMap: Record<string, { total: number; closed: number }> =
(await queryFeedbackCounts({ ids: ids.join(',') })) || {};
const updateFn = (list) => {
if (!list) return;
for (const item of list) {
@@ -473,56 +463,14 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
}
}
/**
* 批量刷新督办状态：流程状态与督办事项（反馈）闭环情况合并推导
* 规则：运行中的流程始终督办中；有督办事项时全部闭环=已完成、有未闭环=督办中；无督办事项以流程状态为准
*/
async function refreshSuperviseStatus(records) {
const ids = collectAllIds(records).filter((id) => !String(id).includes('loadChild'));
if (ids.length === 0) return;
try {
const [statusResults, countsRes] = await Promise.all([
Promise.allSettled(ids.map((id) => getBusinessStatus({ businessId: id }))),
queryFeedbackCounts({ ids: ids.join(',') }),
]);
const countsMap = countsRes || {};
const statusMap: Record<string, string> = {};
statusResults.forEach((res, index) => {
const id = ids[index];
let status = res.status === 'fulfilled' && res.value && res.value.status ? res.value.status : undefined;
const counts = countsMap[id];
if (counts && Number(counts.total) > 0) {
if (status !== '2') {
status = Number(counts.closed) >= Number(counts.total) ? '3' : '2';
}
}
if (status) {
statusMap[id] = status;
}
});
const updateFn = (list) => {
if (!list) return;
for (const item of list) {
if (statusMap[item.id]) {
item.superviseStatus = statusMap[item.id];
}
if (item.children) updateFn(item.children);
}
};
updateFn(records);
} catch (e) {
// 静默处理查询异常
}
}
/**
* 接口请求成功后回调
*/
async function onFetchSuccess(result) {
getDataByResult(result.items) && loadDataByExpandedRows();
if (result.items && result.items.length > 0) {
await Promise.all([refreshFeedbackCounts(result.items), refreshSuperviseStatus(result.items)]);
// 触发表格重新渲染以显示更新后的 implCount / closedCount / 督办状态
await refreshFeedbackCounts(result.items);
// 触发表格重新渲染以显示更新后的 implCount / closedCount
setTableData([...getDataSource()]);
}
}
@@ -559,9 +507,6 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
}
};
fn(getDataSource());
await refreshSuperviseStatus(records);
// 触发表格重新渲染以显示子节点督办状态
setTableData([...getDataSource()]);
}
}
}
@@ -872,7 +817,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
};
await startProcessSchedules(params);
await saveOrUpdateDict({ id: record.id, bpmStatus: '3', supervisionCount: nextSuperviseCount, completionStatus: 0 }, true);
await saveOrUpdateDict({ id: record.id, bpmStatus: '2', supervisionCount: nextSuperviseCount, completionStatus: 0 }, true);
createMessage.success('发起成功');
reload();
fetchStatusStats();
src/views/bg/xispeak/components/BgXiSpeakBPMFeedbackModal.vue
+3 -2
View File
@@ -129,8 +129,9 @@
const uploadKey = ref(0);
const labelCol = { xs: { span: 24 }, sm: { span: 8 } };
const wrapperCol = { xs: { span: 24 }, sm: { span: 16 } };
const wideLabelCol = { xs: { span: 24 }, sm: { span: 8 } };
const wideWrapperCol = { xs: { span: 24 }, sm: { span: 16 } };
// 整行（span=24）字段用更窄的 label，使其输入框左边缘与半行字段（span=8 于 span=12 列）对齐
const wideLabelCol = { xs: { span: 24 }, sm: { span: 4 } };
const wideWrapperCol = { xs: { span: 24 }, sm: { span: 20 } };
const formData = reactive<Record<string, any>>({
id: '',
src/views/bg/xispeak/components/BgXiSpeakFeedbackForm.vue
+7 -4
View File
@@ -38,7 +38,7 @@
<a-divider orientation="left" plain>措施信息</a-divider>
<a-row class="form-content-row" :gutter="[12, 4]">
<a-col :span="24">
<a-form-item label="具体措施" name="method">
<a-form-item label="具体措施" name="method" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.method" placeholder="请输入措施内容" :rows="3" allow-clear></a-textarea>
</a-form-item>
</a-col>
@@ -59,7 +59,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="进展情况" v-bind="validateInfos.progress" name="progress">
<a-form-item label="进展情况" v-bind="validateInfos.progress" name="progress" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.progress" placeholder="请输入进展情况" :rows="3" allow-clear></a-textarea>
</a-form-item>
</a-col>
@@ -101,7 +101,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="落实计划" name="completionPlan">
<a-form-item label="落实计划" name="completionPlan" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.completionPlan" placeholder="请输入落实计划" :rows="3" allow-clear></a-textarea>
</a-form-item>
</a-col>
@@ -116,7 +116,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="监督意见" name="inspectionAdvice">
<a-form-item label="监督意见" name="inspectionAdvice" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.inspectionAdvice" placeholder="请输入监督意见" :rows="3" allow-clear></a-textarea>
</a-form-item>
</a-col>
@@ -226,6 +226,9 @@
});
const labelCol = { xs: { span: 24 }, sm: { span: 8 } };
const wrapperCol = { xs: { span: 24 }, sm: { span: 16 } };
// 整行（span=24）字段用更窄的 label，使其输入框左边缘与半行字段（span=8 于 span=12 列）对齐
const wideLabelCol = { xs: { span: 24 }, sm: { span: 4 } };
const wideWrapperCol = { xs: { span: 24 }, sm: { span: 20 } };
function fillDeptFromLogin() {
const userInfo = (userStore.getUserInfo || {}) as Record<string, any>;
src/views/bg/xispeak/components/BgXiSpeakForm.vue
+2 -2
View File
@@ -12,8 +12,8 @@
v-bind="validateInfos.speakStatus"
id="BgXiSpeakForm-speakStatus"
name="speakStatus"
:labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
>
<a-textarea v-model:value="formData.speakStatus" :rows="3" placeholder="请输入习近平总书记重要讲话指示批示情况" allow-clear />
</a-form-item>
src/views/dq/inspectProblem/DqInspectProblemList.vue
+1 -2
View File
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :lg="8" :md="6" :sm="8">
<a-form-item label="年份" name="year">
<JDictSelectTag v-model:value="queryParam.year" dictCode="super_year" placeholder="请选择年份" allow-clear @change="searchQuery" />
<a-date-picker v-model:value="queryParam.year" picker="year" value-format="YYYY" placeholder="请选择年份" allow-clear style="width: 100%" @change="searchQuery" />
</a-form-item>
</a-col>
<a-col :lg="8">
@@ -68,7 +68,6 @@
import { downloadFile } from '/@/utils/common/renderUtils';
import DqInspectProblemModal from './components/DqInspectProblemModal.vue'
import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
src/views/dq/inspectProblem/components/DqInspectProblemForm.vue
+1 -1
View File
@@ -11,7 +11,7 @@
</a-col>
<a-col :span="24">
<a-form-item label="年份" v-bind="validateInfos.year" id="DqInspectProblemForm-year" name="year">
<j-dict-select-tag v-model:value="formData.year" dictCode="super_year" placeholder="请选择年份" allow-clear />
<a-date-picker v-model:value="formData.year" picker="year" value-format="YYYY" placeholder="请选择年份" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
src/views/dq/inspectTask/DqInspectTaskList.vue
+17 -10
View File
@@ -11,7 +11,15 @@
</a-col>
<a-col :xl="5" :lg="6" :md="8" :sm="12">
<a-form-item label="分管所领导" name="chargeLeaderId">
<DeptRoleUserSelectDropDown v-model:value="queryParam.chargeLeaderId" :deptId="PARTY_COMMITTEE_DEPT_ID" :roleId="CHARGE_LEADER_ROLE_ID" placeholder="请选择分管所领导" allow-clear style="width: 100%" @change="reload" />
<DeptRoleUserSelectDropDown
v-model:value="queryParam.chargeLeaderId"
:deptId="PARTY_COMMITTEE_DEPT_ID"
:roleId="CHARGE_LEADER_ROLE_ID"
placeholder="请选择分管所领导"
allow-clear
style="width: 100%"
@change="reload"
/>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="6" :md="8" :sm="12">
@@ -31,27 +39,28 @@
<a-col :xl="6" :lg="6" :md="8" :sm="12">
<div class="table-page-search-submitButtons">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
<a-button preIcon="ant-design:reload-outlined" @click="searchReset">重置</a-button>
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
<a-button preIcon="ant-design:reload-outlined" @click="searchReset">重置</a-button>
</div>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection" @fetch-success="onFetchSuccess" :rowClassName="(r) => r.bpmStatus ? 'status-row-' + r.bpmStatus : ''">
<BasicTable
@register="registerTable"
:rowSelection="rowSelection"
@fetch-success="onFetchSuccess"
:rowClassName="(r) => (r.bpmStatus ? 'status-row-' + r.bpmStatus : '')"
>
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" v-auth="'dqinspecttask:dq_inspect_task:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" v-auth="'dqinspecttask:dq_inspect_task:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">
导出</a-button
>
<j-upload-button
type="primary"
v-auth="'dqinspecttask:dq_inspect_task:importExcel'"
preIcon="ant-design:import-outlined"
@click="onImportXls"
<j-upload-button type="primary" v-auth="'dqinspecttask:dq_inspect_task:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
>导入</j-upload-button
>
<a-button
@@ -608,8 +617,6 @@
setTableData([...getDataSource()]);
}
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
src/views/dq/inspectTask/components/DqInspectTaskForm.vue
+1 -1
View File
@@ -7,7 +7,7 @@
<a-divider orientation="left" plain>基本信息</a-divider>
<a-row :gutter="[16, 0]">
<a-col :span="24">
<a-form-item label="具体问题" v-bind="validateInfos.problemId" id="DqInspectTaskForm-problemId" name="problemId">
<a-form-item label="具体问题" v-bind="validateInfos.problemId" id="DqInspectTaskForm-problemId" name="problemId" :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }">
<a-tree-select
v-model:value="formData.problemId"
:tree-data="problemTreeData"