Browse Source

fix: 时间判断隐藏

pull/1/head
xuesinan 4 years ago
parent
commit
7d057585e9
  1. 22
      src/components/tall/task/AssignmentExperiment.vue
  2. 14
      src/components/tall/task/ExperimentalCode.vue
  3. 14
      src/components/tall/task/ExperimentalData.vue
  4. 14
      src/components/tall/task/LabReport.vue
  5. 14
      src/components/tall/task/Procedure.vue
  6. 14
      src/components/tall/task/SubConclusion.vue
  7. 14
      src/components/tall/task/SubInterimInspection.vue
  8. 14
      src/components/tall/task/SubResult.vue

22
src/components/tall/task/AssignmentExperiment.vue

@ -58,8 +58,10 @@ 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);
// const subStartTime = computed(() => store.state.layout.subStartTime);
// const subEndTime = computed(() => store.state.layout.subEndTime);
// console.log(subStartTime.value, subEndTime.value);
if (experimentationId.value) {
getSubProject(experimentationId.value);
@ -100,14 +102,14 @@ const onSubmit = async () => {
}
});
if (subStartTime.value && assignExperFormData.value.startTime < subStartTime.value) {
message.info('实验开始时间不能小于子课题开始时间');
return false;
}
if (subEndTime.value && assignExperFormData.value.endTime > subEndTime.value) {
message.info('实验结束时间不能小于子课题结束时间');
return false;
}
// if (subStartTime.value && assignExperFormData.value.startTime < subStartTime.value) {
// message.info('');
// return false;
// }
// if (subEndTime.value && assignExperFormData.value.endTime > subEndTime.value) {
// message.info('');
// return false;
// }
}
try {

14
src/components/tall/task/ExperimentalCode.vue

@ -70,7 +70,7 @@ import { useStore } from 'vuex';
import dayjs from 'dayjs';
import { InboxOutlined } from '@ant-design/icons-vue';
import { uploadImg } from 'apis';
import { message } from 'ant-design-vue';
// import { message } from 'ant-design-vue';
const store = useStore();
@ -90,8 +90,8 @@ const isShowWarning = ref(false);
const tipsMessage = ref('');
//
const expreStartTime = computed(() => store.state.layout.expreStartTime);
const expreEndTime = computed(() => store.state.layout.expreEndTime);
// const expreStartTime = computed(() => store.state.layout.expreStartTime);
// const expreEndTime = computed(() => store.state.layout.expreEndTime);
//
const expreStatus = computed(() => store.state.projects.expreStatus);
@ -177,10 +177,10 @@ const onSubmit = async () => {
if (item.type === 6 && item.date) {
const time = dayjs(item.date).format('x');
if (time < expreStartTime.value || time > expreEndTime.value) {
message.info('实验日期必须在实验起止时间之内');
return false;
}
// if (time < expreStartTime.value || time > expreEndTime.value) {
// message.info('');
// return false;
// }
obj.answerList.push(time);
}

14
src/components/tall/task/ExperimentalData.vue

@ -70,7 +70,7 @@ import { useStore } from 'vuex';
import dayjs from 'dayjs';
import { InboxOutlined } from '@ant-design/icons-vue';
import { uploadImg } from 'apis';
import { message } from 'ant-design-vue';
// import { message } from 'ant-design-vue';
const store = useStore();
@ -90,8 +90,8 @@ const isShowWarning = ref(false);
const tipsMessage = ref('');
//
const expreStartTime = computed(() => store.state.layout.expreStartTime);
const expreEndTime = computed(() => store.state.layout.expreEndTime);
// const expreStartTime = computed(() => store.state.layout.expreStartTime);
// const expreEndTime = computed(() => store.state.layout.expreEndTime);
//
const expreStatus = computed(() => store.state.projects.expreStatus);
@ -177,10 +177,10 @@ const onSubmit = async () => {
if (item.type === 6 && item.date) {
const time = dayjs(item.date).format('x');
if (time < expreStartTime.value || time > expreEndTime.value) {
message.info('实验日期必须在实验起止时间之内');
return false;
}
// if (time < expreStartTime.value || time > expreEndTime.value) {
// message.info('');
// return false;
// }
obj.answerList.push(time);
}

14
src/components/tall/task/LabReport.vue

@ -69,7 +69,7 @@ import { useStore } from 'vuex';
import dayjs from 'dayjs';
import { InboxOutlined } from '@ant-design/icons-vue';
import { uploadImg } from 'apis';
import { message } from 'ant-design-vue';
// import { message } from 'ant-design-vue';
const store = useStore();
@ -87,8 +87,8 @@ const isShowWarning = ref(false);
const tipsMessage = ref('');
//
const expreStartTime = computed(() => store.state.layout.expreStartTime);
const expreEndTime = computed(() => store.state.layout.expreEndTime);
// const expreStartTime = computed(() => store.state.layout.expreStartTime);
// const expreEndTime = computed(() => store.state.layout.expreEndTime);
//
const expreStatus = computed(() => store.state.projects.expreStatus);
@ -161,10 +161,10 @@ const onSubmit = async () => {
if (item.type === 6 && item.date) {
const time = dayjs(item.date).format('x');
if (time < expreStartTime.value || time > expreEndTime.value) {
message.info('实验日期必须在实验起止时间之内');
return false;
}
// if (time < expreStartTime.value || time > expreEndTime.value) {
// message.info('');
// return false;
// }
obj.answerList.push(time);
}

14
src/components/tall/task/Procedure.vue

@ -69,7 +69,7 @@ import { useStore } from 'vuex';
import dayjs from 'dayjs';
import { InboxOutlined } from '@ant-design/icons-vue';
import { uploadImg } from 'apis';
import { message } from 'ant-design-vue';
// import { message } from 'ant-design-vue';
const store = useStore();
@ -87,8 +87,8 @@ const isShowWarning = ref(false);
const tipsMessage = ref('');
//
const expreStartTime = computed(() => store.state.layout.expreStartTime);
const expreEndTime = computed(() => store.state.layout.expreEndTime);
// const expreStartTime = computed(() => store.state.layout.expreStartTime);
// const expreEndTime = computed(() => store.state.layout.expreEndTime);
//
const expreStatus = computed(() => store.state.projects.expreStatus);
@ -161,10 +161,10 @@ const onSubmit = async () => {
if (item.type === 6 && item.date) {
const time = dayjs(item.date).format('x');
if (time < expreStartTime.value || time > expreEndTime.value) {
message.info('实验日期必须在实验起止时间之内');
return false;
}
// if (time < expreStartTime.value || time > expreEndTime.value) {
// message.info('');
// return false;
// }
obj.answerList.push(time);
}

14
src/components/tall/task/SubConclusion.vue

@ -65,7 +65,7 @@ import { useStore } from 'vuex';
import dayjs from 'dayjs';
import { InboxOutlined } from '@ant-design/icons-vue';
import { uploadImg } from 'apis';
import { message } from 'ant-design-vue';
// import { message } from 'ant-design-vue';
const store = useStore();
@ -81,8 +81,8 @@ const questionList = ref([]);
const currIndex = ref(null);
//
const subStartTime = computed(() => store.state.layout.subStartTime);
const subEndTime = computed(() => store.state.layout.subEndTime);
// const subStartTime = computed(() => store.state.layout.subStartTime);
// const subEndTime = computed(() => store.state.layout.subEndTime);
getDataByCode();
@ -145,10 +145,10 @@ const onSubmit = async () => {
if (item.type === 6 && item.date) {
const time = dayjs(item.date).format('x');
if (time < subStartTime.value || time > subEndTime.value) {
message.info('中期检查时间必须在子课题起止时间之内');
return false;
}
// if (time < subStartTime.value || time > subEndTime.value) {
// message.info('');
// return false;
// }
obj.answerList.push(time);
}

14
src/components/tall/task/SubInterimInspection.vue

@ -65,7 +65,7 @@ import { useStore } from 'vuex';
import dayjs from 'dayjs';
import { InboxOutlined } from '@ant-design/icons-vue';
import { uploadImg } from 'apis';
import { message } from 'ant-design-vue';
// import { message } from 'ant-design-vue';
const store = useStore();
@ -81,8 +81,8 @@ const questionList = ref([]);
const currIndex = ref(null);
//
const subStartTime = computed(() => store.state.layout.subStartTime);
const subEndTime = computed(() => store.state.layout.subEndTime);
// const subStartTime = computed(() => store.state.layout.subStartTime);
// const subEndTime = computed(() => store.state.layout.subEndTime);
getDataByCode();
@ -145,10 +145,10 @@ const onSubmit = async () => {
if (item.type === 6 && item.date) {
const time = dayjs(item.date).format('x');
if (time < subStartTime.value || time > subEndTime.value) {
message.info('中期检查时间必须在子课题起止时间之内');
return false;
}
// if (time < subStartTime.value || time > subEndTime.value) {
// message.info('');
// return false;
// }
obj.answerList.push(time);
}

14
src/components/tall/task/SubResult.vue

@ -65,7 +65,7 @@ import { useStore } from 'vuex';
import dayjs from 'dayjs';
import { InboxOutlined } from '@ant-design/icons-vue';
import { uploadImg } from 'apis';
import { message } from 'ant-design-vue';
// import { message } from 'ant-design-vue';
const store = useStore();
@ -81,8 +81,8 @@ const questionList = ref([]);
const currIndex = ref(null);
//
const subStartTime = computed(() => store.state.layout.subStartTime);
const subEndTime = computed(() => store.state.layout.subEndTime);
// const subStartTime = computed(() => store.state.layout.subStartTime);
// const subEndTime = computed(() => store.state.layout.subEndTime);
getDataByCode();
@ -145,10 +145,10 @@ const onSubmit = async () => {
if (item.type === 6 && item.date) {
const time = dayjs(item.date).format('x');
if (time < subStartTime.value || time > subEndTime.value) {
message.info('中期检查时间必须在子课题起止时间之内');
return false;
}
// if (time < subStartTime.value || time > subEndTime.value) {
// message.info('');
// return false;
// }
obj.answerList.push(time);
}

Loading…
Cancel
Save