From cf2763f45f8b0c14fc36bfcc9b9265febab1bc24 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Tue, 4 Jul 2023 16:59:52 +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=E5=B1=95=E7=A4=BA=E6=96=B9=E5=BC=8F=E4=B8=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DepositoryRecordController.java           |   3 +-
 .../impl/DepositoryRecordServiceImpl.java     |   3 +-
 .../application/form-step-look_back.html      | 219 ++++++++++--------
 .../depository_manage/SomeTest.java           |  14 +-
 .../application/form-step-look_back.html      | 219 ++++++++++--------
 5 files changed, 267 insertions(+), 191 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 5ad46e0b..fdec5a10 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
@@ -1494,6 +1494,7 @@ public class DepositoryRecordController {
                 } else {
                     recordPById.setBalancePosterTime("");
                     recordPById.setBalancePoster("");
+                    recordPById.setBalancePosterPass("4");  //代表不存在该节点
                 }
                 // 仓储中心负责人
                 String manager = recordPById.getDepositoryManager();
@@ -1512,7 +1513,7 @@ public class DepositoryRecordController {
                         UserByPort user = PublicConfig.FindUserById(managerid, userKey, token);
                         depositoryManagerNames.append(user.getName());
                     }
-                    recordPById.setDepositoryName(depositoryManagerNames.toString());
+                    recordPById.setDepositoryManagerName(depositoryManagerNames.toString());
                 }
                 recordPById.setBalancePosterName(balancePosterName.toString());
             }
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index 0f7a8406..b0ec848d 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -2538,7 +2538,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 // 将当前redis中存储的spno删除
                 redisPool.getRedisTemplateByDb(14).delete("wms_QyWxMessage_" + spNo);
             }
