From 66b0748dd36cf5079db9fde4b5fcdb18235322d6 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 26 Oct 2022 17:52:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8layui=E7=9A=84alert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 27 +++++++ .../templates/admin/account_list.ftl | 12 +-- .../templates/admin/account_password.ftl | 2 +- .../templates/admin/act_his_task_list.ftl | 2 +- .../templates/admin/act_model_list.ftl | 4 +- .../templates/admin/act_proc_def_list.ftl | 4 +- .../templates/admin/act_proc_ins_list.ftl | 6 +- .../templates/admin/human_cost_list.ftl | 4 +- .../templates/admin/manager_list.ftl | 8 +- .../templates/admin/monthly_settle_list.ftl | 4 +- .../templates/admin/procurement_type_list.ftl | 4 +- .../admin/profit_marfin_config_input.ftl | 4 +- .../templates/admin/project_approve.ftl | 12 +-- .../templates/admin/project_budget_edit.ftl | 8 +- .../templates/admin/project_budget_list.ftl | 76 +++++++++++++++++++ .../templates/admin/project_final_list.ftl | 76 +++++++++++++++++++ .../templates/admin/project_list.ftl | 28 +++---- .../templates/admin/project_settle_list.ftl | 76 +++++++++++++++++++ .../resources/templates/admin/role_list.ftl | 4 +- .../templates/admin/sys_permission_list.ftl | 4 +- 20 files changed, 310 insertions(+), 55 deletions(-) create mode 100644 src/main/resources/templates/admin/project_budget_list.ftl create mode 100644 src/main/resources/templates/admin/project_final_list.ftl create mode 100644 src/main/resources/templates/admin/project_settle_list.ftl diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 8c1292a..181a758 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -1352,4 +1352,31 @@ public class ProjectController extends BaseController { exportExcelUtils.end(outputStream); } + + @RequestMapping("/budgetList") + public String budgetList(@RequestParam(value = "keywords", required = false) String keywords, + @RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber, + @RequestParam(value = PAGE_SIZE, defaultValue = DEFAULT_PAGE_SIZE) int pageSize, + Map model) { + + return "admin/project_budget_list"; + } + + @RequestMapping("/settleList") + public String settleList(@RequestParam(value = "keywords", required = false) String keywords, + @RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber, + @RequestParam(value = PAGE_SIZE, defaultValue = DEFAULT_PAGE_SIZE) int pageSize, + Map model) { + + return "admin/project_settle_list"; + } + + @RequestMapping("/finalList") + public String finalList(@RequestParam(value = "keywords", required = false) String keywords, + @RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber, + @RequestParam(value = PAGE_SIZE, defaultValue = DEFAULT_PAGE_SIZE) int pageSize, + Map model) { + + return "admin/project_final_list"; + } } diff --git a/src/main/resources/templates/admin/account_list.ftl b/src/main/resources/templates/admin/account_list.ftl index 2085dbd..415d45f 100644 --- a/src/main/resources/templates/admin/account_list.ftl +++ b/src/main/resources/templates/admin/account_list.ftl @@ -318,11 +318,11 @@ }, error: function (data, status, e) { console.log("--------error---------" + data) - alert("-----------------" + data); + layer.alert("-----------------" + data); // if ($('#modal')) { // $('#modal').modal('close'); // } - alert(e); + layer.alert(e); $("#" + id).val(""); } }); @@ -376,10 +376,10 @@ }, success: function (data) { if (data.status == 0) { - alert("重置成功"); + layer.alert("重置成功"); window.location.href = window.location.href; } else if (data.status == 1) { - alert("重置失败"); + layer.alert("重置失败"); } } }); @@ -413,10 +413,10 @@ }, success: function (data) { if (data.status == 0) { - alert("删除成功"); + layer.alert("删除成功"); window.location.href = window.location.href; } else if (data.status == 1) { - alert("删除失败"); + layer.alert("删除失败"); } } }); diff --git a/src/main/resources/templates/admin/account_password.ftl b/src/main/resources/templates/admin/account_password.ftl index a4c5d1f..2ed3f02 100644 --- a/src/main/resources/templates/admin/account_password.ftl +++ b/src/main/resources/templates/admin/account_password.ftl @@ -97,7 +97,7 @@ if (pwd == newPwd) { - alert("新密码跟旧密码不能一样"); + layer.alert("新密码跟旧密码不能一样"); return false; } diff --git a/src/main/resources/templates/admin/act_his_task_list.ftl b/src/main/resources/templates/admin/act_his_task_list.ftl index 005019b..cfefd4c 100644 --- a/src/main/resources/templates/admin/act_his_task_list.ftl +++ b/src/main/resources/templates/admin/act_his_task_list.ftl @@ -196,7 +196,7 @@ type: 'post', async: false, success: function (data) { - alert(data.msg); + layer.alert(data.msg); location.reload(); } }); diff --git a/src/main/resources/templates/admin/act_model_list.ftl b/src/main/resources/templates/admin/act_model_list.ftl index 0bfb13e..94f834f 100644 --- a/src/main/resources/templates/admin/act_model_list.ftl +++ b/src/main/resources/templates/admin/act_model_list.ftl @@ -176,10 +176,10 @@ success: function (data) { $deleteButton.prop("disabled", false) if (data.status == 0) { - alert(data.msg); + layer.alert(data.msg); window.location.href = window.location.href; } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); diff --git a/src/main/resources/templates/admin/act_proc_def_list.ftl b/src/main/resources/templates/admin/act_proc_def_list.ftl index f1b29c5..32acb7d 100644 --- a/src/main/resources/templates/admin/act_proc_def_list.ftl +++ b/src/main/resources/templates/admin/act_proc_def_list.ftl @@ -200,10 +200,10 @@ success: function (data) { $deleteButton.prop("disabled", false) if (data.status == 0) { - alert(data.msg); + layer.alert(data.msg); window.location.href = window.location.href; } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); diff --git a/src/main/resources/templates/admin/act_proc_ins_list.ftl b/src/main/resources/templates/admin/act_proc_ins_list.ftl index 867449d..829046b 100644 --- a/src/main/resources/templates/admin/act_proc_ins_list.ftl +++ b/src/main/resources/templates/admin/act_proc_ins_list.ftl @@ -143,10 +143,10 @@ success: function (data) { $deleteButton.prop("disabled", false) if (data.status == 0) { - alert(data.msg); + layer.alert(data.msg); window.location.href = window.location.href; } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); @@ -197,7 +197,7 @@ dataType: "json", async: false, success: function (data) { - alert(data.msg); + layer.alert(data.msg); location.reload(); } }); diff --git a/src/main/resources/templates/admin/human_cost_list.ftl b/src/main/resources/templates/admin/human_cost_list.ftl index 72cbdca..4cbe052 100644 --- a/src/main/resources/templates/admin/human_cost_list.ftl +++ b/src/main/resources/templates/admin/human_cost_list.ftl @@ -266,8 +266,8 @@ }, error: function (data, status, e) { console.log("--------error---------" + data) - alert("-----------------" + data); - alert(e); + layer.alert("-----------------" + data); + layer.alert(e); $("#" + id).val(""); } }); diff --git a/src/main/resources/templates/admin/manager_list.ftl b/src/main/resources/templates/admin/manager_list.ftl index 5349b5e..dcd77df 100644 --- a/src/main/resources/templates/admin/manager_list.ftl +++ b/src/main/resources/templates/admin/manager_list.ftl @@ -264,10 +264,10 @@ success: function (data) { $deleteButton.prop("disabled", false) if (data.status == 0) { - alert(data.msg); + layer.alert(data.msg); window.location.href = window.location.href; } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); @@ -287,10 +287,10 @@ }, success: function (data) { if (data.status == 0) { - alert("重置成功"); + layer.alert("重置成功"); window.location.href = window.location.href; } else if (data.status == 1) { - alert("重置失败"); + layer.alert("重置失败"); } } }); diff --git a/src/main/resources/templates/admin/monthly_settle_list.ftl b/src/main/resources/templates/admin/monthly_settle_list.ftl index c692ae6..72366fa 100644 --- a/src/main/resources/templates/admin/monthly_settle_list.ftl +++ b/src/main/resources/templates/admin/monthly_settle_list.ftl @@ -329,8 +329,8 @@ }, error: function (data, status, e) { console.log("--------error---------" + data) - alert("-----------------" + data); - alert(e); + layer.alert("-----------------" + data); + layer.alert(e); $("#" + id).val(""); } }); diff --git a/src/main/resources/templates/admin/procurement_type_list.ftl b/src/main/resources/templates/admin/procurement_type_list.ftl index 621aee7..6342275 100644 --- a/src/main/resources/templates/admin/procurement_type_list.ftl +++ b/src/main/resources/templates/admin/procurement_type_list.ftl @@ -296,10 +296,10 @@ success: function (data) { $deleteButton.prop("disabled", false) if (data.status == 0) { - alert("删除成功"); + layer.alert("删除成功"); window.location.href = window.location.href; } else if (data.status == 1) { - alert("删除失败"); + layer.alert("删除失败"); } } }); diff --git a/src/main/resources/templates/admin/profit_marfin_config_input.ftl b/src/main/resources/templates/admin/profit_marfin_config_input.ftl index 36660f7..dfd5147 100644 --- a/src/main/resources/templates/admin/profit_marfin_config_input.ftl +++ b/src/main/resources/templates/admin/profit_marfin_config_input.ftl @@ -90,10 +90,10 @@ async: false, success: function (data) { if (data.status == 0) { - alert("配置成功"); + layer.alert("配置成功"); window.location.href = window.location.href; } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 27c914a..2ee12b7 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -3005,7 +3005,7 @@ } } catch(e) { console.log(e); - alert("浏览器不支持打印功能,请切换支持该功能的浏览器"); + layer.alert("浏览器不支持打印功能,请切换支持该功能的浏览器"); } @@ -3046,7 +3046,7 @@ var message = $("#doc-vld-ta-2").val(); var approvetype = $("#type").val(); if (message == '') { - alert("请填写审核意见"); + layer.alert("请填写审核意见"); return; } @@ -3064,7 +3064,7 @@ async: false, success: function (data) { if (data.status == 0) { - alert(data.msg); + layer.alert(data.msg); refreshMyApproveMsg(); var urlType = data.data; if(urlType == 1){ @@ -3074,7 +3074,7 @@ } } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); @@ -3172,10 +3172,10 @@ async: false, success: function (data) { if (data.status == 0) { - alert(data.msg); + layer.alert(data.msg); window.location.href = window.location.href; } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index dde1a5d..e77414d 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -1416,11 +1416,11 @@ }, error: function (data, status, e) { console.log("--------error---------" + data) - alert("-----------------" + data); + layer.alert("-----------------" + data); // if ($('#modal')) { // $('#modal').modal('close'); // } - alert(e); + layer.alert(e); $("#" + id).val(""); } }); @@ -1462,11 +1462,11 @@ }, error: function (data, status, e) { console.log("--------error---------" + data) - alert("-----------------" + data); + layer.alert("-----------------" + data); // if ($('#modal')) { // $('#modal').modal('close'); // } - alert(e); + layer.alert(e); $("#" + id).val(""); } }); diff --git a/src/main/resources/templates/admin/project_budget_list.ftl b/src/main/resources/templates/admin/project_budget_list.ftl new file mode 100644 index 0000000..c2bbc46 --- /dev/null +++ b/src/main/resources/templates/admin/project_budget_list.ftl @@ -0,0 +1,76 @@ + +
+

建设中,敬请期待

+<#-- --> +
+ diff --git a/src/main/resources/templates/admin/project_final_list.ftl b/src/main/resources/templates/admin/project_final_list.ftl new file mode 100644 index 0000000..c2bbc46 --- /dev/null +++ b/src/main/resources/templates/admin/project_final_list.ftl @@ -0,0 +1,76 @@ + +
+

建设中,敬请期待

+<#-- --> +
+ diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index f81124f..7b6b48d 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -383,7 +383,7 @@ 序号 项目编号style="color: red" onclick="sub_function('projectNoDown')">style="color: red" onclick="sub_function('projectNoUp')"> - 项目名称style="color: red" onclick="sub_function('projectNameDown')">style="color: red" onclick="sub_function('projectNameUp')"> + 项目名称style="color: red" onclick="sub_function('projectNameDown')">style="color: red" onclick="sub_function('projectNameUp')"> 项目类型style="color: red" onclick="sub_function('projectTypeDown')">style="color: red" onclick="sub_function('projectTypeUp')"> 垫资模式style="color: red" onclick="sub_function('underModeDown')">style="color: red" onclick="sub_function('underModeUp')"> 垫资利息style="color: red" onclick="sub_function('underIntDown')">style="color: red" onclick="sub_function('underIntUp')"> @@ -423,7 +423,7 @@ ${list.tempId!} ${list.projectNo!} - ${list.name!} + ${list.name!} ${list.typeDesc!} ${list.underwrittenModeStr!} ${Utils.format(list.advanceInterestAmount, "0.00")} @@ -778,10 +778,10 @@ <#-- async: false,--> <#-- success: function (data) {--> <#-- if (data.status == 0) {--> - <#-- alert(data.msg);--> + <#-- layer.alert(data.msg);--> <#-- window.location.href = window.location.href;--> <#-- } else if (data.status == 1) {--> - <#-- alert(data.msg);--> + <#-- layer.alert(data.msg);--> <#-- location.href = '${base}/project/toEditAllStatus?id=' + id;--> <#-- }--> <#-- }--> @@ -1009,12 +1009,12 @@ var projectId = $("#hqProjectId").val(); var fileUrl = $("#icon").val(); if (fileUrl == '') { - alert("请上传会签单"); + layer.alert("请上传会签单"); return; } var message = $("#doc-vld-ta-2").val(); if (message == '') { - alert("请填写会签意见"); + layer.alert("请填写会签意见"); return; } @@ -1031,10 +1031,10 @@ async: false, success: function (data) { if (data.status == 0) { - alert(data.msg); + layer.alert(data.msg); window.location.href=window.location.href; } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); @@ -1047,7 +1047,7 @@ var batchUpdateApprove = function () { var adminId = $("#approveAdminSelect option:selected").val(); if (adminId == '') { - alert("请选择承接账号"); + layer.alert("请选择承接账号"); return; } @@ -1063,10 +1063,10 @@ async: false, success: function (data) { if (data.status == 0) { - alert(data.msg); + layer.alert(data.msg); window.location.href=window.location.href; } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); @@ -1147,10 +1147,10 @@ async: false, success: function (data) { if (data.status == 0) { - alert(data.msg); + layer.alert(data.msg); window.location.href = window.location.href; } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); @@ -1212,7 +1212,7 @@ dataType: "json", async: false, success: function (data) { - alert(data.msg); + layer.alert(data.msg); window.location.href=window.location.href; } }); diff --git a/src/main/resources/templates/admin/project_settle_list.ftl b/src/main/resources/templates/admin/project_settle_list.ftl new file mode 100644 index 0000000..c2bbc46 --- /dev/null +++ b/src/main/resources/templates/admin/project_settle_list.ftl @@ -0,0 +1,76 @@ + +
+

建设中,敬请期待

+<#-- --> +
+ diff --git a/src/main/resources/templates/admin/role_list.ftl b/src/main/resources/templates/admin/role_list.ftl index 3cf68ef..639f34a 100644 --- a/src/main/resources/templates/admin/role_list.ftl +++ b/src/main/resources/templates/admin/role_list.ftl @@ -198,10 +198,10 @@ success: function (data) { $deleteButton.prop("disabled", false) if (data.status == 0) { - alert(data.msg); + layer.alert(data.msg); window.location.href = window.location.href; } else if (data.status == 1) { - alert(data.msg); + layer.alert(data.msg); } } }); diff --git a/src/main/resources/templates/admin/sys_permission_list.ftl b/src/main/resources/templates/admin/sys_permission_list.ftl index 4fd3085..f5e3b40 100644 --- a/src/main/resources/templates/admin/sys_permission_list.ftl +++ b/src/main/resources/templates/admin/sys_permission_list.ftl @@ -294,10 +294,10 @@ success: function (data) { $deleteButton.prop("disabled", false) if (data.status == 0) { - alert("删除成功"); + layer.alert("删除成功"); window.location.href = window.location.href; } else if (data.status == 1) { - alert("删除失败"); + layer.alert("删除失败"); } } });