From 62c953ab7291089db96e791027dc88493096646a Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Thu, 21 Aug 2025 19:31:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XskhDisciplineRecordController.java | 23 ++ .../XskhRewardRecordController.java | 13 + .../XskhAssessmentApplicationApprovalVo.java | 24 ++ .../mapper/XskhDisciplineRecordMapper.java | 23 ++ .../xskh/mapper/XskhRewardRecordMapper.java | 14 + .../service/IXskhDisciplineRecordService.java | 21 ++ .../service/IXskhRewardRecordService.java | 16 +- ...essmentApplicationApprovalServiceImpl.java | 10 +- .../impl/XskhDisciplineRecordServiceImpl.java | 34 +++ .../impl/XskhRewardRecordServiceImpl.java | 26 ++ .../mapper/XskhDisciplineRecordMapper.xml | 40 ++- .../mapper/xskh/XskhRewardRecordMapper.xml | 20 ++ .../api/xskh/assessmentApplication/types.ts | 12 + .../disciplineRecord/types.ts | 62 +--- .../xsDisciplineRecord/types.ts | 62 +--- .../AssessmentApplicationForm.vue | 146 +++++++++- .../IndicatorDataDialog.vue | 269 ++++++++++++++++++ 17 files changed, 674 insertions(+), 141 deletions(-) create mode 100644 web/src/views/xskh/assessmentApplication/IndicatorDataDialog.vue diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java index adc60050..58daab72 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java @@ -1,6 +1,7 @@ package org.dromara.xskh.controller; import java.util.List; +import java.util.Map; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; @@ -130,4 +131,26 @@ public class XskhDisciplineRecordController extends BaseController { PageQuery pageQuery) { return xskhDisciplineRecordService.queryClassTeacherPageList(bo, pageQuery); } + + /** + * 获取指标关联的违纪处分类型和奖励类型 + */ + @SaCheckPermission("disciplineRecord:disciplineRecord:query") + @GetMapping("/getIndicatorTypes/{indicatorId}") + public R> getIndicatorTypes(@NotNull(message = "指标ID不能为空") @PathVariable Long indicatorId) { + return R.ok(xskhDisciplineRecordService.getIndicatorTypes(indicatorId)); + } + + /** + * 获取学生在指定时间范围内的违纪处分记录 + */ + @SaCheckPermission("disciplineRecord:disciplineRecord:query") + @GetMapping("/getStudentDisciplineRecords") + public R> getStudentDisciplineRecords( + @RequestParam Long studentId, + @RequestParam String disciplineTypeIds, + @RequestParam String startTime, + @RequestParam String endTime) { + return R.ok(xskhDisciplineRecordService.getStudentDisciplineRecords(studentId, disciplineTypeIds, startTime, endTime)); + } } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java index e8b342f2..c6375b5c 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java @@ -130,4 +130,17 @@ public class XskhRewardRecordController extends BaseController { PageQuery pageQuery) { return xskhRewardRecordService.queryClassTeacherPageList(bo, pageQuery); } + + /** + * 获取学生在指定时间范围内的奖励记录 + */ + @SaCheckPermission("rewardRecord:rewardRecord:query") + @GetMapping("/getStudentRewardRecords") + public R> getStudentRewardRecords( + @RequestParam Long studentId, + @RequestParam String rewardTypeIds, + @RequestParam String startTime, + @RequestParam String endTime) { + return R.ok(xskhRewardRecordService.getStudentRewardRecords(studentId, rewardTypeIds, startTime, endTime)); + } } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhAssessmentApplicationApprovalVo.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhAssessmentApplicationApprovalVo.java index 3401d193..e85b44af 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhAssessmentApplicationApprovalVo.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhAssessmentApplicationApprovalVo.java @@ -39,6 +39,30 @@ public class XskhAssessmentApplicationApprovalVo implements Serializable { */ private String scheduleName; + /** + * 考核开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + + /** + * 考核结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; + + /** + * 数据统计开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dataStartTime; + + /** + * 数据统计结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dataEndTime; + /** * 学生ID */ diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineRecordMapper.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineRecordMapper.java index 78800ae9..fe285aaa 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineRecordMapper.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineRecordMapper.java @@ -9,6 +9,7 @@ import org.dromara.xskh.domain.vo.XskhDisciplineRecordVo; import org.dromara.xskh.domain.vo.XskhStudentOptionVo; import java.util.List; +import java.util.Map; /** * 学生违纪处分记录Mapper接口 @@ -38,4 +39,26 @@ public interface XskhDisciplineRecordMapper extends BaseMapperPlus selectIndicatorTypes(@Param("indicatorId") Long indicatorId); + + /** + * 获取学生在指定时间范围内的违纪处分记录 + * + * @param studentId 学生ID + * @param disciplineTypeIds 违纪处分类型ID列表 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return 违纪处分记录列表 + */ + List selectStudentDisciplineRecords(@Param("studentId") Long studentId, + @Param("disciplineTypeIds") List disciplineTypeIds, + @Param("startTime") String startTime, + @Param("endTime") String endTime); + } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhRewardRecordMapper.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhRewardRecordMapper.java index 73f8822c..7f80b14b 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhRewardRecordMapper.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhRewardRecordMapper.java @@ -37,4 +37,18 @@ public interface XskhRewardRecordMapper extends BaseMapperPlus selectClassTeacherVoPage(@Param("page") Page page, @Param("bo") XskhRewardRecordBo bo, @Param("classTeacherId") Long classTeacherId); + + /** + * 获取学生在指定时间范围内的奖励记录 + * + * @param studentId 学生ID + * @param rewardTypeIds 奖励类型ID列表 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return 奖励记录列表 + */ + List selectStudentRewardRecords(@Param("studentId") Long studentId, + @Param("rewardTypeIds") List rewardTypeIds, + @Param("startTime") String startTime, + @Param("endTime") String endTime); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhDisciplineRecordService.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhDisciplineRecordService.java index d018f636..f6a5ad67 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhDisciplineRecordService.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhDisciplineRecordService.java @@ -8,6 +8,7 @@ import org.dromara.xskh.domain.vo.XskhStudentOptionVo; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 学生违纪处分记录Service接口 @@ -70,4 +71,24 @@ public interface IXskhDisciplineRecordService { * @return 更新结果 */ Boolean updateDisciplineRecordStatus(Long id, String status); + + /** + * 获取指标关联的违纪处分类型和奖励类型 + * + * @param indicatorId 指标ID + * @return 包含disciplineTypeIds和rewardTypeIds的Map + */ + Map getIndicatorTypes(Long indicatorId); + + /** + * 获取学生在指定时间范围内的违纪处分记录 + * + * @param studentId 学生ID + * @param disciplineTypeIds 违纪处分类型ID,逗号分隔 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return 违纪处分记录列表 + */ + List getStudentDisciplineRecords(Long studentId, String disciplineTypeIds, String startTime, + String endTime); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhRewardRecordService.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhRewardRecordService.java index 5749d957..4112809f 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhRewardRecordService.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhRewardRecordService.java @@ -78,7 +78,7 @@ public interface IXskhRewardRecordService { /** * 查询当前登录学生的奖励记录列表 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 分页结果 */ @@ -87,9 +87,21 @@ public interface IXskhRewardRecordService { /** * 查询班主任班级的奖励记录列表(班主任专用) * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 分页结果 */ TableDataInfo queryClassTeacherPageList(XskhRewardRecordBo bo, PageQuery pageQuery); + + /** + * 获取学生在指定时间范围内的奖励记录 + * + * @param studentId 学生ID + * @param rewardTypeIds 奖励类型ID,逗号分隔 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return 奖励记录列表 + */ + List getStudentRewardRecords(Long studentId, String rewardTypeIds, String startTime, + String endTime); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhAssessmentApplicationApprovalServiceImpl.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhAssessmentApplicationApprovalServiceImpl.java index f85bc60b..102685ca 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhAssessmentApplicationApprovalServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhAssessmentApplicationApprovalServiceImpl.java @@ -261,10 +261,12 @@ public class XskhAssessmentApplicationApprovalServiceImpl implements IXskhAssess vo.setScheduleName(schedule.getScheduleName()); // 设置考核计划的状态信息 vo.setStatus(schedule.getStatus()); - // 设置时间信息到备注字段(前端会解析) - String timeInfo = String.format("开始时间:%s,结束时间:%s", - schedule.getStartTime(), schedule.getEndTime()); - vo.setTeacherApprovalRemark(timeInfo); // 临时使用这个字段存储时间信息 + // 设置考核计划的时间信息 + vo.setStartTime(schedule.getStartTime()); + vo.setEndTime(schedule.getEndTime()); + // 设置数据统计时间范围(用于指标数据查询) + vo.setDataStartTime(schedule.getDataStartTime()); + vo.setDataEndTime(schedule.getDataEndTime()); result.add(vo); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineRecordServiceImpl.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineRecordServiceImpl.java index afd9bf33..d7cba428 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineRecordServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineRecordServiceImpl.java @@ -21,6 +21,8 @@ import org.springframework.stereotype.Service; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Arrays; +import java.util.stream.Collectors; /** * 学生违纪处分记录Service业务层处理 @@ -212,4 +214,36 @@ public class XskhDisciplineRecordServiceImpl implements IXskhDisciplineRecordSer record.setStatus(status); return baseMapper.updateById(record) > 0; } + + /** + * 获取指标关联的违纪处分类型和奖励类型 + */ + @Override + public Map getIndicatorTypes(Long indicatorId) { + return baseMapper.selectIndicatorTypes(indicatorId); + } + + /** + * 获取学生在指定时间范围内的违纪处分记录 + */ + @Override + public List getStudentDisciplineRecords(Long studentId, String disciplineTypeIds, + String startTime, String endTime) { + if (StringUtils.isBlank(disciplineTypeIds)) { + return List.of(); + } + + // 将逗号分隔的字符串转换为List + List typeIds = Arrays.stream(disciplineTypeIds.split(",")) + .map(String::trim) + .filter(StringUtils::isNotBlank) + .map(Long::valueOf) + .collect(Collectors.toList()); + + if (typeIds.isEmpty()) { + return List.of(); + } + + return baseMapper.selectStudentDisciplineRecords(studentId, typeIds, startTime, endTime); + } } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhRewardRecordServiceImpl.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhRewardRecordServiceImpl.java index 1ba1c2b1..ecbd0688 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhRewardRecordServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhRewardRecordServiceImpl.java @@ -21,6 +21,8 @@ import org.dromara.xskh.service.IXskhRewardRecordService; import java.util.Collection; import java.util.List; +import java.util.Arrays; +import java.util.stream.Collectors; import java.util.Map; /** @@ -223,4 +225,28 @@ public class XskhRewardRecordServiceImpl implements IXskhRewardRecordService { Page result = baseMapper.selectClassTeacherVoPage(pageQuery.build(), bo, currentUserId); return TableDataInfo.build(result); } + + /** + * 获取学生在指定时间范围内的奖励记录 + */ + @Override + public List getStudentRewardRecords(Long studentId, String rewardTypeIds, String startTime, + String endTime) { + if (StringUtils.isBlank(rewardTypeIds)) { + return List.of(); + } + + // 将逗号分隔的字符串转换为List + List typeIds = Arrays.stream(rewardTypeIds.split(",")) + .map(String::trim) + .filter(StringUtils::isNotBlank) + .map(Long::valueOf) + .collect(Collectors.toList()); + + if (typeIds.isEmpty()) { + return List.of(); + } + + return baseMapper.selectStudentRewardRecords(studentId, typeIds, startTime, endTime); + } } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/XskhDisciplineRecordMapper.xml b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/XskhDisciplineRecordMapper.xml index 2560797a..0994c996 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/XskhDisciplineRecordMapper.xml +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/XskhDisciplineRecordMapper.xml @@ -22,10 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - @@ -49,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, student_id, student_no, student_name, college_id, college_name, major_id, major_name, class_id, class_name, discipline_type_id, discipline_type_name, discipline_date, discipline_reason, discipline_content, score_deduction, status, approval_status, approval_by, approval_time, approval_remark, attachment_oss_ids, create_by, create_time, create_dept, update_by, update_time, deleted, tenant_id from xskh_discipline_record + select id, student_id, student_no, student_name, college_id, college_name, major_id, major_name, class_id, class_name, discipline_type_id, discipline_type_name, discipline_date, discipline_reason, discipline_content, score_deduction, status, attachment_oss_ids, create_by, create_time, create_dept, update_by, update_time, deleted, tenant_id from xskh_discipline_record + + + + + + diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/xskh/XskhRewardRecordMapper.xml b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/xskh/XskhRewardRecordMapper.xml index 3c685661..2b4783b5 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/xskh/XskhRewardRecordMapper.xml +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/xskh/XskhRewardRecordMapper.xml @@ -131,4 +131,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by rr.create_time desc + + + diff --git a/web/src/api/xskh/assessmentApplication/types.ts b/web/src/api/xskh/assessmentApplication/types.ts index a29b4d27..16f1e987 100644 --- a/web/src/api/xskh/assessmentApplication/types.ts +++ b/web/src/api/xskh/assessmentApplication/types.ts @@ -84,6 +84,14 @@ export interface XskhAssessmentApplicationApprovalVo extends BaseEntity { scheduleId?: string | number; /** 考核计划名称 */ scheduleName?: string; + /** 考核开始时间 */ + startTime?: string; + /** 考核结束时间 */ + endTime?: string; + /** 数据统计开始时间 */ + dataStartTime?: string; + /** 数据统计结束时间 */ + dataEndTime?: string; /** 自评得分 */ selfScore?: number; /** 自评备注 */ @@ -400,6 +408,10 @@ export interface AssessmentScheduleOption { startTime: string; /** 结束时间 */ endTime: string; + /** 数据统计开始时间 */ + dataStartTime: string; + /** 数据统计结束时间 */ + dataEndTime: string; /** 状态 */ status: string; /** 状态名称 */ diff --git a/web/src/api/xskh/disciplineRecord/disciplineRecord/types.ts b/web/src/api/xskh/disciplineRecord/disciplineRecord/types.ts index 5b7d500d..80f040ab 100644 --- a/web/src/api/xskh/disciplineRecord/disciplineRecord/types.ts +++ b/web/src/api/xskh/disciplineRecord/disciplineRecord/types.ts @@ -86,26 +86,6 @@ export interface DisciplineRecordVO { */ status: string; - /** - * 审批状态(1-已审批 2-审批中) - */ - approvalStatus: string; - - /** - * 审批人ID - */ - approvalBy: string | number; - - /** - * 审批时间 - */ - approvalTime: string; - - /** - * 审批备注 - */ - approvalRemark: string; - /** * 附件OSS ID列表,逗号分隔 */ @@ -218,26 +198,6 @@ export interface DisciplineRecordForm { */ status?: string; - /** - * 审批状态(1-已审批 2-审批中) - */ - approvalStatus?: string; - - /** - * 审批人ID - */ - approvalBy?: string | number; - - /** - * 审批时间 - */ - approvalTime?: string; - - /** - * 审批备注 - */ - approvalRemark?: string; - /** * 附件OSS ID列表,逗号分隔 */ @@ -325,30 +285,10 @@ export interface DisciplineRecordQuery extends PageQuery { */ status?: string; - /** - * 审批状态(1-已审批 2-审批中) - */ - approvalStatus?: string; - - /** - * 审批人ID - */ - approvalBy?: string | number; - - /** - * 审批时间 - */ - approvalTime?: string; - - /** - * 审批备注 - */ - approvalRemark?: string; - /** * 日期范围参数 */ - params?: any; + dateRange?: string[]; } /** diff --git a/web/src/api/xskh/xsDisciplineRecord/xsDisciplineRecord/types.ts b/web/src/api/xskh/xsDisciplineRecord/xsDisciplineRecord/types.ts index 5b7d500d..80f040ab 100644 --- a/web/src/api/xskh/xsDisciplineRecord/xsDisciplineRecord/types.ts +++ b/web/src/api/xskh/xsDisciplineRecord/xsDisciplineRecord/types.ts @@ -86,26 +86,6 @@ export interface DisciplineRecordVO { */ status: string; - /** - * 审批状态(1-已审批 2-审批中) - */ - approvalStatus: string; - - /** - * 审批人ID - */ - approvalBy: string | number; - - /** - * 审批时间 - */ - approvalTime: string; - - /** - * 审批备注 - */ - approvalRemark: string; - /** * 附件OSS ID列表,逗号分隔 */ @@ -218,26 +198,6 @@ export interface DisciplineRecordForm { */ status?: string; - /** - * 审批状态(1-已审批 2-审批中) - */ - approvalStatus?: string; - - /** - * 审批人ID - */ - approvalBy?: string | number; - - /** - * 审批时间 - */ - approvalTime?: string; - - /** - * 审批备注 - */ - approvalRemark?: string; - /** * 附件OSS ID列表,逗号分隔 */ @@ -325,30 +285,10 @@ export interface DisciplineRecordQuery extends PageQuery { */ status?: string; - /** - * 审批状态(1-已审批 2-审批中) - */ - approvalStatus?: string; - - /** - * 审批人ID - */ - approvalBy?: string | number; - - /** - * 审批时间 - */ - approvalTime?: string; - - /** - * 审批备注 - */ - approvalRemark?: string; - /** * 日期范围参数 */ - params?: any; + dateRange?: string[]; } /** diff --git a/web/src/views/xskh/assessmentApplication/AssessmentApplicationForm.vue b/web/src/views/xskh/assessmentApplication/AssessmentApplicationForm.vue index 8a0a2140..d8c6f087 100644 --- a/web/src/views/xskh/assessmentApplication/AssessmentApplicationForm.vue +++ b/web/src/views/xskh/assessmentApplication/AssessmentApplicationForm.vue @@ -65,11 +65,26 @@ - + + + @@ -351,17 +366,29 @@ + + + + +