luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:分页问题修改

Browse Source
pg_adapter
wangxy 9 months ago
parent 0a2c5b49a6
commit 5ecc0db092
3 changed files with 106 additions and 32 deletions
Show Stats Download Patch File Download Diff File

84
ruoyi-admin/src/main/resources/templates/system/user/add.html
Unescape View File

@ -4,6 +4,7 @@
<th:block th:include="include :: header('新增用户')" /> <th:block th:include="include :: header('新增用户')" />
<th:block th:include="include :: select2-css" /> <th:block th:include="include :: select2-css" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
<th:block th:include="include :: jasny-bootstrap-css" />
</head> </head>
<body> <body>
<div class="main-content"> <div class="main-content">
@ -214,17 +215,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="font-noraml">保密协议签订书</label>
<div class="file-loading">
<input id="singleFile" name="file" type="file">
<input id="cee" name="cee" type="hidden" value="">
</div>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
@ -243,6 +233,27 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="form-group">
<label class="col-sm-2 control-label">保密协议签订书：</label>
<br/>
<div class="fileinput fileinput-new" data-provides="fileinput">
<span class="btn btn-white btn-file">
<span class="fileinput-new">选择文件</span>
<span class="fileinput-exists">更改</span>
<input type="file" id="fileUrlId" name="...">
<input type="hidden" id="fileUrl" name="confAgreement">
<input type="hidden" id="fileName" name="confName">
</span>
<span class="fileinput-filename"></span>
<a href="#" class="close fileinput-exists" data-dismiss="fileinput" style="float: none">&times;</a>
</div>
</div>
</div>
<h4 class="form-header h4">其他信息</h4> <h4 class="form-header h4">其他信息</h4>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
@ -266,8 +277,7 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js" /> <th:block th:include="include :: select2-js" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: bootstrap-fileinput-css" /> <th:block th:include="include :: jasny-bootstrap-js" />
<th:block th:include="include :: bootstrap-fileinput-js" />
<script> <script>
var prefix = ctx + "system/user"; var prefix = ctx + "system/user";
@ -381,25 +391,39 @@
allowClear: true allowClear: true
}); });
}) })
</script>
<script th:inline="javascript">
$(document).ready(function () { //文件上传
$("#singleFile").fileinput({ $('#fileUrlId').on('change.bs.fileinput ', function (e) {
uploadUrl: ctx + 'common/upload', debugger
maxFileCount: 1, // 处理自己的业务
autoReplace: true var file = e.target.files[0];
}).on('fileuploaded', function (event, data, previewId, index) { var data = new FormData();
var rsp = data.response; data.append("file", file);
$("#cee").val(rsp.url); $.ajax({
log.info("return url：" + rsp.url) type: "POST",
log.info("reutrn fileName：" + rsp.fileName) url: ctx + "common/upload",
log.info("reutrn newFileName：" + rsp.newFileName) data: data,
log.info("return originalFilename：" + rsp.originalFilename) cache: false,
}).on('fileremoved', function (event, id, index) { contentType: false,
$("input[name='" + event.currentTarget.id + "']").val('') processData: false,
}) dataType: 'json',
success: function(result) {
if (result.code == web_status.SUCCESS) {
$("#fileUrl").val(result.url);
$("#fileName").val(result.originalFilename);
} else {
$("#fileUrl").val("");
$("#fileName").val("");
}
},
error: function(error) {
$.modal.alertWarning("文件上传失败。");
}
});
}); });
</script> </script>
</body> </body>
</html> </html>

52
ruoyi-admin/src/main/resources/templates/system/user/edit.html
Unescape View File

@ -4,6 +4,7 @@
<th:block th:include="include :: header('修改用户')" /> <th:block th:include="include :: header('修改用户')" />
<th:block th:include="include :: select2-css" /> <th:block th:include="include :: select2-css" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
<th:block th:include="include :: jasny-bootstrap-css" />
</head> </head>
<body> <body>
<div class="main-content"> <div class="main-content">
@ -200,6 +201,25 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="form-group">
<label class="col-sm-2 control-label">文件上传：</label>
<br/>
<div class="fileinput fileinput-new" data-provides="fileinput">
<span class="btn btn-white btn-file">
<span class="fileinput-new">选择文件</span>
<span class="fileinput-exists">更改</span>
<input type="file" id="fileUrlId" name="...">
<input type="hidden" id="fileUrl" name="confAgreement" th:field="*{confAgreement}">
<input type="hidden" id="fileName" name="confName" th:field="*{confName}">
</span>
<span class="fileinput-filename">[[*{confName}]]</span>
<a href="#" class="close fileinput-exists" data-dismiss="fileinput" style="float: none">&times;</a>
</div>
</div>
</div>
<h4 class="form-header h4">其他信息</h4> <h4 class="form-header h4">其他信息</h4>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
@ -222,6 +242,7 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js" /> <th:block th:include="include :: select2-js" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: jasny-bootstrap-js" />
<script type="text/javascript"> <script type="text/javascript">
var prefix = ctx + "system/user"; var prefix = ctx + "system/user";
@ -316,6 +337,37 @@
allowClear: true allowClear: true
}); });
}) })
//文件上传
$('#fileUrlId').on('change.bs.fileinput ', function (e) {
// 处理自己的业务
var file = e.target.files[0];
var data = new FormData();
data.append("file", file);
$.ajax({
type: "POST",
url: ctx + "common/upload",
data: data,
cache: false,
contentType: false,
processData: false,
dataType: 'json',
success: function(result) {
if (result.code == web_status.SUCCESS) {
$("#fileUrl").val(result.url);
$("#fileName").val(result.originalFilename);
} else {
$("#fileUrl").val("");
$("#fileName").val("");
}
},
error: function(error) {
$.modal.alertWarning("文件上传失败。");
}
});
});
</script> </script>
</body> </body>
</html> </html>

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
Unescape View File

@ -223,11 +223,9 @@ public class SysUser extends BaseEntity
private String havePassport; private String havePassport;
/** 保密协议书 */ /** 保密协议书 */
@Excel(name = "保密协议书")
private String confAgreement; private String confAgreement;
/** 保密协议书文件名 */ /** 保密协议书文件名 */
@Excel(name = "保密协议书文件名")
private String confName; private String confName;
public String getConfName() { public String getConfName() {

Write Preview
Loading…
Cancel
Save