提示性语句

dev
王家东 12 months ago
parent 453d6e123d
commit 6626e45334
  1. 6
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java
  2. 3
      jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue

@ -203,6 +203,12 @@ public class AnnualCompPointServiceImpl extends ServiceImpl<AnnualCompPointMappe
if (scoreStartTime >= scoreEndTime){ if (scoreStartTime >= scoreEndTime){
return Result.error("评分开始时间不能在评分结束时间之后"); return Result.error("评分开始时间不能在评分结束时间之后");
} }
/*----------------王家东添加-------------------------------开始-------------*/
if (annualCompPoint.getRequireTopic().equals("N")){
return Result.error("如果需要评分,则需要添加题目");
}
/*----------------王家东添加-------------------------------结束-------------*/
if (requireUploadWorks.equals("Y")){ if (requireUploadWorks.equals("Y")){
if (scoreStartTime<updateEndTime){ if (scoreStartTime<updateEndTime){
return Result.error("评分开始时间应在上传作品结束时间之后"); return Result.error("评分开始时间应在上传作品结束时间之后");

@ -186,9 +186,7 @@
<j-switch v-model:value="formData.requireScore" :disabled="disabled"></j-switch> <j-switch v-model:value="formData.requireScore" :disabled="disabled"></j-switch>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="9" v-if="formData.requireScore==='Y'"> <a-col :span="9" v-if="formData.requireScore==='Y'">
<a-form-item label="开始时间" v-bind="validateInfos.scoreStartTime" :labelCol="labelCol5" <a-form-item label="开始时间" v-bind="validateInfos.scoreStartTime" :labelCol="labelCol5"
:wrapperCol="wrapperCol5"> :wrapperCol="wrapperCol5">
<a-date-picker placeholder="请选择评分开始时间" v-model:value="formData.scoreStartTime" showTime <a-date-picker placeholder="请选择评分开始时间" v-model:value="formData.scoreStartTime" showTime
@ -205,6 +203,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<p style="color: red">如果需要评分则需要添加开启选题</p>
<a-row v-if="formData.annualCompState==='4'"> <a-row v-if="formData.annualCompState==='4'">
<a-col :span="24"> <a-col :span="24">
<a-form-item label="驳回原因" v-bind="validateInfos.introduce" :labelCol="labelCol1" <a-form-item label="驳回原因" v-bind="validateInfos.introduce" :labelCol="labelCol1"

Loading…
Cancel
Save