|
|
|
@ -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 += '已通过 '; |
|
|
|
} else if (nodeState === "2") { |
|
|
|
IconPhotoItem += '已驳回 '; |
|
|
|
} |
|
|
|
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节点是第几个节点(默认第二个审批节点) |
|
|
|
|