diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js index cbfcb55d..cacab7f3 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js @@ -245,7 +245,12 @@ var closeItem = function(dataId){ }); } } - +function preciseCurrencyRound(amount,decimalPlace) { + if (decimalPlace){ + return Number(Math.round(amount + `e${decimalPlace}`) + `e-${decimalPlace}`); + } + return Number(Math.round(amount + 'e2') + 'e-2'); +} /** 创建选项卡 */ function createMenuItem(dataUrl, menuName, isRefresh) { var panelUrl = window.frameElement.getAttribute('data-id'), diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html index d375c2d5..8f4fda01 100644 --- a/ruoyi-admin/src/main/resources/templates/include.html +++ b/ruoyi-admin/src/main/resources/templates/include.html @@ -38,7 +38,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 76aa351f..2ba4e355 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -275,7 +275,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/system/product/product.html b/ruoyi-admin/src/main/resources/templates/system/product/product.html index 8dc0d763..f14ab9ad 100644 --- a/ruoyi-admin/src/main/resources/templates/system/product/product.html +++ b/ruoyi-admin/src/main/resources/templates/system/product/product.html @@ -116,7 +116,7 @@ field: 'guidanceDiscount', title: '指导折扣', formatter: function(value, row, index) { - return value?(value * 100).toFixed(2) + '%' :'-'; + return value?preciseCurrencyRound(value * 100) + '%' :'-'; } }, { diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/flowable/controller/TodoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/flowable/controller/TodoController.java index 5011d6d3..19c421f7 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/flowable/controller/TodoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/flowable/controller/TodoController.java @@ -34,6 +34,12 @@ public class TodoController extends BaseController { mmap.put("user", getSysUser()); return prefix + "/todo"; } + @GetMapping("/complete") + public String complete(ModelMap mmap) + { + mmap.put("user", getSysUser()); + return prefix + "/complete"; + } /** * 查询待办列表 */ diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index 71a83da1..a85c5d09 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -115,7 +115,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To private TaskService taskService; - private static final List CSS_EMAIL_LIST = Arrays.asList("wangxiaojun@pcitech.com", "sunxuepu@pcitech.com", "huiwang@pcitech.com", "zhaoqian1@pcitech.com", "pci-ict@pcitech.com"); + private static final List CSS_EMAIL_LIST = Arrays.asList("wangxiaojun@pcitech.com", "huiwang@pcitech.com", "zhaoqian1@pcitech.com", "pci-ict@pcitech.com"); @Autowired private IBuApproveConfigService approveConfigService;