bug修改。
This commit is contained in:
Renpc-kilig
parent
c0563114be
commit
253f8fb114
@ -241,17 +241,11 @@ public class ExamApplyServiceImpl extends DefaultBaseService implements IExamApp
|
||||
examApplyDTO.setClassPlanDTO(classPlanDTO);
|
||||
if(null != classPlanDTO) {
|
||||
examApplyDTO.setExamName(classPlanDTO.getPlanName());
|
||||
if(1 == examApplyDTO.getExamType()) {
|
||||
examApplyDTO.setStartTime(examApplyDTO.getTheoryExamStartTime());
|
||||
examApplyDTO.setEndTime(examApplyDTO.getTheoryExamEndTime());
|
||||
}
|
||||
if(2 == examApplyDTO.getExamType()) {
|
||||
examApplyDTO.setStartTime(examApplyDTO.getPracticeExamStartTime());
|
||||
examApplyDTO.setEndTime(examApplyDTO.getPracticeExamEndTime());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
@ -86,113 +86,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<blockquote class="site-text layui-elem-quote">
|
||||
应急局填写信息
|
||||
</blockquote>
|
||||
<form class="layui-form layui-form-pane" lay-filter="dataForm">
|
||||
<!-- 考试申请ID -->
|
||||
<input type="hidden" id="examId" name="examId" value="123456">
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label" style="width: 130px;">考试申请编号</label>
|
||||
<div class="layui-input-block" style="margin-left: 130px;">
|
||||
<input type="text" id="examApplyNum" name="examApplyNum" class="layui-input" value="" placeholder="考试申请编号" maxlength="255" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">发证机关</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="text" id="certificateOffice" name="certificateOffice" class="layui-input" value="" lay-verify="required" placeholder="请输入发证机关" maxlength="255" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item" id="theoryAddressDiv">
|
||||
<label class="layui-form-label" style="width: 130px;">理论考试地点</label>
|
||||
<div class="layui-input-block layui-form" id="theoryExamAddressIdSelectTemplateBox" lay-filter="theoryExamAddressIdSelectTemplateBox" style="margin-left: 130px;"></div>
|
||||
<script id="theoryExamAddressIdSelectTemplate" type="text/html">
|
||||
<select id="theoryExamAddressId" name="theoryExamAddressId" lay-search>
|
||||
<option value="">请选择理论考试地点</option>
|
||||
{{# for(var i = 0, item; item = d[i++];) { }}
|
||||
<option value="{{item.institutionId}}">{{item.institutionName}}</option>
|
||||
{{# } }}
|
||||
</select>
|
||||
</script>
|
||||
</div>
|
||||
<div class="layui-form-item layui-row" id="theoryTimeDiv">
|
||||
<div class="layui-col-lg6">
|
||||
<label class="layui-form-label" style="width: 144px;">理论考试开始时间</label>
|
||||
<div class="layui-input-block" style="margin-left: 144px;">
|
||||
<input type="text" id="theoryExamStartTime" name="theoryExamStartTime" class="layui-input" value="" placeholder="请选择理论考试开始时间" readonly style="cursor: pointer;" lay-verify="required" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-col-lg6">
|
||||
<label class="layui-form-label" style="width: 144px;">理论考试结束时间</label>
|
||||
<div class="layui-input-block" style="margin-left: 144px;">
|
||||
<input type="text" id="theoryExamEndTime" name="theoryExamEndTime" class="layui-input" value="" placeholder="请选择理论考试结束时间" readonly style="cursor: pointer;" lay-verify="required" readonly>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item" id="practiceAddressDiv">
|
||||
<label class="layui-form-label" style="width: 130px;">实操考试地点</label>
|
||||
<div class="layui-input-block layui-form" id="practiceExamAddressIdSelectTemplateBox" lay-filter="practiceExamAddressIdSelectTemplateBox" style="margin-left: 130px;"></div>
|
||||
<script id="practiceExamAddressIdSelectTemplate" type="text/html">
|
||||
<select id="practiceExamAddressId" name="practiceExamAddressId" lay-search>
|
||||
<option value="">请选择实操考试地点</option>
|
||||
{{# for(var i = 0, item; item = d[i++];) { }}
|
||||
<option value="{{item.institutionId}}">{{item.institutionName}}</option>
|
||||
{{# } }}
|
||||
</select>
|
||||
</script>
|
||||
</div>
|
||||
<div class="layui-form-item layui-row" id="practiceTimeDiv">
|
||||
<div class="layui-col-lg6">
|
||||
<label class="layui-form-label" style="width: 144px;">实操考试开始时间</label>
|
||||
<div class="layui-input-block" style="margin-left: 144px;">
|
||||
<input type="text" id="practiceExamStartTime" name="practiceExamStartTime" class="layui-input" value="" placeholder="请选择实操开始时间" readonly style="cursor: pointer;" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-col-lg6">
|
||||
<label class="layui-form-label" style="width: 144px;">实操考试结束时间</label>
|
||||
<div class="layui-input-block" style="margin-left: 144px;">
|
||||
<input type="text" id="practiceExamEndTime" name="practiceExamEndTime" class="layui-input" value="" placeholder="请选择实操考试结束时间" readonly style="cursor: pointer;" readonly>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-form-text">
|
||||
<label class="layui-form-label">缴费凭证</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="hidden" id="paymentVoucher" name="paymentVoucher">
|
||||
<div class="layui-btn-container" id="paymentVoucherFileBox" style="border: 1px solid #e6e6e6;"></div>
|
||||
<script id="paymentVoucherFileDownload" type="text/html">
|
||||
{{# var fileName = 'paymentVoucher'; }}
|
||||
{{# if(d[fileName].length > 0) { }}
|
||||
{{# var files = d[fileName];}}
|
||||
{{# for(var i = 0, item = files[i]; item = files[i++];) { }}
|
||||
<div class="upload-image-box">
|
||||
<span class="upload-image-span">
|
||||
<img src="route/file/download/false/{{item.fileId}}" align="加载失败">
|
||||
</span>
|
||||
<a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="paymentVoucherRemoveFile">
|
||||
<i class="fa fa-trash-o"></i>
|
||||
</a>
|
||||
</div>
|
||||
{{# } }}
|
||||
{{# } }}
|
||||
{{# if(d[fileName].length < 9) { }}
|
||||
<div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">
|
||||
<a href="javascript:void(0);" lay-form-button data-explain="缴费凭证" data-name="paymentVoucher" lay-filter="paymentVoucherUploadFile">
|
||||
<i class="fa fa-plus-square-o" style="font-size: 70px;"></i>
|
||||
</a>
|
||||
</div>
|
||||
{{# } }}
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label" style="width: 130px;">缴费凭证编号</label>
|
||||
<div class="layui-input-block" style="margin-left: 130px;">
|
||||
<input type="text" id="paymentVoucherNum" name="paymentVoucherNum" class="layui-input" value="" placeholder="请输入缴费凭证编号" maxlength="255" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-layout-admin">
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-footer" style="left: 0;">
|
||||
|
||||
@ -17,9 +17,9 @@
|
||||
<div class="layui-card">
|
||||
<div class="layui-card-body">
|
||||
<div class="test-table-reload-btn" style="margin-bottom: 10px;">
|
||||
<div class="layui-inline">
|
||||
<!--<div class="layui-inline">
|
||||
<input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
|
||||
</div>
|
||||
</div>-->
|
||||
<div class="layui-inline">
|
||||
<input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
|
||||
</div>
|
||||
@ -34,9 +34,9 @@
|
||||
<!-- 表头按钮组 -->
|
||||
<script type="text/html" id="headerToolBar">
|
||||
<div class="layui-btn-group">
|
||||
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
|
||||
<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
|
||||
<i class="fa fa-lg fa-edit"></i> 考试申请审核
|
||||
</button>
|
||||
</button>-->
|
||||
<button type="button" class="layui-btn layui-btn-sm" lay-event="checkMore">
|
||||
<i class="fa fa-lg fa-edit"></i> 考试申请批量审核
|
||||
</button>
|
||||
@ -461,7 +461,10 @@
|
||||
var ids = '';
|
||||
var planIds = '';
|
||||
for(var i = 0, item; item = checkDatas[i++];) {
|
||||
if(item.checkStatus === 0) {
|
||||
if(item.checkStatus === 1 || item.checkStatus === 2) {
|
||||
top.dialog.msg('当前选择存在已经审核完成数据，请重新选择');
|
||||
return false;
|
||||
}
|
||||
if (i > 1) {
|
||||
ids += '_';
|
||||
planIds += ',';
|
||||
@ -469,7 +472,6 @@
|
||||
ids += item['examApplyId'];
|
||||
planIds += item['examId'];
|
||||
}
|
||||
}
|
||||
if(ids.length <= 0) {
|
||||
top.dialog.msg('当前选择数据已经审核完成，请重新选择');
|
||||
reloadTable();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user