Merge branch 'master' into dev
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user