From e6544049829b6e509f09b66f8d72300aabf9ecd8 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Tue, 11 Jul 2023 16:12:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/application/form-step-look_back.html         | 10 ++++++----
 .../com/dreamchaser/depository_manage/SomeTest.java    | 10 +++++-----
 .../pages/application/form-step-look_back.html         | 10 ++++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

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 @@
                                         <h3 id="firstApprovalNodeTitle" class="layui-timeline-title">审批人:审批中</h3>
                                         <div th:each="d,iterStar:${record.getDepartmentheadUserIconPhoto()}">
                                             <img th:src="${d.getValue()}" style="vertical-align:middle;height: 50px;margin: 0px 10px">
-                                            <span id="firstApprovalNodeUserName" th:text="${d.getKey()}"></span>
+                                            <div id="firstApprovalNodeUserName" >
+                                                <span th:text="${d.getKey()}"></span>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -196,14 +198,14 @@
                     if (UserIconPhoto.hasOwnProperty(key)) {
                         let IconPhotoItem = '<div>' +
                             '<img alt="头像" src="' + UserIconPhoto[key] + '" style="vertical-align: middle;height: 50px;margin:0px 10px">' +
-                            '<span>' + key + '</span>' +
+                            '<div>' + key +
                             '<div style="position: absolute;right: 0;top: 35px">';
                         if (nodeState === "1") {
                             IconPhotoItem += '已通过&nbsp;&nbsp;&nbsp;&nbsp;';
                         } else if (nodeState === "2") {
                             IconPhotoItem += '已驳回&nbsp;&nbsp;&nbsp;&nbsp;';
                         }
-                        IconPhotoItem += record[nodeName + "Time"] + '</div></div>';
+                        IconPhotoItem += record[nodeName + "Time"] + '</div></div></div>';
                         approvalNodeForIconPhoto += IconPhotoItem;
                     }
                 }
@@ -274,7 +276,7 @@
                         firstApprovalNodeIcon.addClass("layui-icon-close");  // 更换为审批未通过
                     }
                     firstApprovalTime = firstApprovalTime + departmentheadTime + '</div></div>';
-                    firstApprovalNodeUserName.after(firstApprovalTime);
+                    firstApprovalNodeUserName.append(firstApprovalTime);
                     firstApprovalNodeUserName.after("<p>审批意见：" + departmentheadMessage + "</p>");
 
                     // 声明用于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<ApprovalInfo_SpRecord> spRecord_list = new ArrayList<>();
         ApprovalInfo_SpRecord asr1 = new ApprovalInfo_SpRecord();
-        asr1.setSpStatus("3");
+        asr1.setSpStatus("2");
         List<ApprovalInfo_Details> 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 @@
                                         <h3 id="firstApprovalNodeTitle" class="layui-timeline-title">审批人:审批中</h3>
                                         <div th:each="d,iterStar:${record.getDepartmentheadUserIconPhoto()}">
                                             <img th:src="${d.getValue()}" style="vertical-align:middle;height: 50px;margin: 0px 10px">
-                                            <span id="firstApprovalNodeUserName" th:text="${d.getKey()}"></span>
+                                            <div id="firstApprovalNodeUserName" >
+                                                <span th:text="${d.getKey()}"></span>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -196,14 +198,14 @@
                     if (UserIconPhoto.hasOwnProperty(key)) {
                         let IconPhotoItem = '<div>' +
                             '<img alt="头像" src="' + UserIconPhoto[key] + '" style="vertical-align: middle;height: 50px;margin:0px 10px">' +
-                            '<span>' + key + '</span>' +
+                            '<div>' + key +
                             '<div style="position: absolute;right: 0;top: 35px">';
                         if (nodeState === "1") {
                             IconPhotoItem += '已通过&nbsp;&nbsp;&nbsp;&nbsp;';
                         } else if (nodeState === "2") {
                             IconPhotoItem += '已驳回&nbsp;&nbsp;&nbsp;&nbsp;';
                         }
-                        IconPhotoItem += record[nodeName + "Time"] + '</div></div>';
+                        IconPhotoItem += record[nodeName + "Time"] + '</div></div></div>';
                         approvalNodeForIconPhoto += IconPhotoItem;
                     }
                 }
@@ -274,7 +276,7 @@
                         firstApprovalNodeIcon.addClass("layui-icon-close");  // 更换为审批未通过
                     }
                     firstApprovalTime = firstApprovalTime + departmentheadTime + '</div></div>';
-                    firstApprovalNodeUserName.after(firstApprovalTime);
+                    firstApprovalNodeUserName.append(firstApprovalTime);
                     firstApprovalNodeUserName.after("<p>审批意见：" + departmentheadMessage + "</p>");
 
                     // 声明用于depositoryManager节点是第几个节点（默认第二个审批节点）