浏览代码

fix: 修复计量台账sp-list弹窗没有加载的bug

lanjianrong 4 年之前
父节点
当前提交
7d3c93bb33
共有 2 个文件被更改,包括 6 次插入5 次删除
  1. 1 1
      app/view/stage/audit_btn.ejs
  2. 5 4
      app/view/stage/audit_modal.ejs

+ 1 - 1
app/view/stage/audit_btn.ejs

@@ -9,7 +9,7 @@
             <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm btn-block">审批中</a>
         <% } %>
     <% } else if (ctx.stage.status === auditConst.status.checked) { %>
-        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm btn-block">审批完成</a>
+        <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm btn-block sp-list-btn">审批完成</a>
     <% } else if (ctx.stage.status === auditConst.status.checkNo) { %>
         <a href="#sp-list"  data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm btn-block text-muted sp-list-btn">审批退回</a>
         <% if (ctx.session.sessionUser.accountId === ctx.stage.user_id) { %>

+ 5 - 4
app/view/stage/audit_modal.ejs

@@ -62,12 +62,15 @@
         </div>
     </div>
     <% } %>
+
+<% } %>
+<% if(ctx.stage && (ctx.stage !== auditConst.status.uncheck)) { %>
     <!--审批流程/结果-->
     <div class="modal fade" id="sp-list" data-backdrop="static">
         <div class="modal-dialog modal-lg" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title"><%- ctx.stage.status === auditConst.status.checking ? '审批流程' : '重新上报' %></h5>
+                    <h5 class="modal-title">审批流程</h5>
                 </div>
                 <div class="modal-body">
                     <div class="row">
@@ -250,7 +253,6 @@
         </div>
     </div>
 <% } %>
-
 <% if (ctx.stage && (ctx.stage.status === auditConst.status.checking || ctx.stage.status === auditConst.status.checkNoPre)) { %>
     <% if (ctx.stage.curAuditor && ctx.stage.curAuditor.aid === ctx.session.sessionUser.accountId) { %>
     <!--审批通过-->
@@ -796,8 +798,7 @@
 </script>
 <% if (ctx.stage && (ctx.session.sessionUser.accountId === ctx.stage.user_id && (ctx.stage.status === auditConst.status.uncheck || ctx.stage.status === auditConst.status.checkNo))) { %>
 <script>
-    // const accountList = JSON.parse('<%- JSON.stringify(accountList ) %>');
-    const accountGroup = JSON.parse('<%- JSON.stringify(accountGroup  ) %>');
+    const accountGroup = JSON.parse('<%- JSON.stringify(accountGroup) %>');
 </script>
 <% } %>
 <script>