-        } else {
+        }
+        else {
             // 如果是前两个审批节点
 
             //定义处理时间
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 e2667634..e90c1b56 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
@@ -180,7 +180,7 @@
                                     <div class="layui-timeline-content layui-text">
                                         <h3 class="layui-timeline-title"
                                             th:text="'审批人：'+ ${record.getDepartmentheadName()}"></h3>
-                                        <p id="firstApprovalNodeState" th:text="'状态：待审批'"></p>
+                                        <p id="firstApprovalNodeState" th:text="'审批状态：待审批'"></p>
                                     </div>
                                 </div>
                             </div>
@@ -234,8 +234,8 @@
             success: function (res) {
                 record = res.data;
 
-                // 用于时间线项目
-                let timeLineStartItem = `<div class="layui-timeline-item">
+                // 用于创造时间线节点
+                let timeLineStartItem = `<div class="layui-timeline-item" id="placeholder">
                                     <i class="layui-icon layui-timeline-axis layui-icon-friends"></i>
                                     <div class="layui-timeline-content layui-text">`;
                 let timeLineEndItem = `</div></div>`;
@@ -248,118 +248,158 @@
                 let firstApprovalNodeIcon = $("#firstApprovalNodeIcon");
 
 
-                // 获取部门负责人节点审批时间（第一个节点）
-                let departmentheadTime = record.departmentheadTime;
+                // 获取部门负责人节点审批相关信息（第一个节点）
                 let departmenthead = record.departmenthead;
+                let departmentheadTime = record.departmentheadTime;
                 let departmentheadPass = record.departmentheadPass;
                 let departmentheadMessage = record.departmentheadMessage;
-                // 获取仓储中心负责人节点审批时间（第二个节点）
-                let depositoryManagerNameTime = record.depositoryManagerTime;
+                // 获取仓储中心负责人节点审批相关信息（第二个节点）
                 let depositoryManager = record.depositoryManagerName;
-                // 获取仓储中心负责人节点审批结果
+                let depositoryManagerNameTime = record.depositoryManagerTime;
                 let depositoryManagerPass = record.depositoryManagerPass;
                 let depositoryManagerMessage = record.depositoryManagerMessage;
-                // 获取平衡岗人员节点
+                // 获取平衡岗人员相关信息
                 let balancePoster = record.balancePoster;
                 let balancePosterName = record.balancePosterName;
-                // 获取平衡岗人员节点审批时间
                 let balancePosterNameTime = record.balancePosterTime;
                 let balancePosterMessage = record.balancePosterMessage;
+                let balancePosterPass = record.balancePosterPass;
 
-
-                if (departmentheadTime != null && departmentheadTime !== "" && departmentheadTime !== "0") {
-
-                    firstApprovalNodeIcon.removeClass("layui-icon-friends");
+                if (departmentheadPass !== "3") {
+                    // 如果已经进行了审批
+                    firstApprovalNodeIcon.removeClass("layui-icon-friends");  // 删除当前图标
                     // 如果部门负责人审批时间不为空
                     if (departmentheadPass === "1") {
-                        firstApprovalNodeState.text("状态：审批通过");
-                        firstApprovalNodeIcon.addClass("layui-icon-ok");
+                        firstApprovalNodeState.text("审批状态：审批通过");
+                        firstApprovalNodeIcon.addClass("layui-icon-ok");  // 更换为审批通过
                     } else {
-                        firstApprovalNodeState.text("状态：驳回");
-                        firstApprovalNodeIcon.addClass("layui-icon-close");
+                        firstApprovalNodeState.text("审批状态：驳回");
+                        firstApprovalNodeIcon.addClass("layui-icon-close");  // 更换为审批未通过
                     }
                     firstApprovalNodeState.before("<p>审批时间：" + departmentheadTime + "</p>");
-                    firstApprovalNodeState.append("<p>审批意见：" + balancePosterMessage + "</p>");
-                }
-
-                if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") {
-                    // 如果部门负责人已经审批过
-                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + depositoryManager + '</h3>';
-                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + timeLineEndItem;
-                    firstApprovalNode.append(newTimeLineNode);
-                }
-                else if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster !== "") {
-                    // 如果平衡岗已经审批过
-                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + balancePosterName + '</h3>';
-                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + timeLineEndItem;
-                    firstApprovalNode.append(newTimeLineNode);
-                }
-
-                if (balancePosterNameTime != null && balancePosterNameTime !== "0" && balancePosterNameTime !== "") {
-                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + balancePosterName + '</h3>';
-                    let newTimeLineNodeApprovalTime = '<p>审批时间：' + balancePosterNameTime + '</p>';
-                    let newTimeLineNodeApprovalMessage = '<p>审批意见：' + balancePosterNameTime + '</p>';
+                    firstApprovalNodeState.after("<p>审批意见：" + departmentheadMessage + "</p>");
+
+                    // 声明用于depositoryManager节点是第几个节点（默认第二个审批节点）
+                    let flagForBalancerNode = 2;
+                    // 配置平衡岗节点（第二个节点）
+                    if (balancePoster !== "" && departmentheadPass === "1") {
+                        // 如果需要平衡岗且第一个节点审批完成
+                        if (balancePosterPass === "3") {
+                            // 如果平衡岗未审批
+                            let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + balancePosterName + '</h3>';
+                            let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
+                            let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName + timeLineEndItem;
+                            // 添加节点
+                            firstApprovalNode.after(approvalNodeForBalancer);
+                            flagForBalancerNode = -1; // 不展示
+                        } else {
+                            let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + balancePosterName + '</h3>';
+                            let approvalNodeForBalancerTime = '<p>审批时间：' + balancePosterNameTime + '</p>';
+                            let approvalNodeForBalancerMessage = '<p>审批意见：' + balancePosterMessage + '</p>';
+                            let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
+                            let timeLineStartItemForStartIcon;
+                            let timeLineStartItemForState;
+                            if (balancePosterPass === "1") {
+                                // 如果平衡岗审批通过
+                                timeLineStartItemForStartIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok");
+                                flagForBalancerNode = 3; // 为第三个节点
+                                timeLineStartItemForState = '<p>审批状态：审批通过</p>';
+                            } else if (balancePosterPass === "2") {
+                                // 如果平衡岗未审批通过
+                                timeLineStartItemForStartIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close");
+                                flagForBalancerNode = -1; // 不展示
+                                timeLineStartItemForState = '<p>审批状态：审批未通过</p>';
+                            }
+                            let approvalNodeForBalancer = timeLineStartItemForStartIcon + approvalNodeForBalancerName + approvalNodeForBalancerTime + timeLineStartItemForState + approvalNodeForBalancerMessage + timeLineEndItem;
+                            firstApprovalNode.after(approvalNodeForBalancer);
+                        }
 
-                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem;
-                    firstApprovalNode.append(newTimeLineNode);
-                }
+                    }
 
-                if (depositoryManagerNameTime != null && depositoryManagerNameTime !== "0" && depositoryManagerNameTime !== "" && depositoryManagerPass !== "4") {
-                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + depositoryManager + '</h3>';
-                    let newTimeLineNodeApprovalTime = '<p>审批时间：' + depositoryManagerNameTime + '</p>';
-                    let newTimeLineNodeApprovalMessage = '<p>审批意见：' + depositoryManagerMessage + '</p>';
+                    // 配置仓储管理员节点（第三或第二个节点）
+                    if (depositoryManagerPass !== "4" && departmentheadPass === "1" && flagForBalancerNode !== -1) {
+
+                        let timeLineStartItemForId;
+                        if (flagForBalancerNode === 2) {
+                            // 如果是第二个节点
+                            timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
+                        } else {
+                            // 如果是第三个节点
+                            timeLineStartItemForId = timeLineStartItem.replace("placeholder", "thirdApprovalNode");
+                        }
+                        // 如果可以查看该节点
+                        if (depositoryManagerPass === "3") {
+                            // 如果平衡岗未审批
+                            let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + depositoryManager + '</h3>';
+
+                            let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName + timeLineEndItem;
+                            // 添加节点
+                            if (flagForBalancerNode === 2) {
+                                // 如果是第二个节点
+                                firstApprovalNode.after(approvalNodeForBalancer);
+                            } else {
+                                // 如果是第三个节点
+                                $("#secondApprovalNode").after(approvalNodeForBalancer);
+                            }
+                        } else {
+                            let approvalNodeForDepositoryManagerName = '<h3 class="layui-timeline-title">审批人：' + depositoryManager + '</h3>';
+                            let approvalNodeForDepositoryManagerTime = '<p>审批时间：' + depositoryManagerNameTime + '</p>';
+                            let approvalNodeForDepositoryManagerMessage = '<p>审批意见：' + depositoryManagerMessage + '</p>';
+                            let timeLineStartItemForIcon;
+                            let timeLineStartItemForState;
+                            if (depositoryManagerPass === "1") {
+                                // 如果审批通过
+                                timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok");
+                                timeLineStartItemForState = '<p>审批状态：审批通过</p>';
+
+                            } else if (depositoryManagerPass === "2") {
+                                timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close");
+                                timeLineStartItemForState = '<p>审批状态：审批未通过</p>';
+                            }
+                            let approvalNodeForBalancer = timeLineStartItemForIcon + approvalNodeForDepositoryManagerName + approvalNodeForDepositoryManagerTime + timeLineStartItemForState + approvalNodeForDepositoryManagerMessage + timeLineEndItem;
+                            if (flagForBalancerNode === 2) {
+                                // 如果是第二个节点
+                                firstApprovalNode.after(approvalNodeForBalancer);
+                            } else {
+                                // 如果是第三个节点
+                                $("#secondApprovalNode").after(approvalNodeForBalancer);
+                            }
+                        }
+                    }
 
-                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem;
-                    firstApprovalNode.append(newTimeLineNode);
+                    // 配置出库人员节点
+                    if (departmentheadPass === "1" && (depositoryManagerPass === "4" || depositoryManagerPass === "1")) {
+                        let completeOutUserName = record.completeOutUserName;
+                        let completeOutTime = record.outTime;
+                        let pass = record.pass;
+                        let approvalNodeForCompleteOutUserName = '<h3 class="layui-timeline-title">出库处理人：' + completeOutUserName + '</h3>';
+                        let approvalCompleteOutNode;
+                        if (pass === 1) {
+                            let approvalNodeForCompleteOutState = '<p>处理状态：出库完成</p>';
+                            let approvalNodeForCompleteOutTime = '<p>出库时间：' + completeOutTime + '</p>';
+                            approvalCompleteOutNode = timeLineStartItem.replace("layui-icon-friends", "layui-icon-ok") + approvalNodeForCompleteOutUserName + approvalNodeForCompleteOutState + approvalNodeForCompleteOutTime + timeLineEndItem;
+                        } else {
+                            approvalCompleteOutNode = timeLineStartItem + approvalNodeForCompleteOutUserName + timeLineEndItem;
+                        }
+                        if (flagForBalancerNode === 2) {
+                            if (depositoryManagerPass !== "4") {
+
+                                $("#secondApprovalNode").after(approvalCompleteOutNode);
+                            } else {
+                                firstApprovalNode.after(approvalCompleteOutNode);
+                            }
+                        } else if (flagForBalancerNode === 3) {
+                            $("#thirdApprovalNode").after(approvalCompleteOutNode);
+                        }
+                    }
 
                 }
 
 
-
-
             }
         });
 
 
-       /* // 获取部门负责人节点审批时间
-        let departmentheadTime = $("#departmentheadTime").text();
-        // 获取仓储中心负责人节点审批时间
-        let depositoryManagerNameTime = $("#depositoryManagerNameTime").text();
-        // 获取仓储中心负责人节点审批结果
-        let depositoryManagerPass = $("#depositoryManagerPass").val();
-        // 获取平衡岗人员节点
-        let balancePoster = $("#balancePosterName").text();
-        // 获取平衡岗人员节点审批时间
-        let balancePosterNameTime = $("#balancePosterNameTime").text();
-
-        if (departmentheadTime != null && departmentheadTime !== "" && departmentheadTime !== "0") {
-            // 如果部门负责人审批时间不为空
-            $("#departmentheadTimeT").show();
-            $("#departmentheadMessageT").show();
-
-        }
-
-        if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") {
-            // 如果部门负责人已经审批过
-            $("#depositoryManagerNameT").show();
-        } else if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster !== "") {
-            $("#balancePosterNameT").show();
-        }
-
-        if (balancePosterNameTime != null && balancePosterNameTime !== "0" && balancePosterNameTime !== "") {
-            $("#depositoryManagerNameT").show();
-            $("#balancePosterNameT").show();
-            $("#balancePosterNameTimeT").show();
-            $("#balancePosterMessageT").show();
-        }
-
-        if (depositoryManagerNameTime != null && depositoryManagerNameTime !== "0" && depositoryManagerNameTime !== "" && depositoryManagerPass !== "4") {
-            $("#depositoryManagerNameT").show();
-            $("#depositoryManagerNameTimeT").show();
-            $("#depositoryManagerNameMessageT").show();
-        }
-*/
-
         selectThisMinRecord = function (obj) {
             // console.log(obj)
             var minId = obj.value;
@@ -380,9 +420,6 @@
 
             window.open("/depositoryRecord/downloadOutRecord?id=" + id, "_self");
         };
-        $('body').on('click', '[data-refresh]', function () {
-            location.reload();
-        })
 
     })
 </script>
diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java
index 56e23829..ee46fc45 100644
--- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java
+++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java
@@ -238,7 +238,7 @@ public class SomeTest {
                 ApprovalInfo_Details finalApprovalInfo_details = approvalInfo_details;
                 boolean finalFlagForFirst = flagForFirst;
                 int finalFlagForDepository = flagForDepository;
-//                depositoryRecordService.reviewByQyWxApprovalOut(mainId, finalApprovalInfo_details, "2d3bcfcec0eb62f24aad5cce4f806ba3", spStatus, approvalInfo.getSpNo(), finalFlagForFirst, finalFlagForDepository);
+                depositoryRecordService.reviewByQyWxApprovalOut(mainId, finalApprovalInfo_details, "0a7ffa452096d330934052105a67794a", spStatus, approvalInfo.getSpNo(), finalFlagForFirst, finalFlagForDepository);
 
             }
             // 开启一个线程用于进行下步操作
@@ -252,7 +252,7 @@ public class SomeTest {
 
         ApprovalInfo approvalInfo = new ApprovalInfo();
         approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF");
-        approvalInfo.setSpNo("202306250006");
+        approvalInfo.setSpNo("202307040036");
 
 
         // 模拟第一个节点（部门负责人）
@@ -275,7 +275,7 @@ public class SomeTest {
         List<ApprovalInfo_Details> approvalInfo_Details2 = new ArrayList<>();
         ApprovalInfo_Details ad2 = new ApprovalInfo_Details();
         ad2.setSpStatus("2");
-        ad2.setSpTime("1686628277000");
+        ad2.setSpTime("1688459631000");
         ApprovalInfo_Details_Approver approver2 = new ApprovalInfo_Details_Approver();
         approver2.setUserId("YangYangBaoBei");
         ad2.setApprover(approver2);
@@ -288,7 +288,7 @@ public class SomeTest {
         List<ApprovalInfo_Details> approvalInfo_Details3 = new ArrayList<>();
         ApprovalInfo_Details ad3 = new ApprovalInfo_Details();
         ad3.setSpStatus("2");
-        ad3.setSpTime("1686628377000");
+        ad3.setSpTime("1688459731000");
         ApprovalInfo_Details_Approver approver3 = new ApprovalInfo_Details_Approver();
         approver3.setUserId("SiKai");
         ad3.setApprover(approver3);
@@ -310,9 +310,9 @@ public class SomeTest {
 
 
         spRecord_list.add(asr1);
-//        spRecord_list.add(asr2);
-//        spRecord_list.add(asr3);
-//        spRecord_list.add(asr4);
+        spRecord_list.add(asr2);
+        spRecord_list.add(asr3);
+        spRecord_list.add(asr4);
         approvalInfo.setSpRecord(spRecord_list);
 
         approvalInfo.setStatuChangeEvent("2");
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 e2667634..e90c1b56 100644
--- a/target/classes/templates/pages/application/form-step-look_back.html
+++ b/target/classes/templates/pages/application/form-step-look_back.html
@@ -180,7 +180,7 @@
                                     <div class="layui-timeline-content layui-text">
                                         <h3 class="layui-timeline-title"
                                             th:text="'审批人：'+ ${record.getDepartmentheadName()}"></h3>
-                                        <p id="firstApprovalNodeState" th:text="'状态：待审批'"></p>
+                                        <p id="firstApprovalNodeState" th:text="'审批状态：待审批'"></p>
                                     </div>
                                 </div>
                             </div>
@@ -234,8 +234,8 @@
             success: function (res) {
                 record = res.data;
 
-                // 用于时间线项目
-                let timeLineStartItem = `<div class="layui-timeline-item">
+                // 用于创造时间线节点
+                let timeLineStartItem = `<div class="layui-timeline-item" id="placeholder">
                                     <i class="layui-icon layui-timeline-axis layui-icon-friends"></i>
                                     <div class="layui-timeline-content layui-text">`;
                 let timeLineEndItem = `</div></div>`;
@@ -248,118 +248,158 @@
                 let firstApprovalNodeIcon = $("#firstApprovalNodeIcon");
 
 
-                // 获取部门负责人节点审批时间（第一个节点）
-                let departmentheadTime = record.departmentheadTime;
+                // 获取部门负责人节点审批相关信息（第一个节点）
                 let departmenthead = record.departmenthead;
+                let departmentheadTime = record.departmentheadTime;
                 let departmentheadPass = record.departmentheadPass;
                 let departmentheadMessage = record.departmentheadMessage;
-                // 获取仓储中心负责人节点审批时间（第二个节点）
-                let depositoryManagerNameTime = record.depositoryManagerTime;
+                // 获取仓储中心负责人节点审批相关信息（第二个节点）
                 let depositoryManager = record.depositoryManagerName;
-                // 获取仓储中心负责人节点审批结果
+                let depositoryManagerNameTime = record.depositoryManagerTime;
                 let depositoryManagerPass = record.depositoryManagerPass;
                 let depositoryManagerMessage = record.depositoryManagerMessage;
-                // 获取平衡岗人员节点
+                // 获取平衡岗人员相关信息
                 let balancePoster = record.balancePoster;
                 let balancePosterName = record.balancePosterName;
-                // 获取平衡岗人员节点审批时间
                 let balancePosterNameTime = record.balancePosterTime;
                 let balancePosterMessage = record.balancePosterMessage;
+                let balancePosterPass = record.balancePosterPass;
 
-
-                if (departmentheadTime != null && departmentheadTime !== "" && departmentheadTime !== "0") {
-
-                    firstApprovalNodeIcon.removeClass("layui-icon-friends");
+                if (departmentheadPass !== "3") {
+                    // 如果已经进行了审批
+                    firstApprovalNodeIcon.removeClass("layui-icon-friends");  // 删除当前图标
                     // 如果部门负责人审批时间不为空
                     if (departmentheadPass === "1") {
-                        firstApprovalNodeState.text("状态：审批通过");
-                        firstApprovalNodeIcon.addClass("layui-icon-ok");
+                        firstApprovalNodeState.text("审批状态：审批通过");
+                        firstApprovalNodeIcon.addClass("layui-icon-ok");  // 更换为审批通过
                     } else {
-                        firstApprovalNodeState.text("状态：驳回");
-                        firstApprovalNodeIcon.addClass("layui-icon-close");
+                        firstApprovalNodeState.text("审批状态：驳回");
+                        firstApprovalNodeIcon.addClass("layui-icon-close");  // 更换为审批未通过
                     }
                     firstApprovalNodeState.before("<p>审批时间：" + departmentheadTime + "</p>");
-                    firstApprovalNodeState.append("<p>审批意见：" + balancePosterMessage + "</p>");
-                }
-
-                if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") {
-                    // 如果部门负责人已经审批过
-                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + depositoryManager + '</h3>';
-                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + timeLineEndItem;
-                    firstApprovalNode.append(newTimeLineNode);
-                }
-                else if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster !== "") {
-                    // 如果平衡岗已经审批过
-                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + balancePosterName + '</h3>';
-                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + timeLineEndItem;
-                    firstApprovalNode.append(newTimeLineNode);
-                }
-
-                if (balancePosterNameTime != null && balancePosterNameTime !== "0" && balancePosterNameTime !== "") {
-                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + balancePosterName + '</h3>';
-                    let newTimeLineNodeApprovalTime = '<p>审批时间：' + balancePosterNameTime + '</p>';
-                    let newTimeLineNodeApprovalMessage = '<p>审批意见：' + balancePosterNameTime + '</p>';
+                    firstApprovalNodeState.after("<p>审批意见：" + departmentheadMessage + "</p>");
+
+                    // 声明用于depositoryManager节点是第几个节点（默认第二个审批节点）
+                    let flagForBalancerNode = 2;
+                    // 配置平衡岗节点（第二个节点）
+                    if (balancePoster !== "" && departmentheadPass === "1") {
+                        // 如果需要平衡岗且第一个节点审批完成
+                        if (balancePosterPass === "3") {
+                            // 如果平衡岗未审批
+                            let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + balancePosterName + '</h3>';
+                            let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
+                            let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName + timeLineEndItem;
+                            // 添加节点
+                            firstApprovalNode.after(approvalNodeForBalancer);
+                            flagForBalancerNode = -1; // 不展示
+                        } else {
+                            let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + balancePosterName + '</h3>';
+                            let approvalNodeForBalancerTime = '<p>审批时间：' + balancePosterNameTime + '</p>';
+                            let approvalNodeForBalancerMessage = '<p>审批意见：' + balancePosterMessage + '</p>';
+                            let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
+                            let timeLineStartItemForStartIcon;
+                            let timeLineStartItemForState;
+                            if (balancePosterPass === "1") {
+                                // 如果平衡岗审批通过
+                                timeLineStartItemForStartIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok");
+                                flagForBalancerNode = 3; // 为第三个节点
+                                timeLineStartItemForState = '<p>审批状态：审批通过</p>';
+                            } else if (balancePosterPass === "2") {
+                                // 如果平衡岗未审批通过
+                                timeLineStartItemForStartIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close");
+                                flagForBalancerNode = -1; // 不展示
+                                timeLineStartItemForState = '<p>审批状态：审批未通过</p>';
+                            }
+                            let approvalNodeForBalancer = timeLineStartItemForStartIcon + approvalNodeForBalancerName + approvalNodeForBalancerTime + timeLineStartItemForState + approvalNodeForBalancerMessage + timeLineEndItem;
+                            firstApprovalNode.after(approvalNodeForBalancer);
+                        }
 
-                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem;
-                    firstApprovalNode.append(newTimeLineNode);
-                }
+                    }
 
-                if (depositoryManagerNameTime != null && depositoryManagerNameTime !== "0" && depositoryManagerNameTime !== "" && depositoryManagerPass !== "4") {
-                    let newTimeLineNodeApprovalName = '<h3 class="layui-timeline-title">' + depositoryManager + '</h3>';
-                    let newTimeLineNodeApprovalTime = '<p>审批时间：' + depositoryManagerNameTime + '</p>';
-                    let newTimeLineNodeApprovalMessage = '<p>审批意见：' + depositoryManagerMessage + '</p>';
+                    // 配置仓储管理员节点（第三或第二个节点）
+                    if (depositoryManagerPass !== "4" && departmentheadPass === "1" && flagForBalancerNode !== -1) {
+
+                        let timeLineStartItemForId;
+                        if (flagForBalancerNode === 2) {
+                            // 如果是第二个节点
+                            timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
+                        } else {
+                            // 如果是第三个节点
+                            timeLineStartItemForId = timeLineStartItem.replace("placeholder", "thirdApprovalNode");
+                        }
+                        // 如果可以查看该节点
+                        if (depositoryManagerPass === "3") {
+                            // 如果平衡岗未审批
+                            let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + depositoryManager + '</h3>';
+
+                            let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName + timeLineEndItem;
+                            // 添加节点
+                            if (flagForBalancerNode === 2) {
+                                // 如果是第二个节点
+                                firstApprovalNode.after(approvalNodeForBalancer);
+                            } else {
+                                // 如果是第三个节点
+                                $("#secondApprovalNode").after(approvalNodeForBalancer);
+                            }
+                        } else {
+                            let approvalNodeForDepositoryManagerName = '<h3 class="layui-timeline-title">审批人：' + depositoryManager + '</h3>';
+                            let approvalNodeForDepositoryManagerTime = '<p>审批时间：' + depositoryManagerNameTime + '</p>';
+                            let approvalNodeForDepositoryManagerMessage = '<p>审批意见：' + depositoryManagerMessage + '</p>';
+                            let timeLineStartItemForIcon;
+                            let timeLineStartItemForState;
+                            if (depositoryManagerPass === "1") {
+                                // 如果审批通过
+                                timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok");
+                                timeLineStartItemForState = '<p>审批状态：审批通过</p>';
+
+                            } else if (depositoryManagerPass === "2") {
+                                timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close");
+                                timeLineStartItemForState = '<p>审批状态：审批未通过</p>';
+                            }
+                            let approvalNodeForBalancer = timeLineStartItemForIcon + approvalNodeForDepositoryManagerName + approvalNodeForDepositoryManagerTime + timeLineStartItemForState + approvalNodeForDepositoryManagerMessage + timeLineEndItem;
+                            if (flagForBalancerNode === 2) {
+                                // 如果是第二个节点
+                                firstApprovalNode.after(approvalNodeForBalancer);
+                            } else {
+                                // 如果是第三个节点
+                                $("#secondApprovalNode").after(approvalNodeForBalancer);
+                            }
+                        }
+                    }
 
-                    let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem;
-                    firstApprovalNode.append(newTimeLineNode);
+                    // 配置出库人员节点
+                    if (departmentheadPass === "1" && (depositoryManagerPass === "4" || depositoryManagerPass === "1")) {
+                        let completeOutUserName = record.completeOutUserName;
+                        let completeOutTime = record.outTime;
+                        let pass = record.pass;
+                        let approvalNodeForCompleteOutUserName = '<h3 class="layui-timeline-title">出库处理人：' + completeOutUserName + '</h3>';
+                        let approvalCompleteOutNode;
+                        if (pass === 1) {
+                            let approvalNodeForCompleteOutState = '<p>处理状态：出库完成</p>';
+                            let approvalNodeForCompleteOutTime = '<p>出库时间：' + completeOutTime + '</p>';
+                            approvalCompleteOutNode = timeLineStartItem.replace("layui-icon-friends", "layui-icon-ok") + approvalNodeForCompleteOutUserName + approvalNodeForCompleteOutState + approvalNodeForCompleteOutTime + timeLineEndItem;
+                        } else {
+                            approvalCompleteOutNode = timeLineStartItem + approvalNodeForCompleteOutUserName + timeLineEndItem;
+                        }
+                        if (flagForBalancerNode === 2) {
+                            if (depositoryManagerPass !== "4") {
+
+                                $("#secondApprovalNode").after(approvalCompleteOutNode);
+                            } else {
+                                firstApprovalNode.after(approvalCompleteOutNode);
+                            }
+                        } else if (flagForBalancerNode === 3) {
+                            $("#thirdApprovalNode").after(approvalCompleteOutNode);
+                        }
+                    }
 
                 }
 
 
-
-
             }
         });
 
 
