Merge branch 'refs/heads/dev' into release

src/views/business/publish/components/Order-publish.vue

@@ -43,7 +43,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-							<el-form-item label="是否联系" prop="isContact" :rules="[{ required: true, message: '请选择是否公开', trigger: 'change' }]">
+							<el-form-item label="是否联系" prop="isContact" :rules="[{ required: true, message: '请选择是否联系', trigger: 'change' }]">
 								<el-radio-group v-model="state.ruleForm.isContact" :disabled="disabled">
 									<el-radio :value="true">是</el-radio>
 									<el-radio :value="false">否</el-radio>
@@ -51,7 +51,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-							<el-form-item label="是否评价" prop="isVisited" :rules="[{ required: true, message: '请选择是否公开', trigger: 'change' }]">
+							<el-form-item label="是否评价" prop="isVisited" :rules="[{ required: true, message: '请选择是否评价', trigger: 'change' }]">
 								<el-radio-group v-model="state.ruleForm.isVisited" :disabled="disabled">
 									<el-radio :value="true">是</el-radio>
 									<el-radio :value="false">否</el-radio>

src/views/examTrain/exam/marking/components/Exam-Marking.vue

@@ -138,6 +138,13 @@ const getExamManageDetailData = async () => {
 };
 // 保存提交
 const onSave = throttle(() => {
+	// 校验阅卷是否完成
+	for (const item of state.examList) {
+		if (!item.score) {
+			ElMessage.warning(`请填写【${item.title}】的分数`);
+			return;
+		}
+	}
 	const request = state.examList.map((item: any) => {
 		return {
 			userExamItemId: item.id,

src/views/examTrain/exam/marking/index.vue

@@ -53,8 +53,10 @@
 					<vxe-column field="remark" title="备注" min-width="200"></vxe-column>
 					<vxe-column title="操作" fixed="right" width="80" align="center" :show-overflow="false">
 						<template #default="{ row }">
+							<el-button link type="primary" @click="onMarking(row)" title="阅卷" v-if="!row.isCheck" v-auth="'examTrain:exam:marking'">
+								阅卷
+							</el-button>
 							<el-button link type="primary" @click="onView(row)" title="查看" v-if="row.isCheck"> 查看 </el-button>
-							<el-button link type="primary" @click="onMarking(row)" title="阅卷" v-else> 阅卷 </el-button>
 						</template>
 					</vxe-column>
 				</vxe-table>