pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改出库审批流程图（抽取统一方法）

lwx_dev
erdanergou 2 years ago
parent
c48ab26b12
commit
b3e7eafaaa
3 changed files with 42 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 32
      src/main/resources/templates/pages/application/form-step-look_back.html
  3. 32
      target/classes/templates/pages/application/form-step-look_back.html

3
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
View File

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

32
src/main/resources/templates/pages/application/form-step-look_back.html
View File

@ -108,12 +108,11 @@
<i id="firstApprovalNodeIcon"
class="layui-icon layui-timeline-axis layui-icon-friends"></i>
<div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title">审批人:</h3>
<p th:each="d,iterStar:${record.getDepartmentheadUserIconPhoto()}">
<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">
<span th:text="${d.getKey()}"></span>
</p>
<p id="firstApprovalNodeState" th:text="'审批状态：待审批'"></p>
<span id="firstApprovalNodeUserName" th:text="${d.getKey()}"></span>
</div>
</div>
</div>
</div>
@ -205,7 +204,6 @@
IconPhotoItem += '已通过&nbsp;&nbsp;&nbsp;&nbsp;';
} else if (nodeState === "2") {
IconPhotoItem += '已驳回&nbsp;&nbsp;&nbsp;&nbsp;';
}
IconPhotoItem += record[nodeName + "Time"] + '</div></div>';
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 = '<div style="position: absolute;right: 0;top: 35px">';
// 如果部门负责人审批时间不为空
if (departmentheadPass === "1") {
firstApprovalNodeState.text("审批状态：审批通过");
firstApprovalNodeTitle.text("审批人：已通过");
firstApprovalNodeIcon.addClass("layui-icon-ok"); // 更换为审批通过
firstApprovalTime += "已通过&nbsp&nbsp&nbsp&nbsp";
} else {
firstApprovalNodeState.text("审批状态：驳回");
firstApprovalTime += "已驳回&nbsp&nbsp&nbsp&nbsp";
firstApprovalNodeTitle.text("审批人：已驳回");
firstApprovalNodeIcon.addClass("layui-icon-close"); // 更换为审批未通过
}
firstApprovalNodeState.before("<p>审批时间：" + departmentheadTime + "</p>");
firstApprovalNodeState.after("<p>审批意见：" + departmentheadMessage + "</p>");
firstApprovalTime = firstApprovalTime + departmentheadTime + '</div></div>';
firstApprovalNodeUserName.after(firstApprovalTime);
firstApprovalNodeUserName.after("<p>审批意见：" + departmentheadMessage + "</p>");
// 声明用于depositoryManager节点是第几个节点（默认第二个审批节点）
let flagForBalancerNode = 2;
@ -357,6 +364,7 @@
}
layer.close(this.layerIndex);
}
});

32
target/classes/templates/pages/application/form-step-look_back.html
View File

@ -108,12 +108,11 @@
<i id="firstApprovalNodeIcon"
class="layui-icon layui-timeline-axis layui-icon-friends"></i>
<div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title">审批人:</h3>
<p th:each="d,iterStar:${record.getDepartmentheadUserIconPhoto()}">
<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">
<span th:text="${d.getKey()}"></span>
</p>
<p id="firstApprovalNodeState" th:text="'审批状态：待审批'"></p>
<span id="firstApprovalNodeUserName" th:text="${d.getKey()}"></span>
</div>
</div>
</div>
</div>
@ -205,7 +204,6 @@
IconPhotoItem += '已通过&nbsp;&nbsp;&nbsp;&nbsp;';
} else if (nodeState === "2") {
IconPhotoItem += '已驳回&nbsp;&nbsp;&nbsp;&nbsp;';
}
IconPhotoItem += record[nodeName + "Time"] + '</div></div>';
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 = '<div style="position: absolute;right: 0;top: 35px">';
// 如果部门负责人审批时间不为空
if (departmentheadPass === "1") {
firstApprovalNodeState.text("审批状态：审批通过");
firstApprovalNodeTitle.text("审批人：已通过");
firstApprovalNodeIcon.addClass("layui-icon-ok"); // 更换为审批通过
firstApprovalTime += "已通过&nbsp&nbsp&nbsp&nbsp";
} else {
firstApprovalNodeState.text("审批状态：驳回");
firstApprovalTime += "已驳回&nbsp&nbsp&nbsp&nbsp";
firstApprovalNodeTitle.text("审批人：已驳回");
firstApprovalNodeIcon.addClass("layui-icon-close"); // 更换为审批未通过
}
firstApprovalNodeState.before("<p>审批时间：" + departmentheadTime + "</p>");
firstApprovalNodeState.after("<p>审批意见：" + departmentheadMessage + "</p>");
firstApprovalTime = firstApprovalTime + departmentheadTime + '</div></div>';
firstApprovalNodeUserName.after(firstApprovalTime);
firstApprovalNodeUserName.after("<p>审批意见：" + departmentheadMessage + "</p>");
// 声明用于depositoryManager节点是第几个节点（默认第二个审批节点）
let flagForBalancerNode = 2;
@ -357,6 +364,7 @@
}
layer.close(this.layerIndex);
}
});

Write Preview
Loading…
Cancel
Save