!155 feat(dq): 编辑已发起流程的记录时提示修改可能变更审批人
* feat(dq): 编辑已发起流程的记录时提示修改可能变更审批人 * feat(dq): 发起整改流程弹窗支持修改措施责任部门及负责人并回写台账 * fix(dq): 措施责任部门改为单选 * feat(user): 角色用户下拉切换按角色查询接口并加载全量
This commit is contained in:
@@ -462,6 +462,7 @@
|
||||
title: '发起整改任务流程',
|
||||
payload: { record },
|
||||
deptOptions: getDeptOptions(record),
|
||||
measureResLeader: record.measureResLeader,
|
||||
showSuoleaderFields: true,
|
||||
isNeedAppro: record.isNeedAppro,
|
||||
supDeptleaderid: record.supDeptleaderid,
|
||||
@@ -478,6 +479,7 @@
|
||||
title: '发起销号流程',
|
||||
payload: { record },
|
||||
deptOptions: getDeptOptions(record),
|
||||
measureResLeader: record.measureResLeader,
|
||||
showSuoleaderFields: true,
|
||||
isNeedAppro: record.isNeedAppro,
|
||||
supDeptleaderid: record.supDeptleaderid,
|
||||
@@ -495,6 +497,17 @@
|
||||
const flowName = isDeleteFlow ? DELETE_FLOW_NAME : FLOW_NAME;
|
||||
const formUrl = isDeleteFlow ? DELETE_FORM_URL : FORM_URL;
|
||||
|
||||
const selectedDeadline = options.deadline || record.deadline || undefined;
|
||||
// 弹窗可修改字段覆盖进流程变量,保证流程表单展示与弹窗选择一致
|
||||
const flowJsonData = {
|
||||
...record,
|
||||
measureResDept: options.deptId || record.measureResDept || '',
|
||||
measureResLeader: options.measureResLeader ?? record.measureResLeader ?? '',
|
||||
isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '',
|
||||
supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '',
|
||||
deadline: selectedDeadline,
|
||||
};
|
||||
|
||||
const params = {
|
||||
intervalType: options.intervalType,
|
||||
startCount: options.startCount,
|
||||
@@ -504,21 +517,35 @@
|
||||
flowCode,
|
||||
formUrl,
|
||||
flowName,
|
||||
jsonData: { ...record },
|
||||
jsonData: flowJsonData,
|
||||
businessTablename: BUSINESS_TABLE_NAME,
|
||||
businessId: record.id,
|
||||
title: record.improveMeasure || '',
|
||||
content: record.improveMeasure || '',
|
||||
deptId: options.deptId || record.measureResDept || '',
|
||||
deptLeaderId: record.measureResLeader || '',
|
||||
requireFinishDate: record.deadline || undefined,
|
||||
deadline: record.deadline || undefined,
|
||||
deptLeaderId: options.measureResLeader ?? record.measureResLeader ?? '',
|
||||
requireFinishDate: selectedDeadline,
|
||||
deadline: selectedDeadline,
|
||||
},
|
||||
};
|
||||
|
||||
await startProcessSchedules(params);
|
||||
const nextStage = (record.completedStage || 0) + 1;
|
||||
await saveOrUpdate({ id: record.id, problemId: record.problemId, bpmStatus: '2', completedStage: nextStage }, true);
|
||||
// 后端审批人匹配从数据库读取台账字段,弹窗修改需回写台账才能生效
|
||||
await saveOrUpdate(
|
||||
{
|
||||
id: record.id,
|
||||
problemId: record.problemId,
|
||||
bpmStatus: '2',
|
||||
completedStage: nextStage,
|
||||
measureResDept: options.deptId || record.measureResDept || '',
|
||||
measureResLeader: options.measureResLeader ?? record.measureResLeader ?? '',
|
||||
deadline: selectedDeadline,
|
||||
isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '',
|
||||
supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '',
|
||||
},
|
||||
true
|
||||
);
|
||||
createMessage.success('发起成功');
|
||||
handleSuccess();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user