|
|
@@ -70,6 +70,28 @@ export default {
|
|
|
{ required: true, message: "请输入作业描述", trigger: "blur" },
|
|
|
{ min: 10, max: 200, message: "长度应大于10小于200", trigger: "blur" },
|
|
|
],
|
|
|
+ startTime: {
|
|
|
+ required: true, message: "请输入开始时间", trigger: "change",
|
|
|
+ validator: (_, value, callback) => {
|
|
|
+ const startTime = this.writingHomeworkForm.timeRange[0];
|
|
|
+ if (!startTime) {
|
|
|
+ callback(new Error("请先选择开始时间"));
|
|
|
+ } else {
|
|
|
+ callback();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ endTime: {
|
|
|
+ required: true, message: "请输入结束时间", trigger: "change",
|
|
|
+ validator: (_, value, callback) => {
|
|
|
+ const endTime = this.writingHomeworkForm.timeRange[1];
|
|
|
+ if (!endTime) {
|
|
|
+ callback(new Error("请输入结束时间"));
|
|
|
+ } else {
|
|
|
+ callback();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
timeRange:[
|
|
|
{ required: true, message: "请选择时间范围", trigger: "blur" },
|
|
|
],
|
|
|
@@ -83,6 +105,28 @@ export default {
|
|
|
{ required: true, message: "请输入作业描述", trigger: "blur" },
|
|
|
{ min: 10, max: 200, message: "长度应大于10小于200", trigger: "blur" },
|
|
|
],
|
|
|
+ startTime: {
|
|
|
+ required: true, message: "请输入开始时间", trigger: "change",
|
|
|
+ validator: (_, value, callback) => {
|
|
|
+ const startTime = this.speakingHomeworkForm.timeRange[0];
|
|
|
+ if (!startTime) {
|
|
|
+ callback(new Error("请先选择开始时间"));
|
|
|
+ } else {
|
|
|
+ callback();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ endTime: {
|
|
|
+ required: true, message: "请输入结束时间", trigger: "change",
|
|
|
+ validator: (_, value, callback) => {
|
|
|
+ const endTime = this.speakingHomeworkForm.timeRange[1];
|
|
|
+ if (!endTime) {
|
|
|
+ callback(new Error("请输入结束时间"));
|
|
|
+ } else {
|
|
|
+ callback();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
timeRange:[
|
|
|
{ required: true, message: "请选择时间范围", trigger: "blur" },
|
|
|
],
|
|
|
@@ -214,6 +258,7 @@ export default {
|
|
|
this.writingHomeworkForm.attachments = [];
|
|
|
this.speakingHomeworkForm.descriptionFile = null;
|
|
|
this.speakingHomeworkForm.attachments = [];
|
|
|
+ this.writingHomeworkForm.timeRange = [];
|
|
|
this.dialog.create = false;
|
|
|
this.speakingDialog.create = false;
|
|
|
done();
|
|
|
@@ -227,11 +272,13 @@ export default {
|
|
|
this.$refs.homeworkFormRef.resetFields();
|
|
|
this.writingHomeworkForm.descriptionFile = null;
|
|
|
this.writingHomeworkForm.attachments = [];
|
|
|
+ this.writingHomeworkForm.timeRange = [];
|
|
|
}
|
|
|
if (this.$refs.speakingHomeworkFormRef){
|
|
|
this.$refs.speakingHomeworkFormRef.resetFields();
|
|
|
this.speakingHomeworkForm.descriptionFile = null;
|
|
|
this.speakingHomeworkForm.attachments = [];
|
|
|
+ this.writingHomeworkForm.timeRange = [];
|
|
|
}
|
|
|
this.dialog.create = false;
|
|
|
this.speakingDialog.create = false;
|
|
|
@@ -510,10 +557,9 @@ export default {
|
|
|
class="homework-form-item">
|
|
|
<el-input type="textarea"
|
|
|
resize="none"
|
|
|
- style="font-size: 16px"
|
|
|
maxlength="200"
|
|
|
show-word-limit
|
|
|
- :autosize="{ minRows: 1, maxRows: 10 }"
|
|
|
+ :autosize="{ minRows: 3, maxRows: 10}"
|
|
|
v-model="writingHomeworkForm.description" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="作业类型"
|
|
|
@@ -578,16 +624,24 @@ export default {
|
|
|
</template>
|
|
|
</el-upload>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="作业期限"
|
|
|
- prop="timeRange"
|
|
|
- class="homework-form-item">
|
|
|
- <el-date-picker
|
|
|
- v-model="writingHomeworkForm.timeRange"
|
|
|
- type="datetimerange"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- />
|
|
|
+<!-- <el-form-item label="作业期限"-->
|
|
|
+<!-- prop="timeRange"-->
|
|
|
+<!-- class="homework-form-item">-->
|
|
|
+<!-- <el-date-picker-->
|
|
|
+<!-- v-model="writingHomeworkForm.timeRange"-->
|
|
|
+<!-- type="datetimerange"-->
|
|
|
+<!-- range-separator="至"-->
|
|
|
+<!-- start-placeholder="开始日期"-->
|
|
|
+<!-- end-placeholder="结束日期"-->
|
|
|
+<!-- />-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+ <el-form-item label="开始时间" prop="startTime">
|
|
|
+ <el-date-picker v-model="writingHomeworkForm.timeRange[0]" placeholder="开始时间" type="datetime">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="结束时间" prop="endTime">
|
|
|
+ <el-date-picker v-model="writingHomeworkForm.timeRange[1]" placeholder="结束时间" type="datetime">
|
|
|
+ </el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<template #footer>
|
|
|
@@ -627,10 +681,9 @@ export default {
|
|
|
class="homework-form-item">
|
|
|
<el-input type="textarea"
|
|
|
resize="none"
|
|
|
- style="font-size: 16px"
|
|
|
maxlength="200"
|
|
|
show-word-limit
|
|
|
- :autosize="{ minRows: 1, maxRows: 10 }"
|
|
|
+ :autosize="{ minRows: 3, maxRows: 10 }"
|
|
|
v-model="speakingHomeworkForm.description" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="作业类型"
|
|
|
@@ -695,16 +748,24 @@ export default {
|
|
|
</template>
|
|
|
</el-upload>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="作业期限"
|
|
|
- prop="timeRange"
|
|
|
- class="homework-form-item">
|
|
|
- <el-date-picker
|
|
|
- v-model="speakingHomeworkForm.timeRange"
|
|
|
- type="datetimerange"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- />
|
|
|
+<!-- <el-form-item label="作业期限"-->
|
|
|
+<!-- prop="timeRange"-->
|
|
|
+<!-- class="homework-form-item">-->
|
|
|
+<!-- <el-date-picker-->
|
|
|
+<!-- v-model="speakingHomeworkForm.timeRange"-->
|
|
|
+<!-- type="datetimerange"-->
|
|
|
+<!-- range-separator="至"-->
|
|
|
+<!-- start-placeholder="开始日期"-->
|
|
|
+<!-- end-placeholder="结束日期"-->
|
|
|
+<!-- />-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+ <el-form-item label="开始时间" prop="startTime">
|
|
|
+ <el-date-picker v-model="speakingHomeworkForm.timeRange[0]" placeholder="开始时间" type="datetime">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="结束时间" prop="endTime">
|
|
|
+ <el-date-picker v-model="speakingHomeworkForm.timeRange[1]" placeholder="结束时间" type="datetime">
|
|
|
+ </el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="最少时长"
|
|
|
class="homework-form-item"
|
|
|
@@ -831,7 +892,6 @@ export default {
|
|
|
height: auto;
|
|
|
}
|
|
|
.form-input{
|
|
|
- font-size: 16px;
|
|
|
width: 100%;
|
|
|
}
|
|
|
.timeline-content{
|