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

!110 style: 展开图标添加反馈信息tooltip，详情链接阻止行展开

Browse Source 
Merge pull request !110 from wsm/style/20260723
This commit is contained in:
wsm
2026-07-23 08:00:44 +00:00
committed by Gitee
parent c645c59b4b ab6cd2fccf
commit 9b00759897
7 changed files with 314 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Form/src/jeecg/components/JInput.vue
+6 -3
View File
@@ -1,5 +1,5 @@
<template>
<a-input v-bind="getBindValue" v-model:value="showText" @input="backValue"></a-input>
<a-input v-bind="getBindValue" v-model:value="showText" @input="backValue" @change="backValue"></a-input>
</template>
<script lang="ts">
@@ -23,6 +23,7 @@
const attrs = useAttrs();
//表单值
const showText = ref('');
let lastText = '';
// update-begin--author:liaozhiyang---date:20231026---for：【issues/803】JIput updateSchema不生效
//绑定属性
const getBindValue = computed(() => {
@@ -79,7 +80,7 @@
* 返回值
*/
function backValue(e) {
let text = e?.target?.value ?? '';
let text = typeof e === 'string' ? e : (e?.target?.value ?? '');
if (text && !!props.trim) {
text = text.trim();
}
@@ -98,8 +99,10 @@
break;
default:
}
emit('change', text);
if (text === lastText) return;
lastText = text;
emit('update:value', text);
emit('change', text);
}
return { showText, attrs, getBindValue, backValue };
src/views/bg/bgpartymatter/BgPartymatterList.vue
+42 -25
View File
@@ -4,27 +4,27 @@
<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 :lg="3" :md="6" :sm="8">
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="年份" name="year">
<JDictSelectTag v-model:value="queryParam.year" dictCode="super_year" placeholder="请选择年份" allow-clear @change="searchQuery" />
</a-form-item>
</a-col>
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="分管所领导" name="manageSuoleader">
<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-form-item>
</a-col>
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="事项名称" name="title">
<JInput v-model:value="queryParam.title" type="like" placeholder="请输入事项名称" allow-clear trim />
<JInput v-model:value="queryParam.title" type="like" placeholder="请输入事项名称" allow-clear trim @update:value="searchQuery" />
</a-form-item>
</a-col>
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="会议决议" name="content">
<JInput v-model:value="queryParam.content" type="like" placeholder="请输入会议决议" allow-clear trim />
<JInput v-model:value="queryParam.content" type="like" placeholder="请输入会议决议" allow-clear trim @update:value="searchQuery" />
</a-form-item>
</a-col>
<!-- <a-col :lg="6" :md="8" :sm="12">-->
<!-- <a-form-item label="事项目录编码" name="matterCode">-->
<!-- <JInput v-model:value="queryParam.matterCode" type="like" placeholder="请输入事项目录编码" allow-clear trim />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :lg="6" :md="6" :sm="8">
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="完成状态" name="bpmStatus">
<JDictSelectTag
v-model:value="queryParam.bpmStatus"
@@ -35,7 +35,7 @@
/>
</a-form-item>
</a-col>
<a-col :lg="3" :md="8" :sm="12">
<a-col :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>
@@ -46,7 +46,7 @@
</div>
<div class="content">
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" :rowClassName="(r) => r.bpmStatus ? 'status-row-' + r.bpmStatus : ''">
<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="actionAuth.add" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
@@ -87,7 +87,13 @@
<TableAction stopButtonPropagation :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
</template>
<!--字段回显插槽-->
<template v-slot:bodyCell="{ column, record, index, text }"> </template>
<template v-slot:bodyCell="{ column, record, index, text }">
<template v-if="column.dataIndex === 'title'">
<a-tooltip title="点击查看详情">
<a style="font-weight: 500" @mousedown.stop @click.stop="handleDetail(record)">{{ text }}</a>
</a-tooltip>
</template>
</template>
<!--嵌套子表-->
<template #expandedRowRender="{ record }">
<div class="feedback-expand-table">
@@ -150,7 +156,7 @@
</template>
<script lang="ts" name="bgpartymatter-bgPartymatter" setup>
import { reactive, ref, onMounted } from 'vue';
import { reactive, ref, h, onMounted } from 'vue';
import { BasicTable, TableAction } from '/@/components/Table';
import type { BasicColumn } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
@@ -159,6 +165,9 @@
import { startProcessSchedules } from '/@/api/common/api';
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 { Tooltip } from 'ant-design-vue';
import Icon from '/@/components/Icon/index';
import BgPartymatterModal from './components/BgPartymatterModal.vue';
import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
@@ -189,6 +198,25 @@
const FLOW_CODE = 'dev_task_task_001';
const BUSINESS_TABLE_NAME = 'bg_partymatter';
const FORM_URL = 'bg/bgpartymatter/components/BgPartymatterBPMForm';
function expandIcon({ expanded, onExpand, record }: { expanded: boolean; onExpand: Function; record: Recordable }) {
const iconCls = expanded
? 'ant-table-row-expand-icon ant-table-row-expand-icon-expanded'
: 'ant-table-row-expand-icon ant-table-row-expand-icon-collapsed';
return h(
Tooltip,
{ title: '查看当前事项办理情况' },
{
default: () =>
h('button', {
type: 'button',
class: iconCls,
onClick: (e: Event) => onExpand(record, e),
}),
},
);
}
const actionAuth = {
add: `${props.permissionPrefix}:add`,
edit: `${props.permissionPrefix}:edit`,
@@ -434,6 +462,7 @@
* 详情事件
*/
function handleDetail(record: Recordable) {
expandedRowKeys.value = [];
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
@@ -657,7 +686,6 @@
}
/* ----------------------以下为原生查询需要添加的-------------------------- */
const { createMessage } = useMessage();
const toggleSearchStatus = ref<boolean>(false);
const labelCol = reactive({
xs:24,
sm:4,
@@ -735,17 +763,6 @@
reload({ page: 1 });
}
/**
* form点击事件(以逗号分割)
* @param key
* @param value
*/
function handleFormJoinChange(key, value) {
if (typeof value != 'string') {
queryParam[key] = value.join(',');
}
}
</script>
<style lang="less" scoped>
src/views/bg/bqtakepulse/BgTakepulseList.vue
+68 -43
View File
@@ -2,57 +2,39 @@
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form ref="formRef" @keyup.enter="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="year">
<template #label><span title="年份">年份</span></template>
<j-select-multiple placeholder="请选择年份" v-model:value="queryParam.year" dictCode="super_year" allow-clear />
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="意见主题" name="title">
<JInput v-model:value="queryParam.title" type="like" placeholder="请输入意见主题" allow-clear trim @change="searchQuery" />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="taskType">
<template #label><span title="会议类型：行政线、技术线">会议类型</span></template>
<j-select-multiple placeholder="请选择会议类型：行政线、技术线" v-model:value="queryParam.taskType" dictCode="super_takepulse_type" allow-clear />
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="分管所领导" name="manageSuoleader">
<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-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="6">
<a-form-item name="type">
<template #label><span title="类别：党的建设等其他">类别：</span></template>
<a-input placeholder="请输入类别：党的建设等其他" v-model:value="queryParam.type" allow-clear ></a-input>
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="牵头部门" name="responDeptid">
<sz-select-dept placeholder="请选择牵头部门" v-model:value="selectedResponDept" checkStrictly allow-clear @change="handleResponDeptChange" />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="responDeptid">
<template #label><span title="牵头部门">牵头部门</span></template>
<sz-select-dept placeholder="请选择牵头部门" v-model:value="queryParam.responDeptid" checkStrictly allow-clear />
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="协办部门" name="assistDeptid">
<sz-select-dept placeholder="请选择协办部门" v-model:value="selectedAssistDept" checkStrictly allow-clear @change="handleAssistDeptChange" />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="assistDeptid">
<template #label><span title="协办部门">协办部门</span></template>
<sz-select-dept placeholder="请选择协办部门" v-model:value="queryParam.assistDeptid" checkStrictly allow-clear />
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-col :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" @click="searchReset" style="margin-left: 8px">重置</a-button>
<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col>
<a-button preIcon="ant-design:reload-outlined" style="margin-left: 8px" @click="searchReset">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" :rowClassName="(r) => r.bpmStatus ? 'status-row-' + r.bpmStatus : ''">
<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>
@@ -87,6 +69,11 @@
</template>
<!--字段回显插槽-->
<template v-slot:bodyCell="{ column, record, index, text }">
<template v-if="column.dataIndex === 'title'">
<a-tooltip title="点击查看详情">
<a style="font-weight: 500" @click="handleDetail(record)">{{ text }}</a>
</a-tooltip>
</template>
</template>
<!-- 嵌套反馈信息表，仅展示当前事项下的执行情况反馈记录。 -->
<template #expandedRowRender="{ record }">
@@ -149,7 +136,7 @@
</template>
<script lang="ts" name="bqtakepulse-bgTakepulse" setup>
import {ref, reactive, onMounted} from 'vue';
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'
@@ -161,8 +148,11 @@
import { showImportValidationErrors } from '/@/utils/helper/importError';
import { useMessage } from '/@/hooks/web/useMessage';
import { countFeedbackStatus } from '/@/views/bg/utils/feedbackStatusCount';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
import { Tooltip } from 'ant-design-vue';
import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision';
import Icon from '/@/components/Icon/index';
import { startProcessSchedules } from '/@/api/common/api';
import { dateUtil } from '/@/utils/dateUtil';
@@ -177,8 +167,28 @@
const FORM_URL = 'bg/bqtakepulse/components/BgTakepulseBPMForm';
const FLOW_NAME = '我为四所把把脉';
function expandIcon({ expanded, onExpand, record }: { expanded: boolean; onExpand: Function; record: Recordable }) {
const iconCls = expanded
? 'ant-table-row-expand-icon ant-table-row-expand-icon-expanded'
: 'ant-table-row-expand-icon ant-table-row-expand-icon-collapsed';
return h(
Tooltip,
{ title: '查看当前事项办理情况' },
{
default: () =>
h('button', {
type: 'button',
class: iconCls,
onClick: (e: Event) => onExpand(record, e),
}),
},
);
}
const formRef = ref();
const queryParam = reactive<any>({});
const selectedResponDept = ref([]);
const selectedAssistDept = ref([]);
const expandedRowKeys = ref<Array<string | number>>([]);
const feedbackTableData = reactive<Record<string, Recordable[]>>({});
const statsData = reactive({ notStarted: 0, inProgress: 0, overdue: 0, completed: 0 });
@@ -607,7 +617,6 @@
/* ----------------------以下为原生查询需要添加的-------------------------- */
const { createMessage } = useMessage();
const toggleSearchStatus = ref<boolean>(false);
const labelCol = reactive({
xs:24,
sm:4,
@@ -675,9 +684,29 @@
await defHttp.uploadFile({ url: getImportExcelByEasyExcelUrl }, { file: data.file }, { success: isReturn });
}
function handleResponDeptChange(values) {
if (values && values.length > 0) {
queryParam.responDeptid = values.join(',');
} else {
delete queryParam.responDeptid;
}
searchQuery();
}
function handleAssistDeptChange(values) {
if (values && values.length > 0) {
queryParam.assistDeptid = values.join(',');
} else {
delete queryParam.assistDeptid;
}
searchQuery();
}
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
selectedResponDept.value = [];
selectedAssistDept.value = [];
resetFeedbackExpand();
//刷新数据
reload({ page: 1 });
@@ -688,11 +717,7 @@
* @param key
* @param value
*/
function handleFormJoinChange(key, value) {
if (typeof value != 'string') {
queryParam[key] = value.join(',');
}
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
src/views/bg/xispeak/BgXiSpeak.data.ts
+36 -45
View File
@@ -9,36 +9,58 @@ export const columns: BasicColumn[] = [
title: '习近平总书记重要讲话指示批示情况',
align: 'center',
dataIndex: 'speakStatus',
width: 300,
},
{
title: '企业负责同志批示情况',
align: 'center',
dataIndex: 'elmComment',
width: 260,
},
{
title: '学习传达研究部署情况',
align: 'center',
dataIndex: 'status',
width: 260,
},
{
title: '时间',
align: 'center',
dataIndex: 'time',
width: 110,
customRender: ({ text }) => {
text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
return text;
},
},
{
title: '企业负责同志批示情况',
title: '截止日期',
align: 'center',
dataIndex: 'elmComment',
dataIndex: 'deadline',
width: 110,
customRender: ({ text }) => {
if (!text) return '';
if (text instanceof Date) {
const y = text.getFullYear();
const m = String(text.getMonth() + 1).padStart(2, '0');
const d = String(text.getDate()).padStart(2, '0');
return `${y}-${m}-${d}`;
}
text = String(text);
return text.length > 10 ? text.substr(0, 10) : text;
},
{
title: '学习传达研究部署情况',
align: 'center',
dataIndex: 'status',
},
{
title: '密级',
align: 'center',
dataIndex: 'secretLevel_dictText',
width: 80,
width: 70,
},
{
title: '责任领导',
title: '所党委责任领导',
align: 'center',
dataIndex: 'responsiblePerson_dictText',
width: 120,
},
// {
// title: '落实方案',
@@ -49,16 +71,19 @@ export const columns: BasicColumn[] = [
title: '牵头部门',
align: 'center',
dataIndex: 'implDept_dictText',
width: 150,
},
{
title: '贯彻落实措施',
align: 'center',
dataIndex: 'implMeasures',
width: 200,
},
{
title: '会议决策数',
align: 'center',
dataIndex: 'numberOfResolutions',
width: 100,
},
// {
// title: '落实情况',
@@ -69,11 +94,13 @@ export const columns: BasicColumn[] = [
title: '落实措施条数',
align: 'center',
dataIndex: 'implCount',
width: 110,
},
{
title: '措施已闭环数',
align: 'center',
dataIndex: 'closedCount',
width: 110,
},
// {
// title: '报告反馈情况',
@@ -99,22 +126,7 @@ export const columns: BasicColumn[] = [
title: '督办状态',
align: 'center',
dataIndex: 'bpmStatus_dictText',
},
{
title: '截止日期',
align: 'center',
dataIndex: 'deadline',
customRender: ({ text }) => {
if (!text) return '';
if (text instanceof Date) {
const y = text.getFullYear();
const m = String(text.getMonth() + 1).padStart(2, '0');
const d = String(text.getDate()).padStart(2, '0');
return `${y}-${m}-${d}`;
}
text = String(text);
return text.length > 10 ? text.substr(0, 10) : text;
},
width: 90,
},
// {
// title: '层深(最顶层节点层深为0)',
@@ -131,27 +143,6 @@ export const columns: BasicColumn[] = [
// align: 'center',
// dataIndex: 'bpmStatus',
// },
{
title: '督办次数',
align: 'center',
dataIndex: 'supervisionCount',
},
{
title: '审批信息',
align: 'center',
dataIndex: 'approveInfo',
customRender: ({ text }) => {
if (!text) return '-';
try {
const info = typeof text === 'string' ? JSON.parse(text) : text;
const keys = Object.keys(info);
if (keys.length === 0) return '-';
return `${keys.length} 项审批`;
} catch {
return '-';
}
},
},
];
//子表列表数据
src/views/bg/xispeak/BgXiSpeakList.vue
+31 -7
View File
@@ -4,14 +4,19 @@
<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 :lg="8" :md="10" :sm="12">
<a-form-item label="重要讲话指示批示情况" name="speakStatus" :labelCol="{ xs: { span: 24 }, sm: { span: 10 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 14 } }">
<JInput v-model:value="queryParam.speakStatus" type="like" placeholder="请输入重要讲话指示批示情况" allow-clear trim />
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="重要讲话指示批示情况" name="speakStatus">
<JInput v-model:value="queryParam.speakStatus" type="like" placeholder="请输入重要讲话指示批示情况" allow-clear trim @change="searchQuery" />
</a-form-item>
</a-col>
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="牵头部门" name="implDept">
<SzSelectDept v-model:value="queryParam.implDept" placeholder="选择牵头部门" allow-clear style="width: 100%" />
<SzSelectDept v-model:value="selectedImplDept" :multiple="true" placeholder="选择牵头部门" allow-clear style="width: 100%" @change="handleImplDeptChange" />
</a-form-item>
</a-col>
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="所党委责任领导" name="responsiblePerson">
<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-form-item>
</a-col>
<!-- <a-col :lg="4" :md="6" :sm="8">-->
@@ -19,7 +24,7 @@
<!-- <JDictSelectTag v-model:value="queryParam.completionStatus" dictCode="db_status" placeholder="请选择完成状态" allow-clear @change="searchQuery" />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :lg="6">
<a-col :lg="6" :md="8" :sm="12">
<a-form-item name="bpmStatus" label="督办状态">
<a-select v-model:value="bpmStatusFilter" placeholder="请选择" allow-clear @change="handleBpmStatusChange">
<a-select-option value="1">未开始</a-select-option>
@@ -28,7 +33,7 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="4" :md="8" :sm="12">
<a-col :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>
@@ -95,7 +100,13 @@
</Dropdown>
</template>
<!--字段回显插槽-->
<template v-slot:bodyCell="{ column, record, index, text }"> </template>
<template v-slot:bodyCell="{ column, record, index, text }">
<template v-if="column.dataIndex === 'speakStatus'">
<a-tooltip title="点击查看详情">
<a style="font-weight: 500" @click="handleDetail(record)">{{ text }}</a>
</a-tooltip>
</template>
</template>
</BasicTable>
</div>
@@ -125,6 +136,8 @@ import { defHttp } from '/@/utils/http/axios';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervision';
import BgXiSpeakModal from './components/BgXiSpeakModal.vue';
import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
@@ -168,6 +181,7 @@ import { defHttp } from '/@/utils/http/axios';
const feedbackRightNowModalRef = ref();
const businessProcessListModalRef = ref();
const bpmStatusFilter = ref();
const selectedImplDept = ref([]);
const currentBusinessId = ref('');
const pendingFeedbackRightNow = ref(0);
const statsData = reactive({ notStarted: 0, inProgress: 0, overdue: 0, completed: 0 });
@@ -882,10 +896,20 @@ import { defHttp } from '/@/utils/http/axios';
formRef.value?.resetFields();
clearQueryParams();
bpmStatusFilter.value = undefined;
selectedImplDept.value = [];
selectedRowKeys.value = [];
reload({ page: 1 });
}
function handleImplDeptChange(values) {
if (values && values.length > 0) {
queryParam.value.implDept = values.join(',');
} else {
delete queryParam.value.implDept;
}
reload({ page: 1 });
}
function handleBpmStatusChange(value) {
if (value != null) {
queryParam.value.bpmStatus = value;
src/views/dq/inspectTask/DqInspectTask.data.ts
+60 -55
View File
@@ -8,103 +8,103 @@ import { getWeekMonthQuarterYear } from '/@/utils';
export const columns: BasicColumn[] = [
{
title: '具体问题',
align:"center",
align: 'center',
dataIndex: 'problemId',
customRender: ({ text, record }) => record.problemId_dictText || text,
},
{
title: '密级',
align:"center",
dataIndex: 'secretLevel_dictText'
align: 'center',
dataIndex: 'secretLevel_dictText',
},
{
title: '整改措施',
align:"center",
dataIndex: 'improveMeasure'
align: 'center',
dataIndex: 'improveMeasure',
},
{
title: '完成时限',
align:"center",
align: 'center',
dataIndex: 'deadline',
customRender: ({ text }) => {
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
return text;
},
},
{
title: '目标节点',
align:"center",
dataIndex: 'targetNode'
},
{
title: '措施责任领导',
align:"center",
dataIndex: 'measureResLeader_dictText'
align: 'center',
dataIndex: 'targetNode',
},
{
title: '措施责任部门',
align:"center",
dataIndex: 'measureResDept_dictText'
align: 'center',
dataIndex: 'measureResDept_dictText',
},
{
title: '措施责任领导',
align: 'center',
dataIndex: 'measureResLeader_dictText',
},
{
title: '整改交付成果',
align:"center",
dataIndex: 'rectificationEvidence'
align: 'center',
dataIndex: 'rectificationEvidence',
},
{
title: '成效评价标准',
align:"center",
dataIndex: 'evaluationCriterion'
align: 'center',
dataIndex: 'evaluationCriterion',
},
{
title: '是否需要党群领导审批',
align:"center",
dataIndex: 'isNeedAppro_dictText'
align: 'center',
dataIndex: 'isNeedAppro_dictText',
},
{
title: '党群领导',
align:"center",
dataIndex: 'supDeptleaderid_dictText'
align: 'center',
dataIndex: 'supDeptleaderid_dictText',
},
{
title: '检查情况',
align:"center",
dataIndex: 'inspectionStatus'
align: 'center',
dataIndex: 'inspectionStatus',
},
{
title: '监督意见',
align:"center",
dataIndex: 'supervisoryOpinion'
align: 'center',
dataIndex: 'supervisoryOpinion',
},
{
title: '措施数量',
align:"center",
dataIndex: 'measureCount'
align: 'center',
dataIndex: 'measureCount',
},
{
title: '流程实例ID',
align:"center",
dataIndex: 'bpmProcessId'
align: 'center',
dataIndex: 'bpmProcessId',
},
{
title: '流程状态',
align:"center",
dataIndex: 'bpmStatus_dictText'
align: 'center',
dataIndex: 'bpmStatus_dictText',
},
{
title: '整改状态',
align:"center",
dataIndex: 'taskStatus'
align: 'center',
dataIndex: 'taskStatus',
},
{
title: '督办次数',
align:"center",
dataIndex: 'superviseCount'
align: 'center',
dataIndex: 'superviseCount',
},
{
title: '排序',
align:"center",
dataIndex: 'sortNo'
align: 'center',
dataIndex: 'sortNo',
},
];
@@ -231,21 +231,36 @@ export const ledgerColumns: BasicColumn[] = [
dataIndex: 'specificName',
customCell: mergeCell('_specificRowSpan'),
},
{
title: '整改措施',
align:"center",
dataIndex: 'improveMeasure'
},
{
title: '巡视建议',
align:"center",
dataIndex: 'inspectAdvice'
},
{
title: '分管所领导',
align:"center",
dataIndex: 'chargeLeaderId_dictText'
},
{
title: '措施责任部门',
align:"center",
dataIndex: 'measureResDept_dictText'
},
{
title: '措施责任领导',
align:"center",
dataIndex: 'measureResDept_dictText'
},
{
title: '密级',
align:"center",
dataIndex: 'secretLevel_dictText'
},
{
title: '整改措施',
align:"center",
dataIndex: 'improveMeasure'
},
{
title: '完成时限',
align:"center",
@@ -260,16 +275,6 @@ export const ledgerColumns: BasicColumn[] = [
align:"center",
dataIndex: 'targetNode'
},
{
title: '措施责任领导',
align:"center",
dataIndex: 'measureResLeader_dictText'
},
{
title: '措施责任部门',
align:"center",
dataIndex: 'measureResDept_dictText'
},
{
title: '整改交付成果',
align:"center",
src/views/dq/inspectTask/DqInspectTaskList.vue
+27 -35
View File
@@ -2,21 +2,24 @@
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form ref="formRef" @keyup.enter="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="improveMeasure">
<template #label><span title="整改措施">整改措施</span></template>
<a-input v-model:value="queryParam.improveMeasure" allow-clear />
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="整改措施" name="improveMeasure">
<JInput v-model:value="queryParam.improveMeasure" type="like" placeholder="请输入整改措施" allow-clear trim @change="reload" />
</a-form-item>
</a-col>
<a-col :lg="8">
<a-form-item name="measureResLeader">
<template #label><span title="措施责任领导">措施责任领导</span></template>
<SzDeptUserModal v-model:value="queryParam.measureResLeader" placeholder="请选择措施责任领导" />
<a-col :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" />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-col :lg="6" :md="8" :sm="12">
<a-form-item label="措施责任部门" name="measureResDept">
<SzSelectDept v-model:value="queryParam.measureResDept" :multiple="true" checkStrictly allow-clear @change="reload" />
</a-form-item>
</a-col>
<a-col :lg="6" :md="8" :sm="12">
<a-form-item name="bpmStatus" label="督办状态">
<a-select v-model:value="bpmStatusFilter" placeholder="请选择" allow-clear @change="handleBpmStatusChange">
<a-select-option value="1">未开始</a-select-option>
@@ -25,24 +28,10 @@
</a-select>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="8">
<a-form-item name="measureResDept">
<template #label><span title="措施责任部门">措施责任部门</span></template>
<SzSelectDept v-model:value="queryParam.measureResDept" :multiple="true" checkStrictly allow-clear />
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-col :lg="6" :md="8" :sm="12">
<span 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" style="margin-left: 8px">重置</a-button>
<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col>
<a-button preIcon="ant-design:reload-outlined" style="margin-left: 8px" @click="searchReset">重置</a-button>
</span>
</a-col>
</a-row>
@@ -117,7 +106,13 @@
</Dropdown>
</template>
<!--字段回显插槽-->
<template v-slot:bodyCell="{ column, record, index, text }"> </template>
<template v-slot:bodyCell="{ column, record, index, text }">
<template v-if="column.dataIndex === 'improveMeasure'">
<a-tooltip title="点击查看详情">
<a style="font-weight: 500" @click="handleDetail(record)">{{ text }}</a>
</a-tooltip>
</template>
</template>
</BasicTable>
<!-- 表单区域 -->
<DqInspectProgressFeedbackViewModal ref="feedbackViewModalRef" />
@@ -155,8 +150,10 @@
import { downloadFile } from '/@/utils/common/renderUtils';
import { useMessage } from '/@/hooks/web/useMessage';
import Icon from '/@/components/Icon/index';
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserModal.vue';
import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision';
import { startProcessSchedules } from '/@/api/common/api';
import { dateUtil } from '/@/utils/dateUtil';
import FlowScheduleStartModal from './components/DqInspectTaskFlowScheduleStartModal.vue';
@@ -573,7 +570,6 @@
}
/* ----------------------以下为原生查询需要添加的-------------------------- */
const toggleSearchStatus = ref<boolean>(false);
const labelCol = reactive({
xs: 24,
sm: 4,
@@ -616,11 +612,7 @@
}
}
function handleFormJoinChange(key, value) {
if (typeof value != 'string') {
queryParam[key] = value.join(',');
}
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {