记得上下班打卡 | git大法好,push需谨慎

Commit e858deb2 authored by 姜秀龙's avatar 姜秀龙

Merge branch 'refs/heads/jxl-260205-damai' into container-test

parents 917148af ab2b517e
...@@ -385,6 +385,7 @@ ...@@ -385,6 +385,7 @@
const auditStatus = '[[${kylinPerformanceMisVo.auditStatus}]]'; const auditStatus = '[[${kylinPerformanceMisVo.auditStatus}]]';
const status = '[[${kylinPerformanceMisVo.status}]]'; const status = '[[${kylinPerformanceMisVo.status}]]';
const fieldStatus = '[[${kylinPerformanceMisVo.fieldAuditStatus}]]'; const fieldStatus = '[[${kylinPerformanceMisVo.fieldAuditStatus}]]';
const type = '[[${kylinPerformanceMisVo.type}]]';
const endTime = new Date('[[${kylinPerformanceMisVo.timeEnd}]]'.replaceAll("\"", "")).valueOf(); const endTime = new Date('[[${kylinPerformanceMisVo.timeEnd}]]'.replaceAll("\"", "")).valueOf();
const now = new Date().valueOf(); const now = new Date().valueOf();
// const et = new Date(endTime.replaceAll("\"", "")).valueOf(); // const et = new Date(endTime.replaceAll("\"", "")).valueOf();
...@@ -427,7 +428,7 @@ ...@@ -427,7 +428,7 @@
} }
var damaiFlag = [[${@permission.hasPermi('kylin:performances:damai')}]]; var damaiFlag = [[${@permission.hasPermi('kylin:performances:damai')}]];
if (damaiFlag == "hidden") { if (damaiFlag == "hidden" || type != 101) {
document.getElementById("li-tab-5").style.display = "none"; document.getElementById("li-tab-5").style.display = "none";
} }
...@@ -443,7 +444,7 @@ ...@@ -443,7 +444,7 @@
var orderImportFlag = [[${@permission.hasPermi('kylin:performances:orderImport')}]]; var orderImportFlag = [[${@permission.hasPermi('kylin:performances:orderImport')}]];
if (orderImportFlag == "hidden") { if (orderImportFlag == "hidden") {
document.getElementById("li-tab-8").style.display = "none"; document.getElementById("li-tab-8"). style.display = "none";
} }
var payTxt = [[${@permission.hasPermi('kylin:performances:payTxt')}]]; var payTxt = [[${@permission.hasPermi('kylin:performances:payTxt')}]];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment