From 2a6c92390c3496eb6bc8f500a653a1efc1d88a93 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期六, 04 十一月 2023 16:21:55 +0800 Subject: [PATCH] # --- src/main/webapp/views/priOnline2/priOnline.html | 2 ++ src/main/java/com/zy/crm/manager/controller/OrderController.java | 15 +++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java index 5b2bebd..db7b72b 100644 --- a/src/main/java/com/zy/crm/manager/controller/OrderController.java +++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java @@ -224,16 +224,11 @@ List<SettleDto> priOnline2Dtos = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class); List<SettleDto> priOnline2DtoList = new ArrayList<>(); for (SettleDto dto : priOnline2Dtos) { - switch (dto.getStep()) { - case 0: - dto.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(now)+" 璺熻釜椤圭洰淇敼璐熻矗浜轰负锛�"+priOnline2.getUser$()); - break; - case 2: - dto.setUserId(priOnline2.getUserId()); - dto.setUsername(priOnline2.getUser$()); - break; - default: - break; + if (dto.getStep() == 0) { + dto.setMsg(dto.getMsg() + " 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� " + DateUtils.convert(now) + " 璺熻釜椤圭洰淇敼璐熻矗浜轰负锛�" + priOnline2.getUser$()); + } else if (dto.getStep().equals(priOnline2.getSettleSize())) { + dto.setUserId(priOnline2.getUserId()); + dto.setUsername(priOnline2.getUser$()); } priOnline2DtoList.add(dto); } diff --git a/src/main/webapp/views/priOnline2/priOnline.html b/src/main/webapp/views/priOnline2/priOnline.html index 75b5af2..cde8625 100644 --- a/src/main/webapp/views/priOnline2/priOnline.html +++ b/src/main/webapp/views/priOnline2/priOnline.html @@ -83,6 +83,8 @@ {{# } }} {{# if ((d.settle == 1 && d.settleSize == 3) || (d.settle == 2 && d.settleSize == 4)){ }} <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">纭</a> + {{# } }} + {{# if (d.settle == 1 || (d.settle == 2 && d.settleSize == 4)){ }} <a class="layui-btn layui-btn-xs btn-edit" lay-event="approvalEnd">鍥為��瀹℃壒</a> {{# } }} <a class="layui-btn layui-btn-xs btn-edit" lay-event="check">鏍镐环</a> -- Gitblit v1.9.1