Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/drawers/AddOpenCourse.vue
This commit is contained in:
zhangsir
2024-01-30 14:19:37 +08:00

View File

@@ -136,7 +136,7 @@
:placeholder="[' 开始时间', ' 结束时间']"
:disabled="editBeginClass"
/> -->
<a-date-picker
<a-date-picker
style="width: 41%; height: 40px; border-radius: 8px"
:show-time="{ format: 'HH:mm' }"
format="YYYY-MM-DD HH:mm"
@@ -149,7 +149,7 @@
@focus="onFocusStart"
@select="onDateSelect"
/>
<span style="margin: 0 10px;"></span>
<!-- 第二个日期选择器用于结束时间 -->
<a-date-picker
@@ -193,7 +193,7 @@
<a-button shape="circle" class="btn-circle" @click="inputRemove(index)" :disabled="formData.offteachers.length == 1">-</a-button>
</div>
</div>
</div>
</div>
<div class="cstm_items">
@@ -760,6 +760,14 @@ async function coursePlanConfirm() {
message.info('讲师费已进入审批阶段,无法编辑')
return
}
if(dateTime.value.length<2){
message.info('请选择开始时间和结束时间')
return
}
await validate().catch(({ errorFields }) => {
message.warning(errorFields[0].errors.join());
throw Error("数据校验不通过");
});
const offName = await validateName({
name: formData.value.name,
type: 5,