diff --git a/src/views/bg/xispeak/BgXiSpeak.data.ts b/src/views/bg/xispeak/BgXiSpeak.data.ts index ffd59b1..1625c7c 100644 --- a/src/views/bg/xispeak/BgXiSpeak.data.ts +++ b/src/views/bg/xispeak/BgXiSpeak.data.ts @@ -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', - }, - { - title: '学习传达研究部署情况', - align: 'center', - dataIndex: 'status', + 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: '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 '-'; - } - }, - }, ]; //子表列表数据 diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue index 54574e7..b540139 100644 --- a/src/views/bg/xispeak/BgXiSpeakList.vue +++ b/src/views/bg/xispeak/BgXiSpeakList.vue @@ -4,14 +4,19 @@
- - - + + + - + + + + + + @@ -19,7 +24,7 @@ - + 未开始 @@ -28,7 +33,7 @@ - + 查询 重置 @@ -95,7 +100,13 @@ - +
@@ -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';