Sfoglia il codice sorgente

计量进度,标段概况显示问题

MaiXinRong 5 anni fa
parent
commit
d793ede4da

+ 1 - 1
app/public/js/tender_list_progress.js

@@ -256,7 +256,7 @@ function getProgressHtml(total, pre, cur) {
     if (total !== 0) {
         let preP = ZhCalc.mul(ZhCalc.div(pre, total, 2), 100, 0);
         let curP = ZhCalc.mul(ZhCalc.div(cur, total, 2), 100, 0);
-        let other = Math.max(ZhCalc.div(ZhCalc.div(total, pre), cur), 0);
+        let other = Math.max(ZhCalc.sub(ZhCalc.sub(total, pre), cur), 0);
         let otherP = Math.max(100 - preP - curP, 0);
         const html = '<div class="progress">' +
             '<div class="progress-bar bg-success" style="width: ' + preP + '%;" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成:¥' + pre + '">' + preP + '%</div>' +

+ 7 - 5
app/view/stage/index.ejs

@@ -111,11 +111,13 @@
                         </div>
                         <div class="sjs-bottom">
                             <% if (!stage.readOnly) { %>
-                            <div class="d-flex justify-content-end mb-1">
-                                <a href="javascript: void(0);" class="btn btn-sm btn-outline-primary" id="edit-detail" style="display: none;">编辑</a>
-                                <a href="javascript: void(0);" class="btn btn-sm btn-outline-success" id="save-detail" style="display: none;">保存</a>
-                                <a href="javascript: void(0);" class="btn btn-sm btn-outline-secondary" id="cancel-detail" style="display: none;">取消</a>
-                            </div>
+                            <legend class="sticky-top bg-white">
+                                <div class="d-flex justify-content-end mb-1">
+                                    <a href="javascript: void(0);" class="btn btn-sm btn-outline-primary" id="edit-detail" style="display: none;">编辑</a>
+                                    <a href="javascript: void(0);" class="btn btn-sm btn-outline-success" id="save-detail" style="display: none;">保存</a>
+                                    <a href="javascript: void(0);" class="btn btn-sm btn-outline-secondary" id="cancel-detail" style="display: none;">取消</a>
+                                </div>
+                            </legend>
                             <% } %>
                             <table class="table table-sm table-bordered" id="detail-show">
                                 <tbody>

+ 1 - 1
app/view/tender/detail.ejs

@@ -77,7 +77,7 @@
                 <div class="mb-3">
                     <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>
+                        <div class="progress-bar bg-success" style="width: <%- tender.pre_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期累计完成:¥<%- ctx.helper.formatMoney(tender.pre_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>