|
|
@ -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); |
|
|
|
} |
|
|
|
|
|
|
|