Browse Source

version3.1

liwx
liwenxuan 2 years ago
parent
commit
3185529461
  1. 2
      src/main/resources/application.yml
  2. 6
      src/main/resources/redisson-config.yml
  3. 10
      src/main/resources/templates/pages/application/application-review.html

2
src/main/resources/application.yml

@ -1,5 +1,5 @@
spring:
profiles:
active: prod
active: test
server:
port: 11111

6
src/main/resources/redisson-config.yml

@ -1,8 +1,8 @@
#Redisson配置
singleServerConfig:
#address: "redis://127.0.0.1:6379" #内网,本地
address: "redis://172.20.5.57:6379" #外网
password: "Redis+brngJ3U19@8_Z2^7a" #外网
address: "redis://127.0.0.1:6379" #内网,本地
#address: "redis://172.20.5.57:6379" #外网
#password: "Redis+brngJ3U19@8_Z2^7a" #外网
clientName: null
database: 15 #选择使用哪个数据库0~15
idleConnectionTimeout: 10000

10
src/main/resources/templates/pages/application/application-review.html

@ -427,26 +427,26 @@
// 配置平衡岗节点(第二个节点)
if (balancePoster !== "" && departmentheadPass === "1") {
//liwenxuan 测试
alert('配置平衡岗节点(第二个节点)')
//alert('配置平衡岗节点(第二个节点)')
let nodeName = "balancePoster";
let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
let approvalNode = createApprovalNode(nodeName, record, timeLineStartItemForId);
// 如果需要平衡岗且第一个节点审批完成
if (balancePosterPass === "3") {
alert('balancePosterPass === "3"')
//alert('balancePosterPass === "3"')
$("#review").hide();
$("#reviewForBalance").show();
flagForBalancerNode = -1; // 不展示
} else {
if (balancePosterPass === "1") {
alert('balancePosterPass === "1"')
//alert('balancePosterPass === "1"')
// 如果平衡岗审批通过
$("#review").hide();
$("#reviewForBalanceM").show();
flagForBalancerNode = 3; // 为第三个节点
} else if (balancePosterPass === "2") {
alert('balancePosterPass === "2"')
//('balancePosterPass === "2"')
// 如果平衡岗未审批通过
flagForBalancerNode = -1; // 不展示
}
@ -509,7 +509,7 @@
// 配置出库人员节点
if (departmentheadPass === "1" && (depositoryManagerPass === "4" || depositoryManagerPass === "1")) {
alert('483')
//alert('483')
let completeOutTime = record.outTime;
let pass = record.pass;
let approvalNodeForCompleteOutUserName = '<h3 class="layui-timeline-title">出库人员:';

Loading…
Cancel
Save