Browse Source

fix: 时间判断

master
xuesinan 4 years ago
parent
commit
f23174cb19
  1. 6
      src/components/tall/task/AssignmentExperiment.vue
  2. 7
      src/components/tall/task/AssignmentSubject.vue
  3. 2
      src/components/tall/task/PlanAssignment.vue

6
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;
}

7
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 = '子课题进度安排起止必须在子课题起止时间';
}
}

2
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;
}

Loading…
Cancel
Save