diff --git a/app/Tasks/LoopTask.php b/app/Tasks/LoopTask.php index 31071e023..1bc4e3789 100644 --- a/app/Tasks/LoopTask.php +++ b/app/Tasks/LoopTask.php @@ -26,6 +26,10 @@ class LoopTask extends AbstractTask ])->chunkById(100, function ($list) { /** @var ProjectTask $item */ foreach ($list as $item) { + if ($item->parent_id > 0) { + // 如果是子任务则不处理 + continue; + } try { $task = $item->copyTask(); // 工作流 @@ -71,7 +75,7 @@ class LoopTask extends AbstractTask $newSubTask->save(); } } - // + // $task->refreshLoop(true); $task->addLog("创建任务来自周期任务ID:{$item->id}", [], $task->userid); // 清空旧周期 diff --git a/language/original-api.txt b/language/original-api.txt index 669073f6f..a06f44c28 100644 --- a/language/original-api.txt +++ b/language/original-api.txt @@ -215,7 +215,6 @@ LDAP 用户禁止修改邮箱 重复周期选择错误 任务协助人员最多不能超过(*)个 请选择正确的列表 -子任务禁止复制 子任务未完成 请先领取任务 仅限【(*)】状态的任务归档 @@ -874,4 +873,4 @@ URL格式不正确 更新失败:(*) 应用列表正在更新中,请稍后再试 应用正在下载中,请稍后再试 -应用「*」未安装 \ No newline at end of file +应用「*」未安装 diff --git a/language/original-web.txt b/language/original-web.txt index e0b608280..32b7d4a22 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -2073,4 +2073,4 @@ AI开启新会话失败 打开OKR OKR群组 -重复周期生成的子任务时间将会被清除,是否确认继续? \ No newline at end of file +周期任务的子任务时间将被重置,是否继续? diff --git a/language/translate.json b/language/translate.json index 9ee149c4c..e2264b235 100644 --- a/language/translate.json +++ b/language/translate.json @@ -21767,18 +21767,6 @@ "id": "Jumlah asisten tugas tidak boleh melebihi (%T1)", "ru": "Количество помощников по задаче не может превышать (%T1)" }, - { - "key": "子任务禁止复制", - "zh": "", - "zh-CHT": "子任務禁止複製", - "en": "Subtasks cannot be copied", - "ko": "하위 작업은 복사할 수 없습니다", - "ja": "サブタスクはコピーできません", - "de": "Unteraufgaben dürfen nicht kopiert werden", - "fr": "Les sous-tâches ne peuvent pas être copiées", - "id": "Sub-tugas tidak dapat disalin", - "ru": "Подзадачи нельзя копировать" - }, { "key": "请先领取任务", "zh": "", @@ -30107,4 +30095,4 @@ "id": "Aplikasi '*' tidak terpasang", "ru": "Приложение «*» не установлено" } -] \ No newline at end of file +] diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index ec5df1f16..510de739c 100755 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -1540,7 +1540,7 @@ export default { if (this.subList.length > 0) { $A.modalConfirm({ language: false, - content: this.$L('重复周期生成的子任务时间将会被清除,是否确认继续?'), + content: this.$L('周期任务的子任务时间将被重置,是否继续?'), onOk: () => { this.updateData('loop', value) }