From 998278fd7ebef1c0bc9fcc2cc27a8c532623b9cd Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Thu, 5 Jan 2023 17:45:40 +0800 Subject: [PATCH] =?UTF-8?q?admin=E6=92=A4=E5=9B=9E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=95=B0=E6=8D=AE=E7=8A=B6=E6=80=81=E5=8F=98?= =?UTF-8?q?=E4=B8=BA=E8=8D=89=E7=A8=BF=EF=BC=8C=E8=BF=99=E4=B8=AA=E6=97=B6?= =?UTF-8?q?=E5=80=99admin=E5=BA=94=E8=AF=A5=E5=8F=AA=E6=9C=89=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=9D=83=E9=99=90=EF=BC=9B=E5=8F=AA=E6=9C=89=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=BA=BA=E6=89=8D=E8=83=BD=E7=BC=96=E8=BE=91=E8=8D=89?= =?UTF-8?q?=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProcessController.java | 4 ++ .../admin/business/process-completed.ftl | 42 +++++++++++++++---- .../admin/business/process-detail.ftl | 15 +++++++ .../templates/admin/business/process-edit.ftl | 15 +++++++ .../templates/admin/business/process-new.ftl | 15 +++++++ .../admin/business/process-review.ftl | 15 ++++++- 6 files changed, 97 insertions(+), 9 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java index 1ce19c7..8723683 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -163,6 +163,10 @@ public class ProcessController { */ @GetMapping("/completed") public String completed(Model model) { + Admin admin = getLoginUser(); + // 超级管理员，只有查看权限，不能编辑和删除除非是自己的 + model.addAttribute("adminId", admin.getId()); + model.addAttribute("isAdmin", isAdministrator(admin)); model.addAttribute("processTypes", ProcessType.values()); model.addAttribute("processStatus", ProcessStatus.values()); return "/admin/business/process-completed"; diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl index 0d789b6..c385ca6 100644 --- a/src/main/resources/templates/admin/business/process-completed.ftl +++ b/src/main/resources/templates/admin/business/process-completed.ftl @@ -124,19 +124,30 @@ @@ -204,6 +215,21 @@ return response.json() } + /** + * 给定一个数字，保留两位小数输出，格式化为包含分隔符 + * @param f + * @returns {string} + */ + function numberFixed(f) { + if (!f) { + return "0.00"; + } + //return Number(f).toFixed(2); + //格式化413,423,423.24 + f = Number(f).toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2, useGrouping: true }); + return f; + } + const data = () => { return { auditForm: { diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl index a09fd48..ba49cc8 100644 --- a/src/main/resources/templates/admin/business/process-detail.ftl +++ b/src/main/resources/templates/admin/business/process-detail.ftl @@ -355,6 +355,21 @@ return /\w.(png|jpg|jpeg|svg|webp|gif|bmp)$/i.test(path); } + /** + * 给定一个数字，保留两位小数输出，格式化为包含分隔符 + * @param f + * @returns {string} + */ + function numberFixed(f) { + if (!f) { + return "0.00"; + } + //return Number(f).toFixed(2); + //格式化413,423,423.24 + f = Number(f).toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2, useGrouping: true }); + return f; + } + const data = () => { return { process: {}, diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl index f960a84..b3c7028 100644 --- a/src/main/resources/templates/admin/business/process-edit.ftl +++ b/src/main/resources/templates/admin/business/process-edit.ftl @@ -521,6 +521,21 @@ ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".webp" ] + /** + * 给定一个数字，保留两位小数输出，格式化为包含分隔符 + * @param f + * @returns {string} + */ + function numberFixed(f) { + if (!f) { + return "0.00"; + } + //return Number(f).toFixed(2); + //格式化413,423,423.24 + f = Number(f).toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2, useGrouping: true }); + return f; + } + const isEmpty = (obj) => { if (!obj) { return true diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl index 03b5e4d..cb673c6 100644 --- a/src/main/resources/templates/admin/business/process-new.ftl +++ b/src/main/resources/templates/admin/business/process-new.ftl @@ -685,6 +685,21 @@ return response.json() } + /** + * 给定一个数字，保留两位小数输出，格式化为包含分隔符 + * @param f + * @returns {string} + */ + function numberFixed(f) { + if (!f) { + return "0.00"; + } + //return Number(f).toFixed(2); + //格式化413,423,423.24 + f = Number(f).toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2, useGrouping: true }); + return f; + } + const data = () => { return { mode: "btn", // btn , procurementContractProcess diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl index 9dfb641..74027be 100644 --- a/src/main/resources/templates/admin/business/process-review.ftl +++ b/src/main/resources/templates/admin/business/process-review.ftl @@ -190,7 +190,20 @@ function parseJSON(response) { return response.json() } - + /** + * 给定一个数字，保留两位小数输出，格式化为包含分隔符 + * @param f + * @returns {string} + */ + function numberFixed(f) { + if (!f) { + return "0.00"; + } + //return Number(f).toFixed(2); + //格式化413,423,423.24 + f = Number(f).toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2, useGrouping: true }); + return f; + } const data = () => { return { auditForm: {