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);
}
});