Merge branch 'master' into dev

This commit is contained in:
wsm
2026-06-04 20:27:34 +08:00
2 changed files with 20 additions and 1 deletions
@@ -8,6 +8,10 @@
</a-radio-group>
</a-form-item>
<a-form-item label="督办标题">
<a-input v-model:value="formData.taskTitle" placeholder="请输入督办标题" allow-clear />
</a-form-item>
<a-form-item v-if="deptOptions.length" label="被督办部门">
<a-select
v-model:value="formData.deptIds"
@@ -94,6 +98,7 @@
interface ModalPayload {
title?: string;
taskTitle?: string;
payload?: Record<string, any>;
deptOptions?: DeptOption[];
showSuoleaderFields?: boolean;
@@ -125,6 +130,7 @@
intervalType: undefined as number | string | undefined,
startCount: undefined as number | undefined,
intervalStartTime: undefined as string | undefined,
taskTitle: '',
deptIds: [] as string[],
isNeedAppro: '0',
supDeptleaderid: '' as string | string[],
@@ -137,6 +143,7 @@
formData.intervalType = undefined;
formData.startCount = undefined;
formData.intervalStartTime = undefined;
formData.taskTitle = '';
formData.deptIds = [];
formData.isNeedAppro = '0';
formData.supDeptleaderid = '';
@@ -180,6 +187,7 @@
resetForm();
title.value = data.title || '发起流程';
contextData.value = data.payload || {};
formData.taskTitle = String(data.taskTitle || '');
deptOptions.value = normalizeDeptOptions(data.deptOptions || []);
formData.deptIds = deptOptions.value.map((item) => item.value);
showSuoleaderFields.value = !!data.showSuoleaderFields;
@@ -215,6 +223,12 @@
return;
}
}
const taskTitle = formData.taskTitle.trim();
if (!taskTitle) {
createMessage.warning('请输入督办标题');
return;
}
if (deptOptions.value.length && !formData.deptIds.length) {
createMessage.warning('请选择责任部门');
return;
@@ -232,6 +246,7 @@
intervalType: formData.triggerMode === 'recurring' ? Number(formData.intervalType) : undefined,
startCount: formData.triggerMode === 'recurring' ? Number(formData.startCount) : undefined,
intervalStartTime: formData.triggerMode === 'recurring' ? formData.intervalStartTime : undefined,
title: taskTitle,
deptId: formData.deptIds.join(','),
deptIds: [...formData.deptIds],
isNeedAppro: showSuoleaderFields.value ? formData.isNeedAppro : undefined,
@@ -465,6 +465,7 @@
function handleProcess(record) {
flowScheduleModalRef.value?.open({
title: '发起流程',
taskTitle: record?.title,
payload: { record },
deptOptions: getResponsibleDeptOptions(record),
showSuoleaderFields: true,
@@ -542,6 +543,7 @@
return deadlineDate ? `${deadlineDate} 00:00:00` : undefined;
};
const nextSuperviseCount = getNextSuperviseCount(record.superviseCount);
const selectedTitle = options.title || record.title || '';
const selectedDeadline = options.deadline || record.deadline;
const selectedUrgencyLevel = options.urgencyLevel ?? record.urgencyLevel ?? '0';
const defaultDeptIds = getResponsibleDeptIds(record);
@@ -552,6 +554,8 @@
isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '',
supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '',
superviseCount: nextSuperviseCount,
// 用户可在发起前确认本次督办标题,仅影响本次流程数据,不回写台账标题。
title: selectedTitle,
deadline: selectedDeadline,
// 发起流程时允许临时调整急件标记,仅写入流程变量和流程中间表。
urgencyLevel: selectedUrgencyLevel,
@@ -572,7 +576,7 @@
//台账相关字段
businessTablename: BUSINESS_TABLE_NAME,
businessId: record.id,
title: record.title,
title: selectedTitle,
content: record.content,
urgencyLevel: selectedUrgencyLevel,
deptId: options.deptId || defaultDeptIds,