From bb6fbbc7e8da3196c0560a4ea32cd299360b27af Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Thu, 23 Jul 2026 10:59:10 +0800 Subject: [PATCH 1/7] =?UTF-8?q?style(xispeak):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=88=97=E5=AE=BD/?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F/=E5=AF=B9=E9=BD=90=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=89=80=E5=85=9A=E5=A7=94=E8=B4=A3=E4=BB=BB=E9=A2=86?= =?UTF-8?q?=E5=AF=BC=E7=AD=9B=E9=80=89=EF=BC=8C=E7=AD=9B=E9=80=89=E6=A1=86?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=B8=83=E5=B1=80=E5=B9=B6=E9=80=89=E5=AE=8C?= =?UTF-8?q?=E5=8D=B3=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- src/views/bg/xispeak/BgXiSpeak.data.ts | 83 ++++++++++++-------------- src/views/bg/xispeak/BgXiSpeakList.vue | 27 ++++++--- 2 files changed, 57 insertions(+), 53 deletions(-) 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'; From 0fd302910500458bc9f8cabb0916f8366be7eabc Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Thu, 23 Jul 2026 11:17:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat(xispeak):=20=E7=89=B5=E5=A4=B4?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AD=9B=E9=80=89=E6=94=AF=E6=8C=81=E5=A4=9A?= =?UTF-8?q?=E9=80=89=EF=BC=8CFIND=5FIN=5FSET=20AND=20=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- src/views/bg/xispeak/BgXiSpeakList.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue index b540139..1340f16 100644 --- a/src/views/bg/xispeak/BgXiSpeakList.vue +++ b/src/views/bg/xispeak/BgXiSpeakList.vue @@ -11,7 +11,7 @@ - + @@ -181,6 +181,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi 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 }); @@ -895,10 +896,20 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi 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; From d7ff8af0590975a05f2c8720a398dab87dda9428 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Thu, 23 Jul 2026 11:27:02 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix(xispeak):=20JInput=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=97=B6change=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E8=A7=A6=E5=8F=91=EF=BC=8C=E4=BF=AE=E5=A4=8Demit?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E9=81=BF=E5=85=8D=E6=9F=A5=E8=AF=A2=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=97=A7=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- src/components/Form/src/jeecg/components/JInput.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/Form/src/jeecg/components/JInput.vue b/src/components/Form/src/jeecg/components/JInput.vue index f5c413e..41590ac 100644 --- a/src/components/Form/src/jeecg/components/JInput.vue +++ b/src/components/Form/src/jeecg/components/JInput.vue @@ -1,5 +1,5 @@