hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-12 12:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy-zsx0223'

Browse Source
This commit is contained in:
zhangsir
2024-02-28 11:05:25 +08:00
parent 9a37f101d0 46bcb5a9d3
commit 5d3d149c23
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/drawers/AddOpenCourse.vue
View File

@@ -419,7 +419,7 @@
</a-drawer> </a-drawer>
</template> </template>
<script setup lang="jsx"> <script setup lang="jsx">
import {defineProps, ref, nextTick, computed,defineEmits,onMounted } from "vue"; import {defineProps, ref, nextTick, computed,defineEmits,onMounted, watch } from "vue";
import {Form, message} from "ant-design-vue"; import {Form, message} from "ant-design-vue";
import FJUpload from "@/components/common/FJUpload"; import FJUpload from "@/components/common/FJUpload";
import CheckBox from "@/components/common/CheckBox"; import CheckBox from "@/components/common/CheckBox";
@@ -843,6 +843,10 @@ async function coursePlanConfirm() {
message.info('请选择开始时间和结束时间') message.info('请选择开始时间和结束时间')
return return
} }
if(durationText.value<0){
message.info('结束时间不能小于开始时间，请重新填写')
return
}
await validate().catch(({ errorFields }) => { await validate().catch(({ errorFields }) => {
message.warning(errorFields[0].errors.join()); message.warning(errorFields[0].errors.join());
throw Error("数据校验不通过"); throw Error("数据校验不通过");
@@ -918,13 +922,17 @@ const range = (start, end) => {
} }
return result; return result;
}; };
const disabledDate = (current) => current && current < dayjs(dateTime.value[0]); // const disabledDate = (current) => current && current < dayjs(dateTime.value[0]);
const disabledDateTime = () => { const disabledDateTime = () => {
const currentMinute = dayjs(dateTime.value[0]).minute(); // const dateOnlyStart = new Date(dateTime.value[0].split(' ')[0]);
return { // const dateOnlyEnd = new Date(dateTime.value[1].split(' ')[0]);
disabledHours: () => range(0, dayjs(dateTime.value[0]).hour()).splice(0, dayjs(dateTime.value[0]).hour()), // if(dateOnlyStart.getTime()==dateOnlyEnd.getTime()){
disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1), // const currentMinute = dayjs(dateTime.value[0]).minute();
}; // return {
// disabledHours: () => range(0, dayjs(dateTime.value[0]).hour()).splice(0, dayjs(dateTime.value[0]).hour()),
// disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1),
// };
// }
}; };
// 删除文件返回参数 // 删除文件返回参数
const changevalue = (e) => { const changevalue = (e) => {

23
src/views/courselibrary/CoursewareManage.vue
View File

@@ -3842,7 +3842,7 @@ function onFocusEnd(){
state.onceName = ""; state.onceName = "";
state.xjkkinputV2 = ""; state.xjkkinputV2 = "";
state.duration = ""; state.duration = "";
state.xjkkinputV3 = []; // state.xjkkinputV3 = [];
state.xjkkinputV4 = null; state.xjkkinputV4 = null;
state.checked1 = false; state.checked1 = false;
state.checked4 = false; state.checked4 = false;
@@ -3922,6 +3922,9 @@ function onFocusEnd(){
if(!state.xjkkinputV3[1]){ if(!state.xjkkinputV3[1]){
return message.error("结束时间未填写"); return message.error("结束时间未填写");
} }
if(durationText.value<0){
return message.error("结束时间不能小于开始时间，请重新填写");
}
if(state.offteachers.some(item => !item.teacherName)){ if(state.offteachers.some(item => !item.teacherName)){
return message.error("请填写教师名称和设置权重"); return message.error("请填写教师名称和设置权重");
} }
@@ -5072,14 +5075,20 @@ function onFocusEnd(){
console.log("执行"); console.log("执行");
getTableDate(); getTableDate();
}; };
const disabledDate = (current) => current && current < dayjs(state.xjkkinputV3[0]); const disabledDate = (current) => {
// current && current < dayjs(state.xjkkinputV3[0])
};
const disabledDateTime = () => { const disabledDateTime = () => {
const currentMinute = dayjs(state.xjkkinputV3[0]).minute(); // const dateOnlyStart = new Date(state.xjkkinputV3[0].split(' ')[0]);
return { // const dateOnlyEnd = new Date(state.xjkkinputV3[1].split(' ')[0]);
disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()), // if(dateOnlyStart.getTime()==dateOnlyEnd.getTime()){
disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1), // const currentMinute = dayjs(state.xjkkinputV3[0]).minute();
}; // return {
// disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()),
// disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1),
// };
// }
}; };
function auditStudent(record) { function auditStudent(record) {