From 7d057585e92379a2ad139ffac0603551038c3065 Mon Sep 17 00:00:00 2001 From: xuesinan <1404152492@qq.com> Date: Mon, 6 Dec 2021 18:58:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tall/task/AssignmentExperiment.vue | 22 ++++++++++--------- src/components/tall/task/ExperimentalCode.vue | 14 ++++++------ src/components/tall/task/ExperimentalData.vue | 14 ++++++------ src/components/tall/task/LabReport.vue | 14 ++++++------ src/components/tall/task/Procedure.vue | 14 ++++++------ src/components/tall/task/SubConclusion.vue | 14 ++++++------ .../tall/task/SubInterimInspection.vue | 14 ++++++------ src/components/tall/task/SubResult.vue | 14 ++++++------ 8 files changed, 61 insertions(+), 59 deletions(-) diff --git a/src/components/tall/task/AssignmentExperiment.vue b/src/components/tall/task/AssignmentExperiment.vue index a667b7e..a19f501 100644 --- a/src/components/tall/task/AssignmentExperiment.vue +++ b/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 { diff --git a/src/components/tall/task/ExperimentalCode.vue b/src/components/tall/task/ExperimentalCode.vue index 1da5efb..2c203aa 100644 --- a/src/components/tall/task/ExperimentalCode.vue +++ b/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); } diff --git a/src/components/tall/task/ExperimentalData.vue b/src/components/tall/task/ExperimentalData.vue index 1da5efb..2c203aa 100644 --- a/src/components/tall/task/ExperimentalData.vue +++ b/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); } diff --git a/src/components/tall/task/LabReport.vue b/src/components/tall/task/LabReport.vue index 7383704..b0db161 100644 --- a/src/components/tall/task/LabReport.vue +++ b/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); } diff --git a/src/components/tall/task/Procedure.vue b/src/components/tall/task/Procedure.vue index 1d96fab..1186ef3 100644 --- a/src/components/tall/task/Procedure.vue +++ b/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); } diff --git a/src/components/tall/task/SubConclusion.vue b/src/components/tall/task/SubConclusion.vue index a086a3d..9b25873 100644 --- a/src/components/tall/task/SubConclusion.vue +++ b/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); } diff --git a/src/components/tall/task/SubInterimInspection.vue b/src/components/tall/task/SubInterimInspection.vue index 6aa6fd6..bdab7b9 100644 --- a/src/components/tall/task/SubInterimInspection.vue +++ b/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); } diff --git a/src/components/tall/task/SubResult.vue b/src/components/tall/task/SubResult.vue index fb98fea..1e2615c 100644 --- a/src/components/tall/task/SubResult.vue +++ b/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); }