wap修复

app/view/wap/dashboard.ejs

@@ -47,12 +47,12 @@
                         <div class="d-flex justify-content-between"><span>第<%- audit.order %>期</span><span><%- audit.s_time %></span></div>
                         <div class="my-2">
                             <table class="table table-sm table-bordered">
-                                <tr><th>本期合同计量</th><td class="text-right"><%- audit.contract_tp ? audit.contract_tp : '' %></td></tr>
-                                <tr><th>本期数量变更计量</th><td class="text-right"><%- audit.qc_tp ? audit.qc_tp : '' %></td></tr>
-                                <tr><th>本期完成计量</th><td class="text-right"><%- audit.gather_tp ? audit.gather_tp : '' %></td></tr>
-                                <tr><th>截止上期完成计量</th><td class="text-right"><%- audit.pre_gather_tp ? audit.pre_gather_tp : '' %></td></tr>
-                                <tr><th>截止本期完成计量</th><td class="text-right"><%- audit.end_gather_tp ? audit.end_gather_tp : '' %></td></tr>
-                                <tr><th>本期应付</th><td class="text-right"><%- audit.yf_tp ? audit.yf_tp : '' %></td></tr>
+                                <tr><th>本期合同计量</th><td class="text-right"><%- audit.contract_tp ? audit.contract_tp : 0 %></td></tr>
+                                <tr><th>本期数量变更计量</th><td class="text-right"><%- audit.qc_tp ? audit.qc_tp : 0 %></td></tr>
+                                <tr><th>本期完成计量</th><td class="text-right"><%- audit.gather_tp ? audit.gather_tp : 0 %></td></tr>
+                                <tr><th>截止上期完成计量</th><td class="text-right"><%- audit.pre_gather_tp ? audit.pre_gather_tp : 0 %></td></tr>
+                                <tr><th>截止本期完成计量</th><td class="text-right"><%- audit.end_gather_tp ? audit.end_gather_tp : 0 %></td></tr>
+                                <tr><th>本期应付</th><td class="text-right"><%- audit.yf_tp ? audit.yf_tp : 0 %></td></tr>
                             </table>
                         </div>
                         <div class="">

app/view/wap/tender.ejs

@@ -22,7 +22,8 @@
     <!--顶部-->
     <nav class="fixed-top bg-dark">
         <div class="my-2 d-flex justify-content-between">
-            <span class="text-white ml-3"><a href="/wap/list" class="mr-2 text-white"><i class="fa fa-chevron-left"></i></a>标段概况</span>
+            <span class="text-white ml-3"><a href="/wap/list" class="mr-2 text-white show-loading"><i class="fa fa-chevron-left"></i>标段概况</a></span>
+            <span class="text-white text-truncate text-center" style="width:150px"><%- tender.name %></span>
             <div class="mr-3">
                 <div class="dropdown">
                     <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown">
@@ -54,9 +55,9 @@
                 <!--图表-->
                 <div class="card mb-3 mr-1 mt-3">
                     <div class="card-body">
-                        <h5 class="card-title">月进度表</h5>
+                        <h5 class="card-title">期进度表</h5>
                         <div style="overflow-x:scroll;padding-bottom: 10px">
-                            <div id="chartContainer3" style="height: 300px; width: 250%;">
+                            <div id="chartContainer4" style="height: 300px; width: 320%;">
                             </div>
                         </div>
                         <p class="text-center text-muted m-0">左右滑动</p>
@@ -64,9 +65,9 @@
                 </div>
                 <div class="card mb-3 mr-1">
                     <div class="card-body">
-                        <h5 class="card-title">期进度表</h5>
+                        <h5 class="card-title">月进度表</h5>
                         <div style="overflow-x:scroll;padding-bottom: 10px">
-                            <div id="chartContainer4" style="height: 300px; width: 250%;">
+                            <div id="chartContainer3" style="height: 300px; width: 320%;">
                             </div>
                         </div>
                         <p class="text-center text-muted m-0">左右滑动</p>
@@ -279,7 +280,7 @@
                 </div>
                 <div class="alert alert-warning">
                     <div class="custom-control custom-radio custom-control-inline">
-                        <input type="radio" id="inlineRadio1" name="checkType" class="custom-control-input" value="<%- auditConst.status.checkNo %>" <% if (audit.order === 1 || audit.aid === stage.auditors[0].aid) { %>checked<% } %>>
+                        <input type="radio" id="customRadioInline1" name="checkType" class="custom-control-input" value="<%- auditConst.status.checkNo %>" <% if (audit.order === 1 || audit.aid === stage.auditors[0].aid) { %>checked<% } %>>
                         <label class="custom-control-label" for="customRadioInline1">退回上报 <%- stage.user.name %></label>
                     </div>
                     <% if (audit.order > 1 && audit.aid !== stage.auditors[0].aid) { %>