-       /* // 获取部门负责人节点审批时间
-        let departmentheadTime = $("#departmentheadTime").text();
-        // 获取仓储中心负责人节点审批时间
-        let depositoryManagerNameTime = $("#depositoryManagerNameTime").text();
-        // 获取仓储中心负责人节点审批结果
-        let depositoryManagerPass = $("#depositoryManagerPass").val();
-        // 获取平衡岗人员节点
-        let balancePoster = $("#balancePosterName").text();
-        // 获取平衡岗人员节点审批时间
-        let balancePosterNameTime = $("#balancePosterNameTime").text();
-
-        if (departmentheadTime != null && departmentheadTime !== "" && departmentheadTime !== "0") {
-            // 如果部门负责人审批时间不为空
-            $("#departmentheadTimeT").show();
-            $("#departmentheadMessageT").show();
-
-        }
-
-        if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") {
-            // 如果部门负责人已经审批过
-            $("#depositoryManagerNameT").show();
-        } else if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster !== "") {
-            $("#balancePosterNameT").show();
-        }
-
-        if (balancePosterNameTime != null && balancePosterNameTime !== "0" && balancePosterNameTime !== "") {
-            $("#depositoryManagerNameT").show();
-            $("#balancePosterNameT").show();
-            $("#balancePosterNameTimeT").show();
-            $("#balancePosterMessageT").show();
-        }
-
-        if (depositoryManagerNameTime != null && depositoryManagerNameTime !== "0" && depositoryManagerNameTime !== "" && depositoryManagerPass !== "4") {
-            $("#depositoryManagerNameT").show();
-            $("#depositoryManagerNameTimeT").show();
-            $("#depositoryManagerNameMessageT").show();
-        }
-*/
-
         selectThisMinRecord = function (obj) {
             // console.log(obj)
             var minId = obj.value;
@@ -380,9 +420,6 @@
 
             window.open("/depositoryRecord/downloadOutRecord?id=" + id, "_self");
         };
-        $('body').on('click', '[data-refresh]', function () {
-            location.reload();
-        })
 
     })
 </script>