Pārlūkot izejas kodu

概况页计算式调整

laiguoran 3 gadi atpakaļ
vecāks
revīzija
b96cd8ab1f
2 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 3 3
      app/controller/tender_controller.js
  2. 1 1
      app/view/tender/detail.ejs

+ 3 - 3
app/controller/tender_controller.js

@@ -416,16 +416,16 @@ module.exports = app => {
                     tender.end_gather_tp = ctx.helper.add(tender.end_contract_tp, tender.end_qc_tp);
                     tender.pre_gather_tp = ctx.helper.add(lastStage.pre_contract_tp, lastStage.pre_qc_tp);
                     tender.yf_tp = lastStage.yf_tp;
+                    const change_tp = await ctx.service.change.getChangeTp(tender.id);
+                    tender.change_tp = change_tp;
                     tender.qc_ratio = ctx.helper.mul(ctx.helper.div(tender.end_qc_tp, ctx.tender.info.deal_param.contractPrice, 2), 100);
-                    tender.sum = ctx.helper.add(tender.total_price, tender.end_qc_tp);
+                    tender.sum = ctx.helper.add(tender.total_price, tender.change_tp);
                     tender.pre_ratio = ctx.helper.mul(ctx.helper.div(tender.pre_gather_tp, tender.sum, 2), 100);
                     tender.cur_ratio = ctx.helper.mul(ctx.helper.div(tender.gather_tp, tender.sum, 2), 100);
                     tender.other_tp = ctx.helper.sub(ctx.helper.sub(tender.sum, tender.pre_gather_tp), tender.gather_tp);
                     tender.other_ratio = Math.max(0, 100 - tender.pre_ratio - tender.cur_ratio);
                     tender.end_yf_tp = ctx.helper.add(lastStage.yf_tp, lastStage.pre_yf_tp);
                     tender.end_sf_tp = ctx.helper.add(lastStage.sf_tp, lastStage.pre_sf_tp);
-                    const change_tp = await ctx.service.change.getChangeTp(tender.id);
-                    tender.change_tp = change_tp;
                     tender.undone_tp = ctx.helper.sub(ctx.helper.sub(ctx.helper.add(tender.total_price, change_tp), tender.end_contract_tp), tender.end_qc_tp);
                     if (lastStage.status === auditConst.stage.status.uncheck) {
                         const status_name = await this.ctx.service.projectAccount.getAccountInfoById(lastStage.user_id);

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

@@ -94,7 +94,7 @@
                                     <div class="col-auto pl-0">
                                         <div class="card text-center <% if (!ctx.tender.info.display.dayMode) { %>bg-dark text-white<% } %>">
                                             <div class="card-body">
-                                                <h5 class="card-title card-big-title"><%- ctx.helper.formatMoney(ctx.helper.add(tender.total_price, tender.change_tp)) %></h5>
+                                                <h5 class="card-title card-big-title"><%- ctx.helper.formatMoney(tender.sum) %></h5>
                                                 <p class="card-text text-muted">变更后金额</p>
                                             </div>
                                         </div>