From f23174cb19eebd63d97b8733375ade942c5df2ca Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Mon, 6 Dec 2021 18:41:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tall/task/AssignmentExperiment.vue | 6 +++---
 src/components/tall/task/AssignmentSubject.vue    | 7 ++-----
 src/components/tall/task/PlanAssignment.vue       | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/tall/task/AssignmentExperiment.vue b/src/components/tall/task/AssignmentExperiment.vue
index 6cad640..a667b7e 100644
--- a/src/components/tall/task/AssignmentExperiment.vue
+++ b/src/components/tall/task/AssignmentExperiment.vue
@@ -57,7 +57,7 @@ const projectId = computed(() => store.getters['projects/projectId']);
 const options = ref([]);
 const experimentationId = computed(() => store.state.task.experimentationId); // 子课题ID
 
-// 课题起止时间
+// 子课题起止时间
 const subStartTime = computed(() => store.state.layout.subStartTime);
 const subEndTime = computed(() => store.state.layout.subEndTime);
 
@@ -100,11 +100,11 @@ const onSubmit = async () => {
       }
     });
 
-    if (assignExperFormData.value.startTime < subStartTime.value) {
+    if (subStartTime.value && assignExperFormData.value.startTime < subStartTime.value) {
       message.info('实验开始时间不能小于子课题开始时间');
       return false;
     }
-    if (assignExperFormData.value.endTime > subEndTime.value) {
+    if (subEndTime.value && assignExperFormData.value.endTime > subEndTime.value) {
       message.info('实验结束时间不能小于子课题结束时间');
       return false;
     }
diff --git a/src/components/tall/task/AssignmentSubject.vue b/src/components/tall/task/AssignmentSubject.vue
index c50d30f..5d41738 100644
--- a/src/components/tall/task/AssignmentSubject.vue
+++ b/src/components/tall/task/AssignmentSubject.vue
@@ -303,11 +303,8 @@ const onSubmit = async () => {
         }
       });
 
-      if (item.startTime < topicSubFormData.value.startTime) {
-        msgText = '子课题进度安排开始时间不能小于子课题开始时间';
-      }
-      if (item.endTime > topicSubFormData.value.endTime) {
-        msgText = '子课题进度安排结束时间不能大于子课题结束时间';
+      if (item.startTime < topicSubFormData.value.startTime || item.endTime > topicSubFormData.value.endTime) {
+        msgText = '子课题进度安排起止必须在子课题起止时间';
       }
     }
 
diff --git a/src/components/tall/task/PlanAssignment.vue b/src/components/tall/task/PlanAssignment.vue
index cbaf26a..54b68bf 100644
--- a/src/components/tall/task/PlanAssignment.vue
+++ b/src/components/tall/task/PlanAssignment.vue
@@ -353,7 +353,7 @@ const onSubmit = async () => {
         message.info('阶段任务开始时间不能小于项目起始时间');
         return false;
       }
-      if (obj.stageEndTime < topicMeetFormData.value.endTime) {
+      if (obj.stageEndTime > topicMeetFormData.value.endTime) {
         message.info('阶段任务结束时间不能小于项目终止时间');
         return false;
       }