yxk-20260519-发起流程时,确认ddl的时间,默认是该事项的ddl
This commit is contained in:
@@ -27,6 +27,16 @@
|
|||||||
/>
|
/>
|
||||||
</a-form-item>
|
</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">
|
<template v-if="showSuoleaderFields">
|
||||||
<a-form-item label="是否所办领导审批">
|
<a-form-item label="是否所办领导审批">
|
||||||
<j-switch v-model:value="formData.isNeedAppro" />
|
<j-switch v-model:value="formData.isNeedAppro" />
|
||||||
@@ -96,6 +106,8 @@
|
|||||||
showSuoleaderFields?: boolean;
|
showSuoleaderFields?: boolean;
|
||||||
isNeedAppro?: string | number;
|
isNeedAppro?: string | number;
|
||||||
supDeptleaderid?: string | string[];
|
supDeptleaderid?: string | string[];
|
||||||
|
showDeadlineField?: boolean;
|
||||||
|
deadline?: string | Date;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface DeptOption {
|
interface DeptOption {
|
||||||
@@ -111,6 +123,7 @@
|
|||||||
const contextData = ref<Record<string, any>>({});
|
const contextData = ref<Record<string, any>>({});
|
||||||
const deptOptions = ref<DeptOption[]>([]);
|
const deptOptions = ref<DeptOption[]>([]);
|
||||||
const showSuoleaderFields = ref(false);
|
const showSuoleaderFields = ref(false);
|
||||||
|
const showDeadlineField = ref(false);
|
||||||
const formData = reactive({
|
const formData = reactive({
|
||||||
triggerMode: 'immediate',
|
triggerMode: 'immediate',
|
||||||
intervalType: undefined as number | string | undefined,
|
intervalType: undefined as number | string | undefined,
|
||||||
@@ -119,6 +132,7 @@
|
|||||||
deptIds: [] as string[],
|
deptIds: [] as string[],
|
||||||
isNeedAppro: '0',
|
isNeedAppro: '0',
|
||||||
supDeptleaderid: '' as string | string[],
|
supDeptleaderid: '' as string | string[],
|
||||||
|
deadline: undefined as string | undefined,
|
||||||
});
|
});
|
||||||
|
|
||||||
function resetForm() {
|
function resetForm() {
|
||||||
@@ -129,8 +143,10 @@
|
|||||||
formData.deptIds = [];
|
formData.deptIds = [];
|
||||||
formData.isNeedAppro = '0';
|
formData.isNeedAppro = '0';
|
||||||
formData.supDeptleaderid = '';
|
formData.supDeptleaderid = '';
|
||||||
|
formData.deadline = undefined;
|
||||||
deptOptions.value = [];
|
deptOptions.value = [];
|
||||||
showSuoleaderFields.value = false;
|
showSuoleaderFields.value = false;
|
||||||
|
showDeadlineField.value = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeDeptOptions(options: DeptOption[] = []) {
|
function normalizeDeptOptions(options: DeptOption[] = []) {
|
||||||
@@ -148,6 +164,19 @@
|
|||||||
return Array.from(optionMap.values());
|
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 = {}) {
|
function open(data: ModalPayload = {}) {
|
||||||
resetForm();
|
resetForm();
|
||||||
title.value = data.title || '发起流程';
|
title.value = data.title || '发起流程';
|
||||||
@@ -157,6 +186,8 @@
|
|||||||
showSuoleaderFields.value = !!data.showSuoleaderFields;
|
showSuoleaderFields.value = !!data.showSuoleaderFields;
|
||||||
formData.isNeedAppro = String(data.isNeedAppro ?? '0');
|
formData.isNeedAppro = String(data.isNeedAppro ?? '0');
|
||||||
formData.supDeptleaderid = data.supDeptleaderid || '';
|
formData.supDeptleaderid = data.supDeptleaderid || '';
|
||||||
|
showDeadlineField.value = !!data.showDeadlineField;
|
||||||
|
formData.deadline = normalizeDeadlineValue(data.deadline);
|
||||||
if (String(formData.isNeedAppro) !== '1') {
|
if (String(formData.isNeedAppro) !== '1') {
|
||||||
formData.supDeptleaderid = '';
|
formData.supDeptleaderid = '';
|
||||||
}
|
}
|
||||||
@@ -187,6 +218,11 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (showDeadlineField.value && !formData.deadline) {
|
||||||
|
createMessage.warning('请选择事项截止时间');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
emit('confirm', {
|
emit('confirm', {
|
||||||
payload: contextData.value,
|
payload: contextData.value,
|
||||||
options: {
|
options: {
|
||||||
@@ -198,6 +234,7 @@
|
|||||||
deptIds: [...formData.deptIds],
|
deptIds: [...formData.deptIds],
|
||||||
isNeedAppro: showSuoleaderFields.value ? formData.isNeedAppro : undefined,
|
isNeedAppro: showSuoleaderFields.value ? formData.isNeedAppro : undefined,
|
||||||
supDeptleaderid: showSuoleaderFields.value ? (String(formData.isNeedAppro) === '1' ? formData.supDeptleaderid : '') : undefined,
|
supDeptleaderid: showSuoleaderFields.value ? (String(formData.isNeedAppro) === '1' ? formData.supDeptleaderid : '') : undefined,
|
||||||
|
deadline: showDeadlineField.value ? formData.deadline : undefined,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
handleCancel();
|
handleCancel();
|
||||||
|
|||||||
@@ -433,6 +433,8 @@
|
|||||||
showSuoleaderFields: true,
|
showSuoleaderFields: true,
|
||||||
isNeedAppro: record?.isNeedAppro,
|
isNeedAppro: record?.isNeedAppro,
|
||||||
supDeptleaderid: record?.supDeptleaderid,
|
supDeptleaderid: record?.supDeptleaderid,
|
||||||
|
showDeadlineField: true,
|
||||||
|
deadline: record?.deadline,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -474,12 +476,18 @@
|
|||||||
const formatDate = (value, format) => {
|
const formatDate = (value, format) => {
|
||||||
return value ? dateUtil(value).format(format) : undefined;
|
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 nextSuperviseCount = getNextSuperviseCount(record.superviseCount);
|
||||||
|
const selectedDeadline = options.deadline || record.deadline;
|
||||||
const flowJsonData = {
|
const flowJsonData = {
|
||||||
...record,
|
...record,
|
||||||
isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '',
|
isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '',
|
||||||
supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '',
|
supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '',
|
||||||
superviseCount: nextSuperviseCount,
|
superviseCount: nextSuperviseCount,
|
||||||
|
deadline: selectedDeadline,
|
||||||
};
|
};
|
||||||
|
|
||||||
const params = {
|
const params = {
|
||||||
@@ -502,8 +510,8 @@
|
|||||||
urgencyLevel: record.urgencyLevel,
|
urgencyLevel: record.urgencyLevel,
|
||||||
deptId: options.deptId || record.responDeptid,
|
deptId: options.deptId || record.responDeptid,
|
||||||
deptLeaderId: record.responDeptid,
|
deptLeaderId: record.responDeptid,
|
||||||
requireFinishDate: formatDate(record.deadline, 'YYYY-MM-DD'),
|
requireFinishDate: formatDate(selectedDeadline, 'YYYY-MM-DD'),
|
||||||
deadline: formatDate(record.deadline, 'YYYY-MM-DD HH:mm:ss'),
|
deadline: formatDeadlineDateTime(selectedDeadline),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user