From 9dfba2bca82ef7f59a895f2b5799f9ae70e40529 Mon Sep 17 00:00:00 2001 From: wsm <8454518+new-twice@user.noreply.gitee.com> Date: Wed, 12 Aug 2026 10:16:07 +0000 Subject: [PATCH] =?UTF-8?q?!149=20chore(docs):=20=E5=BF=BD=E7=95=A5=20loca?= =?UTF-8?q?lDocs=20=E6=9C=AC=E5=9C=B0=E6=96=87=E6=A1=A3=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(docs): 忽略 localDocs 本地文档目录 * fix(inspectTask): 发起销号流程入口常显并移除状态调整菜单 * fix(xispeak): 督办状态结合反馈闭环实时推导 --- .gitignore | 1 + src/views/bg/xispeak/BgXiSpeakList.vue | 23 +++++++--- .../dq/inspectTask/DqInspectTaskList.vue | 44 +++++++++---------- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 4b48227..0f5e1bd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ node_modules dist-electron .cache localDoc +localDocs/ # QA test temporary artifacts (scripts, screenshots, caches) — reports live in qa-report/ and are committed qa-tmp/ diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue index cea8412..00fdd5e 100644 --- a/src/views/bg/xispeak/BgXiSpeakList.vue +++ b/src/views/bg/xispeak/BgXiSpeakList.vue @@ -474,17 +474,30 @@ 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 results = await Promise.allSettled(ids.map((id) => getBusinessStatus({ businessId: id }))); + const [statusResults, countsRes] = await Promise.all([ + Promise.allSettled(ids.map((id) => getBusinessStatus({ businessId: id }))), + queryFeedbackCounts({ ids: ids.join(',') }), + ]); + const countsMap = countsRes || {}; const statusMap: Record = {}; - results.forEach((res, index) => { - if (res.status === 'fulfilled' && res.value && res.value.status) { - statusMap[ids[index]] = res.value.status; + 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) => { diff --git a/src/views/dq/inspectTask/DqInspectTaskList.vue b/src/views/dq/inspectTask/DqInspectTaskList.vue index a3e10f9..8e9c405 100644 --- a/src/views/dq/inspectTask/DqInspectTaskList.vue +++ b/src/views/dq/inspectTask/DqInspectTaskList.vue @@ -388,9 +388,7 @@ if ((record.bpmStatus == '1' || !record.bpmStatus) && record.completedStage === 0) { list.push({ text: '发起巡视整改流程', icon: 'ant-design:play-circle-outlined', event: 'process', onClick: handleProcess.bind(null, record) }); } - if (record.bpmStatus && record.bpmStatus !== '1' && record.completedStage === 2) { - list.push({ text: '发起销号流程', icon: 'ant-design:stop-outlined', event: 'deleteProcess', onClick: handleDeleteProcess.bind(null, record) }); - } + list.push({ text: '发起销号流程', icon: 'ant-design:stop-outlined', event: 'deleteProcess', onClick: handleDeleteProcess.bind(null, record) }); list.push({ text: '查询督办流程', icon: 'ant-design:search-outlined', @@ -398,26 +396,26 @@ divider: true, onClick: handleQueryProcess.bind(null, record), }); - if (!record.bpmStatus || record.bpmStatus == '1') { - list.push({ - text: '调整为未发起巡视整改流程状态', - icon: 'ant-design:rollback-outlined', - event: 'adj0', - onClick: () => adjustCompletedStage(record, 0), - }); - list.push({ - text: '调整为未发起销号流程状态', - icon: 'ant-design:check-circle-outlined', - event: 'adj2', - onClick: () => adjustCompletedStage(record, 2), - }); - list.push({ - text: '调整为已完成销号流程状态', - icon: 'ant-design:check-circle-outlined', - event: 'adj4', - onClick: () => adjustCompletedStage(record, 4), - }); - } + // if (!record.bpmStatus || record.bpmStatus == '1') { + // list.push({ + // text: '调整为未发起巡视整改流程状态', + // icon: 'ant-design:rollback-outlined', + // event: 'adj0', + // onClick: () => adjustCompletedStage(record, 0), + // }); + // list.push({ + // text: '调整为未发起销号流程状态', + // icon: 'ant-design:check-circle-outlined', + // event: 'adj2', + // onClick: () => adjustCompletedStage(record, 2), + // }); + // list.push({ + // text: '调整为已完成销号流程状态', + // icon: 'ant-design:check-circle-outlined', + // event: 'adj4', + // onClick: () => adjustCompletedStage(record, 4), + // }); + // } return list; }