diff --git a/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java b/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java index bd5df29..3519277 100644 --- a/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java +++ b/src/main/java/cn/com/tenlion/controller/api/apply/ApplyController.java @@ -41,6 +41,18 @@ public class ApplyController extends DefaultBaseController { + @ApiOperation(value = "自定义新增报名信息", notes = "自定义新增报名信息") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save-relation") + @CheckRequestBodyAnnotation + public SuccessResult saveRelation(@RequestBody ApplyVO applyVO) { + applyService.saveRelationReturnId(applyVO); + return new SuccessResult(); + } + + + + @ApiOperation(value = "报名信息撤回", notes = "报名信息撤回接口") @ApiImplicitParams({ @ApiImplicitParam(name = "applyId", value = "报名信息ID", paramType = "path"), diff --git a/src/main/resources/static/route/apply/save.html b/src/main/resources/static/route/apply/save.html index d38b3d7..9c2e08f 100644 --- a/src/main/resources/static/route/apply/save.html +++ b/src/main/resources/static/route/apply/save.html @@ -22,126 +22,168 @@
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
-
-
- -
- -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
-
-
- -
- -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
+
- + +
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
- +
- +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
@@ -171,6 +213,9 @@ var wangEditor = window.wangEditor; var wangEditorObj = {}; var viewerObj = {}; + var applyWorkTypeId = top.restAjax.params(window.location.href).applyWorkTypeId; + var applyInstitutionId = top.restAjax.params(window.location.href).applyInstitutionId; + function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); @@ -226,9 +271,9 @@ } } - // 初始化报名人性别 1男 2女【数据字典】下拉选择 + // 初始化报名人性别 function initApplySexSelect() { - top.restAjax.get(top.restAjax.path('api/url/selectUrl', []), {}, null, function(code, data, args) { + top.restAjax.get(top.restAjax.path('api/data/listbyparentid/4ef46940-76ab-4758-b5f0-0cbc93ffc660', []), {}, null, function(code, data, args) { laytpl(document.getElementById('applySexSelectTemplate').innerHTML).render(data, function(html) { document.getElementById('applySexSelectTemplateBox').innerHTML = html; }); @@ -238,6 +283,45 @@ }); } + // 初始化报名人证件类型 + function initApplyCardTypeSelect() { + top.restAjax.get(top.restAjax.path('api/data/listbyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) { + laytpl(document.getElementById('applyCardTypeSelectTemplate').innerHTML).render(data, function(html) { + document.getElementById('applyCardTypeSelectTemplateBox').innerHTML = html; + }); + form.render('select', 'applyCardTypeSelectTemplateBox'); + }, function(code, data) { + top.dialog.msg(data.msg); + }); + } + + // 初始化报名人文化程度 + function initApplyCultureLevelSelect() { + top.restAjax.get(top.restAjax.path('api/data/listbyparentid/d6b9f026-6ea9-456a-b48b-0c18d502523b', []), {}, null, function(code, data, args) { + laytpl(document.getElementById('applyCultureLevelSelectTemplate').innerHTML).render(data, function(html) { + document.getElementById('applyCultureLevelSelectTemplateBox').innerHTML = html; + }); + form.render('select', 'applyCultureLevelSelectTemplateBox'); + }, function(code, data) { + top.dialog.msg(data.msg); + }); + } + + + // 初始化报名人身体状态 + function initApplyPhysicalStateSelect() { + top.restAjax.get(top.restAjax.path('api/data/listbyparentid/e4680c90-7a1f-4f09-96c8-0c583d8031ba', []), {}, null, function(code, data, args) { + laytpl(document.getElementById('applyPhysicalStateSelectTemplate').innerHTML).render(data, function(html) { + document.getElementById('applyPhysicalStateSelectTemplateBox').innerHTML = html; + }); + form.render('select', 'applyPhysicalStateSelectTemplateBox'); + }, function(code, data) { + top.dialog.msg(data.msg); + }); + } + + + // 初始化报名人出生日期日期 function initApplyDataBirthDate() { laydate.render({ @@ -248,59 +332,88 @@ }); } - // 初始化报名人证件类型【数据字典】下拉选择 - function initApplyCardTypeSelect() { - top.restAjax.get(top.restAjax.path('api/url/selectUrl', []), {}, null, function(code, data, args) { - laytpl(document.getElementById('applyCardTypeSelectTemplate').innerHTML).render(data, function(html) { - document.getElementById('applyCardTypeSelectTemplateBox').innerHTML = html; + + // 初始化头像图片上传 + function initApplyUserCardPhotoUploadFile() { + var files = $('#applyUserCardPhoto').val(); + initFileList('applyUserCardPhoto', files, function(fileName) { + var viewer = new Viewer(document.getElementById(fileName +'FileBox'), {navbar: false}); + viewerObj[fileName] = viewer; + }); + + form.on('button(applyUserCardPhotoUploadFile)', function(obj) { + var name = this.dataset.name; + var explain = this.dataset.explain; + top.dialog.file({ + type: 'image', + title: '上传'+ explain, + width: '400px', + height: '420px', + maxFileCount: '1', + onClose: function() { + var uploadFileArray = top.dialog.dialogData.uploadFileArray; + if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) { + var files = $('#'+ name).val(); + for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) { + if(files.length > 0) { + files += ','; + } + files += file.data; + } + initFileList(name, files, function(fileName) { + viewerObj[fileName].update(); + }); + } + } + }); + }); + + form.on('button(applyUserCardPhotoRemoveFile)', function(obj) { + var name = this.dataset.name; + var id = this.dataset.id; + var files = $('#'+ name).val().replace(id, ''); + files = files.replace(/\,+/g, ','); + if(files.charAt(0) == ',') { + files = files.substring(1); + } + if(files.charAt(files.length - 1) == ',') { + files = files.substring(0, files.length - 1); + } + initFileList(name, files, function(fileName) { + viewerObj[fileName].update(); }); - form.render('select', 'applyCardTypeSelectTemplateBox'); - }, function(code, data) { - top.dialog.msg(data.msg); }); } - // 初始化报名人文化程度【数据字典】下拉选择 - function initApplyCultureLevelSelect() { - top.restAjax.get(top.restAjax.path('api/url/selectUrl', []), {}, null, function(code, data, args) { - laytpl(document.getElementById('applyCultureLevelSelectTemplate').innerHTML).render(data, function(html) { - document.getElementById('applyCultureLevelSelectTemplateBox').innerHTML = html; - }); - form.render('select', 'applyCultureLevelSelectTemplateBox'); - }, function(code, data) { - top.dialog.msg(data.msg); - }); - } - // 初始化报名人身体状态【数据字典】下拉选择 - function initApplyPhysicalStateSelect() { - top.restAjax.get(top.restAjax.path('api/url/selectUrl', []), {}, null, function(code, data, args) { - laytpl(document.getElementById('applyPhysicalStateSelectTemplate').innerHTML).render(data, function(html) { - document.getElementById('applyPhysicalStateSelectTemplateBox').innerHTML = html; - }); - form.render('select', 'applyPhysicalStateSelectTemplateBox'); - }, function(code, data) { - top.dialog.msg(data.msg); - }); - } + + + // 初始化内容 function initData() { + if(applyWorkTypeId == '' || applyInstitutionId==''){ + top.dialog.msg('参数错误'); + return; + } initApplySexSelect(); initApplyDataBirthDate(); initApplyCardTypeSelect(); initApplyCultureLevelSelect(); initApplyPhysicalStateSelect(); + initApplyUserCardPhotoUploadFile(); } initData(); // 提交表单 form.on('submit(submitForm)', function(formData) { + formData.field.applyWorkTypeId = applyWorkTypeId; + formData.field.applyInstitutionId = applyInstitutionId; top.dialog.confirm(top.dataMessage.commit, function(index) { top.dialog.close(index); var loadLayerIndex; - top.restAjax.post(top.restAjax.path('api/apply/save', []), formData.field, null, function(code, data) { + top.restAjax.post(top.restAjax.path('api/apply/save-relation', []), formData.field, null, function(code, data) { var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no],