Просмотр исходного кода

标段概况,完善进度条

MaiXinRong 5 лет назад
Родитель
Сommit
9cb143e1d2
2 измененных файлов с 7 добавлено и 1 удалено
  1. 1 1
      app/service/stage_pos.js
  2. 6 0
      app/view/tender/detail.ejs

+ 1 - 1
app/service/stage_pos.js

@@ -230,7 +230,7 @@ module.exports = app => {
             const transaction = await this.db.beginTransaction();
             try {
                 for (const d of datas) {
-                    if (d.sgfh_qty || d.qtcl_qty || d.sjcl_qty || d.contract_qty || d.qc_qty) {
+                    if (d.sgfh_qty !== undefined || d.qtcl_qty !== undefined || d.sjcl_qty !== undefined || d.contract_qty !== undefined || d.qc_qty !== undefined) {
                         if (!bills || bills.id !== data.lid) {
                             bills = await this.ctx.service.ledger.getDataById(d.lid);
                             precision = this.ctx.helper.findPrecision(this.ctx.tender.info.precision, bills.unit);

+ 6 - 0
app/view/tender/detail.ejs

@@ -75,9 +75,15 @@
             <!--进度条-->
             <div class="mb-5">
                 <div class="progress">
+                    <% if (tender.pre_ratio > 0) { %>
                     <div class="progress-bar bg-success" style="width: <%- tender.pre_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期累计完成:¥<%- ctx.helper.formatMoney(tender.end_gather_tp) %>"><%- tender.pre_ratio %>%</div>
+                    <% } %>
+                    <% if (tender.cur_ratio > 0) { %>
                     <div class="progress-bar bg-info" style="width: <%- tender.cur_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成:¥<%- ctx.helper.formatMoney(tender.gather_tp) %>"><%- tender.cur_ratio %>%</div>
+                    <% } %>
+                    <% if (tender.other_ratio > 0) { %>
                     <div class="progress-bar bg-gray" style="width: <%- tender.other_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成:¥<%- ctx.helper.formatMoney(tender.other_tp) %>"><%- tender.other_ratio %>%</div>
+                    <% } %>
                 </div>
             </div>
             <ul class="nav nav-tabs">