yxk-20260519-发起流程时,确认ddl的时间,默认是该事项的ddl

This commit is contained in:
ye1023
2026-05-19 10:25:22 +08:00
parent 26b45c5c02
commit 73f2e73d01
2 changed files with 47 additions and 2 deletions
@@ -27,6 +27,16 @@
/>
</a-form-item>
<a-form-item v-if="showDeadlineField" label="事项截止时间">
<a-date-picker
v-model:value="formData.deadline"
valueFormat="YYYY-MM-DD"
placeholder="请选择事项截止时间"
style="width: 100%"
:getPopupContainer="(node) => node?.parentNode"
/>
</a-form-item>
<template v-if="showSuoleaderFields">
<a-form-item label="是否所办领导审批">
<j-switch v-model:value="formData.isNeedAppro" />
@@ -96,6 +106,8 @@
showSuoleaderFields?: boolean;
isNeedAppro?: string | number;
supDeptleaderid?: string | string[];
showDeadlineField?: boolean;
deadline?: string | Date;
}
interface DeptOption {
@@ -111,6 +123,7 @@
const contextData = ref<Record<string, any>>({});
const deptOptions = ref<DeptOption[]>([]);
const showSuoleaderFields = ref(false);
const showDeadlineField = ref(false);
const formData = reactive({
triggerMode: 'immediate',
intervalType: undefined as number | string | undefined,
@@ -119,6 +132,7 @@
deptIds: [] as string[],
isNeedAppro: '0',
supDeptleaderid: '' as string | string[],
deadline: undefined as string | undefined,
});
function resetForm() {
@@ -129,8 +143,10 @@
formData.deptIds = [];
formData.isNeedAppro = '0';
formData.supDeptleaderid = '';
formData.deadline = undefined;
deptOptions.value = [];
showSuoleaderFields.value = false;
showDeadlineField.value = false;
}
function normalizeDeptOptions(options: DeptOption[] = []) {
@@ -148,6 +164,19 @@
return Array.from(optionMap.values());
}
function normalizeDeadlineValue(value?: string | Date) {
if (!value) {
return undefined;
}
if (typeof value === 'string') {
return value.length >= 10 ? value.substring(0, 10) : value;
}
const year = value.getFullYear();
const month = String(value.getMonth() + 1).padStart(2, '0');
const day = String(value.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
}
function open(data: ModalPayload = {}) {
resetForm();
title.value = data.title || '发起流程';
@@ -157,6 +186,8 @@
showSuoleaderFields.value = !!data.showSuoleaderFields;
formData.isNeedAppro = String(data.isNeedAppro ?? '0');
formData.supDeptleaderid = data.supDeptleaderid || '';
showDeadlineField.value = !!data.showDeadlineField;
formData.deadline = normalizeDeadlineValue(data.deadline);
if (String(formData.isNeedAppro) !== '1') {
formData.supDeptleaderid = '';
}
@@ -187,6 +218,11 @@
return;
}
if (showDeadlineField.value && !formData.deadline) {
createMessage.warning('请选择事项截止时间');
return;
}
emit('confirm', {
payload: contextData.value,
options: {
@@ -198,6 +234,7 @@
deptIds: [...formData.deptIds],
isNeedAppro: showSuoleaderFields.value ? formData.isNeedAppro : undefined,
supDeptleaderid: showSuoleaderFields.value ? (String(formData.isNeedAppro) === '1' ? formData.supDeptleaderid : '') : undefined,
deadline: showDeadlineField.value ? formData.deadline : undefined,
},
});
handleCancel();
@@ -433,6 +433,8 @@
showSuoleaderFields: true,
isNeedAppro: record?.isNeedAppro,
supDeptleaderid: record?.supDeptleaderid,
showDeadlineField: true,
deadline: record?.deadline,
});
}
@@ -474,12 +476,18 @@
const formatDate = (value, format) => {
return value ? dateUtil(value).format(format) : undefined;
};
const formatDeadlineDateTime = (value) => {
const deadlineDate = formatDate(value, 'YYYY-MM-DD');
return deadlineDate ? `${deadlineDate} 00:00:00` : undefined;
};
const nextSuperviseCount = getNextSuperviseCount(record.superviseCount);
const selectedDeadline = options.deadline || record.deadline;
const flowJsonData = {
...record,
isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '',
supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '',
superviseCount: nextSuperviseCount,
deadline: selectedDeadline,
};
const params = {
@@ -502,8 +510,8 @@
urgencyLevel: record.urgencyLevel,
deptId: options.deptId || record.responDeptid,
deptLeaderId: record.responDeptid,
requireFinishDate: formatDate(record.deadline, 'YYYY-MM-DD'),
deadline: formatDate(record.deadline, 'YYYY-MM-DD HH:mm:ss'),
requireFinishDate: formatDate(selectedDeadline, 'YYYY-MM-DD'),
deadline: formatDeadlineDateTime(selectedDeadline),
},
};