Browse Source

标段概况页更新

laiguoran 3 years ago
parent
commit
432cd2976d
3 changed files with 24 additions and 7 deletions
  1. 1 0
      app/controller/tender_controller.js
  2. 1 1
      app/public/css/main.css
  3. 22 6
      app/view/tender/detail.ejs

+ 1 - 0
app/controller/tender_controller.js

@@ -425,6 +425,7 @@ module.exports = app => {
                     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/public/css/main.css

@@ -1355,7 +1355,7 @@ overflow-y: auto;
   height: 300px;
 }
 .card-big-title{
-  font-size: 1.75rem;
+  font-size: 1.23rem;
   margin-bottom: .30rem;
   position: relative;
 }

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

@@ -75,7 +75,7 @@
                         <div class="row ml-1 mb-3">
                             <div class="col-12">
                                 <div class="row">
-                                    <div class="col-2 pl-0">
+                                    <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(tender.total_price) %></h5>
@@ -83,7 +83,23 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-2 pl-0">
+                                    <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(tender.change_tp) %></h5>
+                                                <p class="card-text text-muted">已批复变更金额</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <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>
+                                                <p class="card-text text-muted">变更后金额</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <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(tender.end_qc_tp) %> <small class="text-danger"  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="占合同比例"><%- tender.qc_ratio %>%</small></h5>
@@ -91,7 +107,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-2 pl-0">
+                                    <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(tender.gather_tp) %></h5>
@@ -99,7 +115,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-2 pl-0">
+                                    <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(tender.end_gather_tp) %></h5>
@@ -107,7 +123,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-2 pl-0">
+                                    <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(tender.pre_gather_tp) %></h5>
@@ -115,7 +131,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-2 pl-0">
+                                    <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(tender.yf_tp) %></h5>