diff --git a/src/locales/en.ts b/src/locales/en.ts
index b9799dd7..87296dc9 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1497,6 +1497,7 @@ export default {
projectForm: 'Project Form',
startDate: 'Start Date',
endDate: 'End Date',
+ planEndDate: 'Plan End Date',
cronExpression: 'Cron Expression',
enabled: 'Enabled',
creatorName: 'Creator',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 5128cdb7..85e5ebe3 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1494,6 +1494,7 @@ export default {
projectForm: '项目表单',
startDate: '开始日期',
endDate: '结束日期',
+ planEndDate: '计划结束时间',
cronExpression: 'cron 表达式',
enabled: '启用',
creatorName: '创建人',
diff --git a/src/views/mold/taskConfiguration/TaskConfigurationForm.vue b/src/views/mold/taskConfiguration/TaskConfigurationForm.vue
index 95a1e2e6..a2bd89d0 100644
--- a/src/views/mold/taskConfiguration/TaskConfigurationForm.vue
+++ b/src/views/mold/taskConfiguration/TaskConfigurationForm.vue
@@ -34,17 +34,16 @@
-
+
-
+
{
@@ -167,7 +166,7 @@ const resetForm = () => {
taskType: undefined,
moldList: [],
projectForm: [],
- dateRange: [],
+ endDate: undefined,
cronExpression: undefined,
operableUsers: [],
enabled: true
@@ -198,7 +197,7 @@ const open = async (type: string, row?: TaskManagementVO) => {
.map((id) => String(id))
formData.value.projectForm = mappedIds
}
- formData.value.dateRange = [row.startDate, row.endDate].filter(Boolean) as string[]
+ formData.value.endDate = row.endDate || undefined
formData.value.cronExpression = row.cronExpression
formData.value.operableUsers = parseIdsValue((row as any).operableUsers)
if (typeof row.enabled === 'boolean') {
@@ -219,15 +218,13 @@ const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
- const [startDate, endDate] = Array.isArray(formData.value.dateRange) ? formData.value.dateRange : []
const payload: TaskManagementVO = {
id: formData.value.id,
name: formData.value.name,
taskType: formData.value.taskType,
moldList: toCommaSeparatedIds((formData.value as any).moldList),
projectForm: toCommaSeparatedIds((formData.value as any).projectForm),
- startDate: startDate || undefined,
- endDate: endDate || undefined,
+ endDate: formData.value.endDate || undefined,
cronExpression: formData.value.cronExpression,
operableUsers: toCommaSeparatedIds((formData.value as any).operableUsers),
enabled: formData.value.enabled
diff --git a/src/views/mold/taskConfiguration/index.vue b/src/views/mold/taskConfiguration/index.vue
index 3ce9e7a1..7a47d6d9 100644
--- a/src/views/mold/taskConfiguration/index.vue
+++ b/src/views/mold/taskConfiguration/index.vue
@@ -84,9 +84,9 @@
-
-
-
+
+
+