From 1cd3ab9918a786299430e2e24a8b63103ae03ffa Mon Sep 17 00:00:00 2001 From: ye1023 <12588209+ye1023@user.noreply.gitee.com> Date: Tue, 19 May 2026 10:48:53 +0800 Subject: [PATCH] =?UTF-8?q?yxk-20260519-YHJY004-=E5=85=9A=E5=A7=94?= =?UTF-8?q?=E4=BC=9A=E5=A2=9E=E5=8A=A0=E5=8D=8F=E5=8A=9E=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=90=88=E5=B9=B6=E4=B8=BB?= =?UTF-8?q?=E5=8A=9E=E9=83=A8=E9=97=A8=E5=92=8C=E5=8D=8F=E5=8A=9E=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8E=BB=E9=87=8D=E5=90=8E?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=BA=E8=A2=AB=E7=9D=A3=E5=8A=9E=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=BE=9B=E7=94=A8=E6=88=B7=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bg/bgpartymatter/BgPartymatter.data.ts | 7 +++- .../bg/bgpartymatter/BgPartymatterList.vue | 39 +++++++++++++++---- .../components/BgPartymatterBPMForm.vue | 6 +++ .../components/BgPartymatterForm.vue | 8 +++- 4 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/views/bg/bgpartymatter/BgPartymatter.data.ts b/src/views/bg/bgpartymatter/BgPartymatter.data.ts index 6cd7768..2f835de 100644 --- a/src/views/bg/bgpartymatter/BgPartymatter.data.ts +++ b/src/views/bg/bgpartymatter/BgPartymatter.data.ts @@ -50,10 +50,15 @@ export const columns: BasicColumn[] = [ dataIndex: 'matterCode' }, { - title: '责任部门', + title: '主办部门', align:"center", dataIndex: 'responDeptid_dictText' }, + { + title: '协办部门', + align:"center", + dataIndex: 'assistDeptid_dictText' + }, { title: '实际执行情况', align:"center", diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue index fbe5d6b..443a7e8 100644 --- a/src/views/bg/bgpartymatter/BgPartymatterList.vue +++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue @@ -139,7 +139,7 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, bgPartymatterFeedbackList, saveOrUpdate } from './BgPartymatter.api'; const FLOW_CODE = 'dev_task_task_001'; - const FLOW_NAME = '党委会决议事项'; + const FLOW_NAME = '党委会决议事项督办'; const BUSINESS_TABLE_NAME = 'bg_partymatter'; const FORM_URL = 'bg/bgpartymatter/components/BgPartymatterBPMForm'; @@ -449,12 +449,34 @@ } function getResponsibleDeptOptions(record): DeptOption[] { - const deptIds = splitDeptValue(record?.responDeptid); - const deptNames = splitDeptValue(record?.responDeptid_dictText || record?.responDeptname); - return deptIds.map((deptId, index) => ({ - value: deptId, - label: deptNames[index] || deptId, - })); + const optionMap = new Map(); + [ + { + ids: splitDeptValue(record?.responDeptid), + names: splitDeptValue(record?.responDeptid_dictText || record?.responDeptname), + }, + { + ids: splitDeptValue(record?.assistDeptid), + names: splitDeptValue(record?.assistDeptid_dictText || record?.assistDeptname), + }, + ].forEach(({ ids, names }) => { + ids.forEach((deptId, index) => { + if (optionMap.has(deptId)) { + return; + } + optionMap.set(deptId, { + value: deptId, + label: names[index] || deptId, + }); + }); + }); + return Array.from(optionMap.values()); + } + + function getResponsibleDeptIds(record) { + return getResponsibleDeptOptions(record) + .map((item) => item.value) + .join(','); } function getNextSuperviseCount(value) { @@ -482,6 +504,7 @@ }; const nextSuperviseCount = getNextSuperviseCount(record.superviseCount); const selectedDeadline = options.deadline || record.deadline; + const defaultDeptIds = getResponsibleDeptIds(record); const flowJsonData = { ...record, isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '', @@ -508,7 +531,7 @@ title: record.title, content: record.content, urgencyLevel: record.urgencyLevel, - deptId: options.deptId || record.responDeptid, + deptId: options.deptId || defaultDeptIds, deptLeaderId: record.responDeptid, requireFinishDate: formatDate(selectedDeadline, 'YYYY-MM-DD'), deadline: formatDeadlineDateTime(selectedDeadline), diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue index ac23975..49a832e 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue @@ -59,6 +59,11 @@ + + + + + @@ -224,6 +229,7 @@ content: '', matterCode: '', responDeptid: '', + assistDeptid: '', actualExect: '', bpmStatus: '', superviseCount: '', diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue index a6ad225..8bbaf61 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue @@ -40,10 +40,15 @@ - + + + + + + @@ -149,6 +154,7 @@ content: '', matterCode: '', responDeptid: '', + assistDeptid: '', actualExect: '', bpmStatus: '1', superviseCount: '0',