Explorar o código

修复游客bug

laiguoran %!s(int64=4) %!d(string=hai) anos
pai
achega
0debca8007
Modificáronse 2 ficheiros con 11 adicións e 5 borrados
  1. 7 1
      app/view/advance/audit_btn.ejs
  2. 4 4
      app/view/advance/detail.ejs

+ 7 - 1
app/view/advance/audit_btn.ejs

@@ -1,6 +1,10 @@
 
 <% if (ctx.advance.status === auditConst.status.uncheck) { %>
-<a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm">上报审批</a>
+    <% if (ctx.session.sessionUser.accountId === ctx.advance.uid) { %>
+        <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm">上报审批</a>
+    <% } else if (ctx.tender.isTourist) { %>
+        <button class="btn btn-outline-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="上报中">上报中</button>
+    <% } %>
 <% } else if (ctx.advance.status === auditConst.status.checking) { %>
     <% if (ctx.advance.curAuditor && ctx.advance.curAuditor.audit_id === ctx.session.sessionUser.accountId) { %>
         <a id="sp-done-btn" href="javascript: void(0);" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm">审批通过</a>
@@ -14,6 +18,8 @@
     <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-muted sp-list-btn">审批退回</a>
     <% if (ctx.session.sessionUser.accountId === ctx.advance.uid) { %>
         <a href="#sub-sp" data-target="#sub-sp" data-toggle="modal"  class="btn btn-primary btn-sm">重新上报</a>
+    <% } else if (ctx.tender.isTourist) { %>
+        <button class="btn btn-outline-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="重新上报中">重新上报中</button>
     <% } %>
 <% } else if (ctx.advance.status === auditConst.status.checkNoPre) { %>
     <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-muted sp-list-btn">审批退回</a>

+ 4 - 4
app/view/advance/detail.ejs

@@ -350,14 +350,14 @@
     const cur_uid = parseInt('<%- ctx.session.sessionUser.accountId %>');
     const decimal = parseInt('<%- decimal %>');
     const auditConst = JSON.parse('<%- JSON.stringify(auditConst) %>');
-    const advance = JSON.parse('<%- JSON.stringify(advance) %>');
-    const prevAdvance = JSON.parse('<%- JSON.stringify(prevAdvance) %>');
+    const advance = JSON.parse(unescape('<%- escape(JSON.stringify(advance)) %>'));
+    const prevAdvance = JSON.parse(unescape('<%- escape(JSON.stringify(prevAdvance)) %>'));
     const isEdited = JSON.parse('<%- isEdited %>');
     const advancePayTotal = parseFloat('<%- advancePayTotal %>');
     const preUrl = '<%- preUrl %>';
-    const fileList = JSON.parse('<%- JSON.stringify(fileList) %>') || [];
+    const fileList = JSON.parse(unescape('<%- escape(JSON.stringify(fileList)) %>')) || [];
     const whiteList = JSON.parse('<%- JSON.stringify(whiteList) %>');
-    const curAuditor = JSON.parse('<%- JSON.stringify(ctx.advance.curAuditor) %>');
+    const curAuditor = JSON.parse(unescape('<%- escape(JSON.stringify(ctx.advance.curAuditor)) %>'));
 
     // 展开历史审核记录
     $('td #fold-btn').click(function () {