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 80007953..757b4529 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 @@ -111,7 +111,9 @@

审批人:审批中

- +
+ +
@@ -196,14 +198,14 @@ if (UserIconPhoto.hasOwnProperty(key)) { let IconPhotoItem = '
' + '头像' + - '' + key + '' + + '
' + key + '
'; if (nodeState === "1") { IconPhotoItem += '已通过    '; } else if (nodeState === "2") { IconPhotoItem += '已驳回    '; } - IconPhotoItem += record[nodeName + "Time"] + '
'; + IconPhotoItem += record[nodeName + "Time"] + '
'; approvalNodeForIconPhoto += IconPhotoItem; } } @@ -274,7 +276,7 @@ firstApprovalNodeIcon.addClass("layui-icon-close"); // 更换为审批未通过 } firstApprovalTime = firstApprovalTime + departmentheadTime + ''; - firstApprovalNodeUserName.after(firstApprovalTime); + firstApprovalNodeUserName.append(firstApprovalTime); firstApprovalNodeUserName.after("

审批意见:" + departmentheadMessage + "

"); // 声明用于depositoryManager节点是第几个节点(默认第二个审批节点) diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java index e7079193..ad0f1eb6 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java @@ -241,17 +241,17 @@ public class SomeTest { ApprovalInfo approvalInfo = new ApprovalInfo(); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); - approvalInfo.setSpNo("202307110005"); + approvalInfo.setSpNo("202307110024"); // 模拟第一个节点(部门负责人) List spRecord_list = new ArrayList<>(); ApprovalInfo_SpRecord asr1 = new ApprovalInfo_SpRecord(); - asr1.setSpStatus("3"); + asr1.setSpStatus("2"); List approvalInfo_Details1 = new ArrayList<>(); ApprovalInfo_Details ad1 = new ApprovalInfo_Details(); - ad1.setSpStatus("3"); - ad1.setSpTime("1689036202000"); + ad1.setSpStatus("2"); + ad1.setSpTime("1689062324000"); ApprovalInfo_Details_Approver approver1 = new ApprovalInfo_Details_Approver(); approver1.setUserId("WoBenShanLiang_3"); ad1.setApprover(approver1); @@ -304,7 +304,7 @@ public class SomeTest { // spRecord_list.add(asr4); approvalInfo.setSpRecord(spRecord_list); - approvalInfo.setStatuChangeEvent("3"); + approvalInfo.setStatuChangeEvent("2"); callback(approvalInfo); 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 80007953..757b4529 100644 --- a/target/classes/templates/pages/application/form-step-look_back.html +++ b/target/classes/templates/pages/application/form-step-look_back.html @@ -111,7 +111,9 @@

审批人:审批中

- +
+ +
@@ -196,14 +198,14 @@ if (UserIconPhoto.hasOwnProperty(key)) { let IconPhotoItem = '
' + '头像' + - '' + key + '' + + '
' + key + '
'; if (nodeState === "1") { IconPhotoItem += '已通过    '; } else if (nodeState === "2") { IconPhotoItem += '已驳回    '; } - IconPhotoItem += record[nodeName + "Time"] + '
'; + IconPhotoItem += record[nodeName + "Time"] + '
'; approvalNodeForIconPhoto += IconPhotoItem; } } @@ -274,7 +276,7 @@ firstApprovalNodeIcon.addClass("layui-icon-close"); // 更换为审批未通过 } firstApprovalTime = firstApprovalTime + departmentheadTime + ''; - firstApprovalNodeUserName.after(firstApprovalTime); + firstApprovalNodeUserName.append(firstApprovalTime); firstApprovalNodeUserName.after("

审批意见:" + departmentheadMessage + "

"); // 声明用于depositoryManager节点是第几个节点(默认第二个审批节点)