diff --git a/src/components/semri/userComponent/RoleUserSelectDropDown.vue b/src/components/semri/userComponent/RoleUserSelectDropDown.vue
index 592ca7c..6ae0f44 100644
--- a/src/components/semri/userComponent/RoleUserSelectDropDown.vue
+++ b/src/components/semri/userComponent/RoleUserSelectDropDown.vue
@@ -40,11 +40,10 @@ async function fetchUserList() {
try {
const params = {
roleId: props.roleId,
- searchSecurityLevel: 5,
pageNo: 1,
- pageSize: 999,
+ pageSize: -1,
};
- const res = await defHttp.get({ url: '/sys/user/queryUserRoleComponentData', params });
+ const res = await defHttp.get({ url: '/sys/user/queryUserByRoleId', params });
const records = res?.records || res?.result?.records || [];
userList.value = records.sort((a, b) => (a.sortno ?? Infinity) - (b.sortno ?? Infinity));
} catch {
diff --git a/src/views/dq/inspectTask/DqInspectTaskList.vue b/src/views/dq/inspectTask/DqInspectTaskList.vue
index 2c9ba36..1ce1e47 100644
--- a/src/views/dq/inspectTask/DqInspectTaskList.vue
+++ b/src/views/dq/inspectTask/DqInspectTaskList.vue
@@ -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();
}
diff --git a/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue b/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue
index 7a4a18e..59cfea9 100644
--- a/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue
+++ b/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue
@@ -1,6 +1,12 @@
-
+
+
立即发起
@@ -9,18 +15,28 @@
立即发起:仅发起一次;重复发起:按周期重复发起
-
+
+
+
+
+
-
+
+ 是
+ 否
+
@@ -80,11 +99,11 @@