From f7ee7787d21b8183f94fd72c192bf20acff0a003 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 9 Jun 2026 09:41:17 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E6=A8=A1=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E7=82=B9=E6=A3=80=E8=AE=B0=E5=BD=95-=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en.ts                             |  1 +
 src/locales/zh-CN.ts                          |  1 +
 .../TaskConfigurationForm.vue                 | 25 ++++++++-----------
 src/views/mold/taskConfiguration/index.vue    |  6 ++---
 4 files changed, 16 insertions(+), 17 deletions(-)

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 @@
           <el-option v-for="item in planOptions" :key="String(item.id)" :label="item.planName" :value="String(item.id)" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="t('EquipmentManagement.TaskManagement.dateRange')" prop="dateRange">
+      <el-form-item :label="t('EquipmentManagement.TaskManagement.planEndDate')" prop="endDate">
         <el-date-picker
-          v-model="formData.dateRange"
+          v-model="formData.endDate"
           value-format="YYYY-MM-DD"
-          type="daterange"
-          :start-placeholder="t('EquipmentManagement.TaskManagement.placeholderStartDate')"
-          :end-placeholder="t('EquipmentManagement.TaskManagement.placeholderEndDate')"
+          type="date"
+          :placeholder="t('EquipmentManagement.TaskManagement.placeholderEndDate')"
           class="!w-320px"
         />
       </el-form-item>
-      <el-form-item :label="t('EquipmentManagement.TaskManagement.cronExpression')" prop="cronExpression">
+      <!-- <el-form-item :label="t('EquipmentManagement.TaskManagement.cronExpression')" prop="cronExpression">
         <template #label>
           <Tooltip
             title="Cron 表达式"
@@ -52,7 +51,7 @@
           />
         </template>
         <crontab v-model="formData.cronExpression" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="t('EquipmentManagement.TaskManagement.operableUsers')" prop="operableUsers">
         <el-select
           v-model="formData.operableUsers"
@@ -145,7 +144,7 @@ const formData = ref({
   taskType: undefined as number | undefined,
   moldList: [] as string[],
   projectForm: [] as string[],
-  dateRange: [] as string[],
+  endDate: undefined as string | undefined,
   cronExpression: undefined as string | undefined,
   operableUsers: [] as string[],
   enabled: true as boolean
@@ -157,7 +156,7 @@ const formRules = reactive({
   enabled: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderEnabled'), trigger: 'change' }],
   moldList: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderDeviceList'), trigger: 'change' }],
   projectForm: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderProjectForm'), trigger: 'change' }],
-  dateRange: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderDateRange'), trigger: 'change' }]
+  endDate: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderEndDate'), trigger: 'change' }]
 })
 
 const resetForm = () => {
@@ -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 @@
         </template>
       </el-table-column>
       <el-table-column :label="t('EquipmentManagement.TaskManagement.projectForm')" align="center" prop="projectFormName" min-width="140"  sortable />
-      <el-table-column :label="t('EquipmentManagement.TaskManagement.startDate')" align="center" prop="startDate" :formatter="dateFormatter2" width="120"  sortable />
-      <el-table-column :label="t('EquipmentManagement.TaskManagement.endDate')" align="center" prop="endDate" :formatter="dateFormatter2" width="120"  sortable />
-      <el-table-column :label="t('EquipmentManagement.TaskManagement.cronExpression')" align="center" prop="cronExpression" min-width="180" />
+      <!-- <el-table-column :label="t('EquipmentManagement.TaskManagement.startDate')" align="center" prop="startDate" :formatter="dateFormatter2" width="120"  sortable /> -->
+      <el-table-column :label="t('EquipmentManagement.TaskManagement.planEndDate')" align="center" prop="endDate" :formatter="dateFormatter2" width="150"  sortable />
+      <!-- <el-table-column :label="t('EquipmentManagement.TaskManagement.cronExpression')" align="center" prop="cronExpression" min-width="180" /> -->
       <el-table-column :label="t('EquipmentManagement.TaskManagement.enabled')" align="center" prop="enabled" width="90">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />