瀏覽代碼

fix(表单验证): 为学期和课程字段添加必填验证规则并修正问卷相关文案

为examinationManagement和questionnaireManagement的表单添加学期和课程字段的必填验证规则
将questionnaireManagement中所有"考试"相关文案修正为"问卷"
tanshanming 6 月之前
父節點
當前提交
18d24748ba
共有 2 個文件被更改,包括 30 次插入26 次删除
  1. 5 3
      src/views/exm/examinationManagement/form.vue
  2. 25 23
      src/views/exm/questionnaireManagement/form.vue

+ 5 - 3
src/views/exm/examinationManagement/form.vue

@@ -23,7 +23,7 @@
 					<a-button type="primary" @click="addPaper" style="width: 100px">选择试卷</a-button>
 				</a-input-group>
 			</a-form-item>
-			<a-form-item label="学期" name="semesterId">
+			<a-form-item label="学期" name="semesterId" :rules="rules.semesterId">
 				<a-select v-model:value="form.semesterId" placeholder="请选择学期" allowClear @change="handleSemesterChange">
 					<a-select-option v-for="item in semesterList" :key="item.id" :value="item.id">
 						{{ item.name }}
@@ -37,7 +37,7 @@
 					</a-select-option>
 				</a-select>
 			</a-form-item> -->
-			<a-form-item label="课程" name="courseId">
+			<a-form-item label="课程" name="courseId" :rules="rules.courseId">
 				<a-select v-model:value="form.courseId" placeholder="请选择课程" allowClear :disabled="!form.semesterId">
 					<a-select-option v-for="item in courseList" :key="item.courseId" :value="item.courseId">
 						{{ item.courseName }}
@@ -172,7 +172,9 @@
 		examName: [{ required: true, message: '请输入考试标题', trigger: 'blur' }],
 		paperId: [{ required: true, message: '请选择试卷', trigger: 'change' }],
 		startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
-		endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }]
+		endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
+		semesterId: [{ required: true, message: '请选择学期', trigger: 'change' }],
+		courseId: [{ required: true, message: '请选择课程', trigger: 'change' }]
 	}
 
 	const selectedPaperName = ref('')

+ 25 - 23
src/views/exm/questionnaireManagement/form.vue

@@ -9,21 +9,21 @@
 			:loading="formLoading"
 			layout="horizontal"
 		>
-			<a-form-item label="考试标题" name="examName" :rules="rules.examName">
-				<a-input v-model:value="form.examName" placeholder="请输入考试标题" />
+			<a-form-item label="问卷标题" name="examName" :rules="rules.examName">
+				<a-input v-model:value="form.examName" placeholder="请输入问卷标题" />
 			</a-form-item>
-			<a-form-item label="选择卷" name="paperId" :rules="rules.paperId">
+			<a-form-item label="选择卷" name="paperId" :rules="rules.paperId">
 				<a-input-group compact>
 					<a-input
 						v-model:value="selectedPaperName"
-						placeholder="请选择卷"
+						placeholder="请选择卷"
 						readonly
 						style="width: calc(100% - 100px)"
 					/>
-					<a-button type="primary" @click="addPaper" style="width: 100px">选择卷</a-button>
+					<a-button type="primary" @click="addPaper" style="width: 100px">选择卷</a-button>
 				</a-input-group>
 			</a-form-item>
-			<a-form-item label="学期" name="semesterId">
+			<a-form-item label="学期" name="semesterId" :rules="rules.semesterId">
 				<a-select v-model:value="form.semesterId" placeholder="请选择学期" allowClear @change="handleSemesterChange">
 					<a-select-option v-for="item in semesterList" :key="item.id" :value="item.id">
 						{{ item.name }}
@@ -37,7 +37,7 @@
 					</a-select-option>
 				</a-select>
 			</a-form-item> -->
-			<a-form-item label="课程" name="courseId">
+			<a-form-item label="课程" name="courseId" :rules="rules.courseId">
 				<a-select v-model:value="form.courseId" placeholder="请选择课程" allowClear :disabled="!form.semesterId">
 					<a-select-option v-for="item in courseList" :key="item.courseId" :value="item.courseId">
 						{{ item.courseName }}
@@ -63,7 +63,7 @@
 					style="width: 100%"
 				/>
 			</a-form-item>
-			<a-form-item label="考试状态" name="examStatus">
+			<a-form-item label="问卷状态" name="examStatus">
 				<a-radio-group v-model:value="form.examStatus">
 					<a-radio :value="0">未开始</a-radio>
 					<a-radio :value="1">已开始</a-radio>
@@ -81,15 +81,15 @@
 		<a-modal
 			v-model:visible="paperPage.showDialog"
 			width="70%"
-			title="选择卷"
+			title="选择卷"
 			@ok="confirmPaperSelect"
 			@cancel="() => (paperPage.showDialog = false)"
 		>
 			<a-form layout="inline">
-				<a-form-item label="卷类型">
+				<a-form-item label="卷类型">
 					<a-select
 						v-model:value="paperPage.queryParam.paperType"
-						placeholder="请选择卷类型"
+						placeholder="请选择卷类型"
 						@change="paperTypeChange"
 						disabled
 					>
@@ -169,10 +169,12 @@
 	})
 
 	const rules = {
-		examName: [{ required: true, message: '请输入考试标题', trigger: 'blur' }],
-		paperId: [{ required: true, message: '请选择卷', trigger: 'change' }],
+		examName: [{ required: true, message: '请输入问卷标题', trigger: 'blur' }],
+		paperId: [{ required: true, message: '请选择卷', trigger: 'change' }],
 		startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
-		endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }]
+		endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
+		semesterId: [{ required: true, message: '请选择学期', trigger: 'change' }],
+		courseId: [{ required: true, message: '请选择课程', trigger: 'change' }]
 	}
 
 	const selectedPaperName = ref('')
@@ -204,7 +206,7 @@
 		total: 0
 	})
 
-	// 卷选择表格单选
+	// 卷选择表格单选
 	const selectedRowKeys = ref([])
 	const rowSelection = reactive({
 		type: 'radio',
@@ -265,20 +267,20 @@
 		return current && current < dayjs().endOf('day')
 	}
 
-	// 卷类型变更
+	// 卷类型变更
 	const paperTypeChange = () => {
 		paperPage.queryParam.paperId = null
 		form.paperId = null
 		selectedPaperName.value = ''
 	}
 
-	// 选择
+	// 选择
 	const addPaper = () => {
 		paperPage.showDialog = true
 		search()
 	}
 
-	// 查询
+	// 查询
 	const search = async () => {
 		paperPage.listLoading = true
 		paperPage.showDialog = true
@@ -298,10 +300,10 @@
 		paperPage.listLoading = false
 	}
 
-	// 确认选择
+	// 确认选择
 	const confirmPaperSelect = () => {
 		if (!paperPage.selectedPaper) {
-			message.warning('请选择一个卷')
+			message.warning('请选择一个卷')
 			return
 		}
 		form.paperId = paperPage.selectedPaper.id
@@ -384,9 +386,9 @@
 						startTime: re.startTime ? dayjs(re.startTime) : null,
 						endTime: re.endTime ? dayjs(re.endTime) : null
 					})
-					// 如果有试卷ID,需要获取试卷名称显示
+					// 如果有问卷ID,需要获取问卷名称显示
 					if (re.paperId) {
-						// 这里可以根据需要调用接口获取卷名称
+						// 这里可以根据需要调用接口获取卷名称
 						examPaperApi.select(re.paperId).then((r) => {
 							selectedPaperName.value = r.name
 						})
@@ -399,7 +401,7 @@
 					formLoading.value = false
 				})
 				.catch((err) => {
-					message.error('加载考试信息失败:' + (err.message || '网络错误'))
+					message.error('加载问卷信息失败:' + (err.message || '网络错误'))
 					formLoading.value = false
 				})
 		}