页面记忆

master
OathK1per 2022-09-14 12:49:20 +08:00
parent 95126c4483
commit ab5bce4ea1
3 changed files with 24 additions and 2 deletions

View File

@ -100,6 +100,7 @@ public class ProjectController extends BaseController {
Map<String, Object> model) {
//当前登录人的角色类型
model.put("keywords", keywords);
model.put("pageNumber", pageNumber);
Admin admin = InterfaceUtil.getAdmin();
model.put("adminId", admin.getId());
model.put("admin", admin);
@ -620,6 +621,7 @@ public class ProjectController extends BaseController {
*/
@RequestMapping("/approve")
public String approve(@RequestParam(value = KEYWORDS, required = false) String keywords,
@RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber,
@RequestParam("id") int id, @RequestParam("type") int type,@RequestParam String listFrom,
Map<String, Object> model) {
Project project = projectService.getProject(id);
@ -701,6 +703,7 @@ public class ProjectController extends BaseController {
}
//结算信息
model.put("keywords",keywords);
model.put("pageNumber",pageNumber);
ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords,model);
String time;
if (!searchInfo.containsKey("time")) {

View File

@ -112,6 +112,7 @@
<form method="post" class="am-form" id="pmsForm" action="${base}/project/budgetEditSave">
<input type="hidden" id="keywords" name="keywords" value='${keywords!""}'/>
<input type="hidden" id="pageNumber" name="pageNumber" value='${pageNumber!}'/>
<!--选项卡tabsbegin-->
<div class="am-tabs am-margin" data-am-tabs>
<ul class="am-tabs-nav am-nav am-nav-tabs">
@ -2836,7 +2837,7 @@
<!--选项卡tabsend-->
<div class="am-margin">
<button type="button" class="am-btn am-btn-warning am-btn-xs" onclick="javascript:history.go(-1);">
<button type="button" class="am-btn am-btn-warning am-btn-xs" onclick="back()">
返回上一级
</button>
<#if adminId==project.approveId>
@ -2865,6 +2866,14 @@
<script>
var back = function () {
var pageNumber = $("#pageNumber").val();
var keywords = $("#keywords").val();
keywords = keywords.replace(/\{/g, '%7b').replace(/\}/g, '%7d');
console.log("keywords: " + keywords);
location.href = '${base}/project/list?pageNumber=' + pageNumber + '&keywords=' + keywords;
};
$(function () {
$("#subTab").find('a').on('opened.tabs.amui', function(e) {
console.log(e)

View File

@ -21,6 +21,7 @@
<div class="am-u-sm-12">
<form class="am-form" id="listForm" action="${base}/project/list" method="POST">
<input type="hidden" id="keywords" name="keywords" value='${keywords!""}'/>
<input type="hidden" id="pageNumber" name="pageNumber" value='${pageNumber!}'/>
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody>
<tr>
@ -365,7 +366,7 @@
<input type="checkbox" name="ids" value="${list.id!}" /></td>
<td>${list.tempId!}</td>
<td class="huanhang">${list.projectNo!}</td>
<td class="huanhang"><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'">${list.name!}</a></td>
<td class="huanhang"><a style="cursor: pointer;text-decoration:none" onclick="approve(${list.id})">${list.name!}</a></td>
<td>${list.typeDesc!}</td>
<td>${list.underwrittenModeStr!}</td>
<td>${Utils.format(list.advanceInterestAmount, "0.00")}</td>
@ -731,6 +732,15 @@
}
};
var approve = function (id) {
var pageNumber = $("#pageNumber").val();
var keywords = $("#keywords").val();
keywords = keywords.replace(/\{/g, '%7b').replace(/\}/g, '%7d');
console.log("keywords: " + keywords);
location.href = '${base}/project/approve?listFrom=list&type=1&id=' + id + '&pageNumber=' + pageNumber + '&keywords=' + keywords;
};
$(function () {
$("#extend").on("click", function () {