!149 chore(docs): 忽略 localDocs 本地文档目录
* chore(docs): 忽略 localDocs 本地文档目录 * fix(inspectTask): 发起销号流程入口常显并移除状态调整菜单 * fix(xispeak): 督办状态结合反馈闭环实时推导
This commit is contained in:
@@ -5,6 +5,7 @@ node_modules
|
|||||||
dist-electron
|
dist-electron
|
||||||
.cache
|
.cache
|
||||||
localDoc
|
localDoc
|
||||||
|
localDocs/
|
||||||
|
|
||||||
# QA test temporary artifacts (scripts, screenshots, caches) — reports live in qa-report/ and are committed
|
# QA test temporary artifacts (scripts, screenshots, caches) — reports live in qa-report/ and are committed
|
||||||
qa-tmp/
|
qa-tmp/
|
||||||
|
|||||||
@@ -474,17 +474,30 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量刷新督办状态:以关联流程实时推导结果为准(无流程=未开始,有运行=督办中,全部结束=已完成)
|
* 批量刷新督办状态:流程状态与督办事项(反馈)闭环情况合并推导
|
||||||
|
* 规则:运行中的流程始终督办中;有督办事项时全部闭环=已完成、有未闭环=督办中;无督办事项以流程状态为准
|
||||||
*/
|
*/
|
||||||
async function refreshSuperviseStatus(records) {
|
async function refreshSuperviseStatus(records) {
|
||||||
const ids = collectAllIds(records).filter((id) => !String(id).includes('loadChild'));
|
const ids = collectAllIds(records).filter((id) => !String(id).includes('loadChild'));
|
||||||
if (ids.length === 0) return;
|
if (ids.length === 0) return;
|
||||||
try {
|
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<string, string> = {};
|
const statusMap: Record<string, string> = {};
|
||||||
results.forEach((res, index) => {
|
statusResults.forEach((res, index) => {
|
||||||
if (res.status === 'fulfilled' && res.value && res.value.status) {
|
const id = ids[index];
|
||||||
statusMap[ids[index]] = res.value.status;
|
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) => {
|
const updateFn = (list) => {
|
||||||
|
|||||||
@@ -388,9 +388,7 @@
|
|||||||
if ((record.bpmStatus == '1' || !record.bpmStatus) && record.completedStage === 0) {
|
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) });
|
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({
|
list.push({
|
||||||
text: '查询督办流程',
|
text: '查询督办流程',
|
||||||
icon: 'ant-design:search-outlined',
|
icon: 'ant-design:search-outlined',
|
||||||
@@ -398,26 +396,26 @@
|
|||||||
divider: true,
|
divider: true,
|
||||||
onClick: handleQueryProcess.bind(null, record),
|
onClick: handleQueryProcess.bind(null, record),
|
||||||
});
|
});
|
||||||
if (!record.bpmStatus || record.bpmStatus == '1') {
|
// if (!record.bpmStatus || record.bpmStatus == '1') {
|
||||||
list.push({
|
// list.push({
|
||||||
text: '调整为未发起巡视整改流程状态',
|
// text: '调整为未发起巡视整改流程状态',
|
||||||
icon: 'ant-design:rollback-outlined',
|
// icon: 'ant-design:rollback-outlined',
|
||||||
event: 'adj0',
|
// event: 'adj0',
|
||||||
onClick: () => adjustCompletedStage(record, 0),
|
// onClick: () => adjustCompletedStage(record, 0),
|
||||||
});
|
// });
|
||||||
list.push({
|
// list.push({
|
||||||
text: '调整为未发起销号流程状态',
|
// text: '调整为未发起销号流程状态',
|
||||||
icon: 'ant-design:check-circle-outlined',
|
// icon: 'ant-design:check-circle-outlined',
|
||||||
event: 'adj2',
|
// event: 'adj2',
|
||||||
onClick: () => adjustCompletedStage(record, 2),
|
// onClick: () => adjustCompletedStage(record, 2),
|
||||||
});
|
// });
|
||||||
list.push({
|
// list.push({
|
||||||
text: '调整为已完成销号流程状态',
|
// text: '调整为已完成销号流程状态',
|
||||||
icon: 'ant-design:check-circle-outlined',
|
// icon: 'ant-design:check-circle-outlined',
|
||||||
event: 'adj4',
|
// event: 'adj4',
|
||||||
onClick: () => adjustCompletedStage(record, 4),
|
// onClick: () => adjustCompletedStage(record, 4),
|
||||||
});
|
// });
|
||||||
}
|
// }
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user