From b3e7eafaaac24834e64fdae459e27f022aa60c3e Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 5 Jul 2023 13:14:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8B=E5=9B=BE=EF=BC=88=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=96=B9=E6=B3=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DepositoryRecordController.java | 3 +- .../application/form-step-look_back.html | 32 ++++++++++++------- .../application/form-step-look_back.html | 32 ++++++++++++------- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 7ac129b6..3dd3e6a0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -1476,8 +1476,9 @@ public class DepositoryRecordController { String name = userByPort.getName(); sb.append(name).append(","); completeUserIconMap.put(name,userByPort.getIconphoto()); - } + + recordPById.setCompleteOutUserName(sb.toString()); recordPById.setCompleteOutUserIconPhoto(completeUserIconMap); diff --git a/src/main/resources/templates/pages/application/form-step-look_back.html b/src/main/resources/templates/pages/application/form-step-look_back.html index cb09b89c..69be0e1b 100644 --- a/src/main/resources/templates/pages/application/form-step-look_back.html +++ b/src/main/resources/templates/pages/application/form-step-look_back.html @@ -108,12 +108,11 @@
-

审批人:

-

+

审批人:审批中

+
- -

-

+ +
@@ -205,7 +204,6 @@ IconPhotoItem += '已通过    '; } else if (nodeState === "2") { IconPhotoItem += '已驳回    '; - } IconPhotoItem += record[nodeName + "Time"] + ''; approvalNodeForIconPhoto += IconPhotoItem; @@ -231,6 +229,9 @@ dataType: 'json', data: JSON.stringify({"id": id}), contentType: "application/json;charset=utf-8", + beforeSend: function () { + this.layerIndex = layer.open({type:3,shade:[0.25,'#000'],icon:2,speed:0}); + }, success: function (res) { record = res.data; @@ -242,10 +243,12 @@ // 获取第一个审批节点 let firstApprovalNode = $("#firstApprovalNode"); - // 获取第一个审批节点状态 - let firstApprovalNodeState = $("#firstApprovalNodeState"); // 获取第一个审批节点图标 let firstApprovalNodeIcon = $("#firstApprovalNodeIcon"); + // 获取第一个审批节点标题 + let firstApprovalNodeTitle = $("#firstApprovalNodeTitle"); + // 获取第一个审批节点用户名 + let firstApprovalNodeUserName = $("#firstApprovalNodeUserName"); // 获取部门负责人节点审批相关信息（第一个节点） @@ -261,16 +264,20 @@ if (departmentheadPass !== "3") { // 如果已经进行了审批 firstApprovalNodeIcon.removeClass("layui-icon-friends"); // 删除当前图标 + let firstApprovalTime = '
'; // 如果部门负责人审批时间不为空 if (departmentheadPass === "1") { - firstApprovalNodeState.text("审批状态：审批通过"); + firstApprovalNodeTitle.text("审批人：已通过"); firstApprovalNodeIcon.addClass("layui-icon-ok"); // 更换为审批通过 + firstApprovalTime += "已通过    "; } else { - firstApprovalNodeState.text("审批状态：驳回"); + firstApprovalTime += "已驳回    "; + firstApprovalNodeTitle.text("审批人：已驳回"); firstApprovalNodeIcon.addClass("layui-icon-close"); // 更换为审批未通过 } - firstApprovalNodeState.before("

审批时间：" + departmentheadTime + "

"); - firstApprovalNodeState.after("

审批意见：" + departmentheadMessage + "

"); + firstApprovalTime = firstApprovalTime + departmentheadTime + '
'; + firstApprovalNodeUserName.after(firstApprovalTime); + firstApprovalNodeUserName.after("

审批意见：" + departmentheadMessage + "

"); // 声明用于depositoryManager节点是第几个节点（默认第二个审批节点） let flagForBalancerNode = 2; @@ -357,6 +364,7 @@ } + layer.close(this.layerIndex); } }); diff --git a/target/classes/templates/pages/application/form-step-look_back.html b/target/classes/templates/pages/application/form-step-look_back.html index cb09b89c..69be0e1b 100644 --- a/target/classes/templates/pages/application/form-step-look_back.html +++ b/target/classes/templates/pages/application/form-step-look_back.html @@ -108,12 +108,11 @@
-

审批人:

-

+

审批人:审批中

+
- -

-

+ +
@@ -205,7 +204,6 @@ IconPhotoItem += '已通过    '; } else if (nodeState === "2") { IconPhotoItem += '已驳回    '; - } IconPhotoItem += record[nodeName + "Time"] + ''; approvalNodeForIconPhoto += IconPhotoItem; @@ -231,6 +229,9 @@ dataType: 'json', data: JSON.stringify({"id": id}), contentType: "application/json;charset=utf-8", + beforeSend: function () { + this.layerIndex = layer.open({type:3,shade:[0.25,'#000'],icon:2,speed:0}); + }, success: function (res) { record = res.data; @@ -242,10 +243,12 @@ // 获取第一个审批节点 let firstApprovalNode = $("#firstApprovalNode"); - // 获取第一个审批节点状态 - let firstApprovalNodeState = $("#firstApprovalNodeState"); // 获取第一个审批节点图标 let firstApprovalNodeIcon = $("#firstApprovalNodeIcon"); + // 获取第一个审批节点标题 + let firstApprovalNodeTitle = $("#firstApprovalNodeTitle"); + // 获取第一个审批节点用户名 + let firstApprovalNodeUserName = $("#firstApprovalNodeUserName"); // 获取部门负责人节点审批相关信息（第一个节点） @@ -261,16 +264,20 @@ if (departmentheadPass !== "3") { // 如果已经进行了审批 firstApprovalNodeIcon.removeClass("layui-icon-friends"); // 删除当前图标 + let firstApprovalTime = '
'; // 如果部门负责人审批时间不为空 if (departmentheadPass === "1") { - firstApprovalNodeState.text("审批状态：审批通过"); + firstApprovalNodeTitle.text("审批人：已通过"); firstApprovalNodeIcon.addClass("layui-icon-ok"); // 更换为审批通过 + firstApprovalTime += "已通过    "; } else { - firstApprovalNodeState.text("审批状态：驳回"); + firstApprovalTime += "已驳回    "; + firstApprovalNodeTitle.text("审批人：已驳回"); firstApprovalNodeIcon.addClass("layui-icon-close"); // 更换为审批未通过 } - firstApprovalNodeState.before("

审批时间：" + departmentheadTime + "

"); - firstApprovalNodeState.after("

审批意见：" + departmentheadMessage + "

"); + firstApprovalTime = firstApprovalTime + departmentheadTime + '
'; + firstApprovalNodeUserName.after(firstApprovalTime); + firstApprovalNodeUserName.after("

审批意见：" + departmentheadMessage + "

"); // 声明用于depositoryManager节点是第几个节点（默认第二个审批节点） let flagForBalancerNode = 2; @@ -357,6 +364,7 @@ } + layer.close(this.layerIndex); } });