diff --git a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html index bbaa97f..4cb9821 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html @@ -114,16 +114,34 @@ } function reback(){ - let id = parent.parent.a_upload_id; - $.ajax({ - type: "get", - url: ctx + "base/affairs/reback?id="+id, - data: { - }, - success: function(data) { - parent.window.location.reload(); - } + + layer.open({ + title:'驳回', + type: 1, + area:['40%','40%'], + content: '
' + + '' + + '
' //这里content是一个普通的String }); + + } + + function rebackSubmit() { + let _remark = $(".remark_val").val(); + if(_remark === ''){ + layer.msg('请输入驳回意见!', {icon: 2}); + }else{ + let id = parent.parent.a_upload_id; + $.ajax({ + type: "get", + url: ctx + "base/affairs/reback?id="+id+'&remark='+_remark, + data: { + }, + success: function(data) { + parent.window.location.reload(); + } + }); + } } $("#datetimepicker-demo-1").datetimepicker(); diff --git a/cyx-admin/src/main/resources/templates/base/affairs/viewFiles.html b/cyx-admin/src/main/resources/templates/base/affairs/viewFiles.html index eaeb1b7..e0ff032 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/viewFiles.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/viewFiles.html @@ -130,7 +130,11 @@ }else{ $(".err_tips").text(""); _files.forEach(item => { - uploadFileFn(item) + if(item.size > 52428800){ + layer.msg('【'+item.name+'】上传失败!文件大小最大为50MB!', {icon: 2}); + }else{ + uploadFileFn(item) + } }) } } diff --git a/cyx-admin/src/main/resources/templates/base/affairs/warn.html b/cyx-admin/src/main/resources/templates/base/affairs/warn.html index 46c0555..c0ab961 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/warn.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/warn.html @@ -187,7 +187,10 @@ }, { field: 'reviewer', - title: '审批人' + title: '审批人', + formatter: function(value, row, index) { + return $.table.tooltip(value); + } }, { field: 'status', @@ -206,6 +209,10 @@ return actions.join(''); } }, + { + field: 'remark', + title: '备注' + }, { title: '操作', align: 'center', @@ -239,7 +246,7 @@ let detailed = $(this)[0].dataset.detailed; layer.open({ title:'审批', - area:['40%','50%'], + area:['80%','80%'], type:2, content:'/base/affairs/reviewed?id='+_id, success(res,index){