xuesinan
/
tall4-pc
forked from TALL/tall3-pc-keti
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 时间判断隐藏

master
xuesinan 4 years ago
parent
f23174cb19
commit
7d057585e9
8 changed files with 61 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save