Merge remote-tracking branch 'remotes/origin/dev' into uat

app/view/report/index.ejs

@@ -133,7 +133,7 @@
                                 <div class="panel-body">
                                     <button class="btn btn-outline-primary btn-sm" type="button" data-toggle="modal" data-target="#eSignature" onclick="rptSignatureHelper.resetESignature(zTreeOprObj.currentRptPageRst, 'eSignatureBodyDiv'); rptSignatureHelper.checkAndShowCrossTendersESignature();">
                                         <i class="fa fa-pencil"></i><br>
-                                        电子签名
+                                        签名
                                     </button>
                                 </div>
                             </div>

app/view/tender/tender_sub_menu.ejs

@@ -15,7 +15,7 @@
             </ul>
         </div>
         <div class="nav-box">
-            <h3><i class="fa fa-list-alt fa-fw"></i> 0号台账<span class="float-right"><i class="fa fa-angle-down text-muted"></i></span></h3>
+            <h3><i class="fa fa-list-alt fa-fw"></i> 0号台账</h3>
             <ul class="nav-list list-unstyled sub-list">
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/ledger') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/ledger"><span>台账分解</span></a></li>
                 <% if (ctx.tender.data.ledger_status !== ctx.tender.auditLedgerConst.status.uncheck) { %>
@@ -27,7 +27,7 @@
             </ul>
         </div>
         <div class="nav-box">
-            <h3><i class="fa fa-calendar-check-o fa-fw"></i> 计量支付<span class="float-right"><i class="fa fa-angle-down text-muted"></i></span></h3>
+            <h3><i class="fa fa-calendar-check-o fa-fw"></i> 计量支付</h3>
             <ul class="nav-list list-unstyled sub-list">
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/measure/stage"><span>各期计量</span></a></li>
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/compare') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/measure/compare"><span>多期比较</span></a></li>
@@ -45,7 +45,7 @@
         </div>
         <% if (ctx.session.sessionProject.page_show !== null && parseInt(ctx.session.sessionProject.page_show.xxjd) === 1 && (ctx.tender.schedule_permission !== 0 || ctx.tender.isTourist)) { %>
         <div class="nav-box">
-            <h3><i class="fa fa-bar-chart fa-fw"></i> 投资进度<span class="float-right"><i class="fa fa-angle-down text-muted"></i></span></h3>
+            <h3><i class="fa fa-bar-chart fa-fw"></i> 投资进度</h3>
             <ul class="nav-list list-unstyled sub-list">
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/schedule' || ctx.url === '/tender/' + ctx.tender.id + '/schedule/ledger') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/schedule"><span>进度概况</span></a></li>
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/schedule/plan') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/schedule/plan"><span>计划进度</span></a></li>

app/view/tender/tender_sub_mini_menu.ejs

@@ -17,7 +17,7 @@
             </ul>
         </div>
         <div class="nav-box">
-            <h3><i class="fa fa-list-alt fa-fw"></i> 0号台账<span class="float-right"><i class="fa fa-angle-down text-muted"></i></span></h3>
+            <h3><i class="fa fa-list-alt fa-fw"></i> 0号台账</h3>
             <ul class="nav-list list-unstyled sub-list">
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/ledger') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/ledger"><span>台账分解</span></a></li>
                 <% if (ctx.tender.data.ledger_status !== ctx.tender.auditLedgerConst.status.uncheck) { %>
@@ -29,7 +29,7 @@
             </ul>
         </div>
         <div class="nav-box">
-            <h3><i class="fa fa-calendar-check-o fa-fw"></i> 计量支付<span class="float-right"><i class="fa fa-angle-down text-muted"></i></span></h3>
+            <h3><i class="fa fa-calendar-check-o fa-fw"></i> 计量支付</h3>
             <ul class="nav-list list-unstyled sub-list">
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/measure/stage"><span>各期计量</span></a></li>
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/compare') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/measure/compare"><span>多期比较</span></a></li>
@@ -47,7 +47,7 @@
         </div>
         <% if (ctx.session.sessionProject.page_show !== null && parseInt(ctx.session.sessionProject.page_show.xxjd) === 1 && (ctx.tender.schedule_permission !== 0 || ctx.tender.isTourist)) { %>
             <div class="nav-box">
-                <h3><i class="fa fa-bar-chart fa-fw"></i> 投资进度<span class="float-right"><i class="fa fa-angle-down text-muted"></i></span></h3>
+                <h3><i class="fa fa-bar-chart fa-fw"></i> 投资进度</h3>
                 <ul class="nav-list list-unstyled sub-list">
                     <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/schedule' || ctx.url === '/tender/' + ctx.tender.id + '/schedule/ledger') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/schedule"><span>进度概况</span></a></li>
                     <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/schedule/plan') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/schedule/plan"><span>计划进度</span></a></li>