|
|
@@ -226,9 +226,9 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-success">计量审批</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a href="/tender/<%- notice.tid %>" class="text-success"><%- notice.name %></a>
|
|
|
- <a href="/tender/<%- notice.tid %>/measure/stage/<%- notice.order %>" class="text-success">第<%- notice.order %>期 </a>
|
|
|
- <%- acStage.statusString[notice.status]%>
|
|
|
+ <a href="/tender/<%- notice.tid %>" class="text-white"><%- notice.name %></a>
|
|
|
+ <a href="/tender/<%- notice.tid %>/measure/stage/<%- notice.order %>" class="text-white">第<%- notice.order %>期 </a>
|
|
|
+ <span class="<%- acStage.statusClass[notice.status] %>"><%- acStage.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -242,9 +242,9 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-secondary">材料调差</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a href="/tender/<%- notice.tid %>" class="text-success"><%- notice.name %></a>
|
|
|
- <a href="/tender/<%- notice.tid %>/measure/material/<%- notice.order %>" class="text-success">第<%- notice.order %>期 </a>
|
|
|
- <%- acMaterial.statusString[notice.status]%>
|
|
|
+ <a href="/tender/<%- notice.tid %>" class="text-white"><%- notice.name %></a>
|
|
|
+ <a href="/tender/<%- notice.tid %>/measure/material/<%- notice.order %>" class="text-white">第<%- notice.order %>期 </a>
|
|
|
+ <span class="<%- acMaterial.statusClass[notice.status] %>"><%- acMaterial.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -258,7 +258,7 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-info">台账审批</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a data-id="<%- notice.id %>"href="/tender/<%- notice.tid %>/ledger" class="text-success"><%- notice.name %></a> <%- acLedger.statusString[notice.status]%>
|
|
|
+ <a data-id="<%- notice.id %>"href="/tender/<%- notice.tid %>/ledger" class="text-white"><%- notice.name %></a> <span class="<%- acLedger.statusClass[notice.status] %>"><%- acLedger.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -272,9 +272,9 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-info">台账修订</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a href="/tender/<%- notice.tid %>" class="text-success"><%- notice.name %></a>
|
|
|
- <a href="/tender/<%- notice.tid %>/revise/info" class="text-success">台账修订(第<%- notice.corder %>次)</a>
|
|
|
- <%- acRevise.statusString[notice.status]%>
|
|
|
+ <a href="/tender/<%- notice.tid %>" class="text-white"><%- notice.name %></a>
|
|
|
+ <a href="/tender/<%- notice.tid %>/revise/info" class="text-white">台账修订(第<%- notice.corder %>次)</a>
|
|
|
+ <span class="<%- acRevise.statusClass[notice.status] %>"><%- acRevise.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -288,9 +288,9 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-danger">变更审批</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a href="/tender/<%- notice.tid %>" class="text-success"><%- notice.name %></a>
|
|
|
- <a href="/tender/<%- notice.tid %>/change/<%- notice.cid %>/information" class="text-success"><%- notice.c_code %> </a>
|
|
|
- <%- acChange.statusString[notice.status]%>
|
|
|
+ <a href="/tender/<%- notice.tid %>" class="text-white"><%- notice.name %></a>
|
|
|
+ <a href="/tender/<%- notice.tid %>/change/<%- notice.cid %>/information" class="text-white"><%- notice.c_code %> </a>
|
|
|
+ <span class="<%- acChange.statusClass[notice.status] %>"><%- acChange.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -304,9 +304,9 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-warning">预付款</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a href="/tender/<%- notice.tid %>" class="text-success"><%- notice.name %></a>
|
|
|
- <a href="/tender/<%- notice.tid %>/advance/<%- notice.vid %>/detail" class="text-success">第<%- notice.order %>期</a>
|
|
|
- <%- acAdvance.statusString[notice.status]%>
|
|
|
+ <a href="/tender/<%- notice.tid %>" class="text-white"><%- notice.name %></a>
|
|
|
+ <a href="/tender/<%- notice.tid %>/advance/<%- notice.vid %>/detail" class="text-white">第<%- notice.order %>期</a>
|
|
|
+ <span class="<%- acAdvance.statusClass[notice.status] %>"><%- acAdvance.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -442,9 +442,9 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-success">计量审批</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a href="/tender/<%- notice.tid %>" class="text-success"><%- notice.name %></a>
|
|
|
- <a href="/tender/<%- notice.tid %>/measure/stage/<%- notice.order %>" class="text-success">第<%- notice.order %>期 </a>
|
|
|
- <%- acStage.statusString[notice.status]%>
|
|
|
+ <a href="/tender/<%- notice.tid %>" class="text-white"><%- notice.name %></a>
|
|
|
+ <a href="/tender/<%- notice.tid %>/measure/stage/<%- notice.order %>" class="text-white">第<%- notice.order %>期 </a>
|
|
|
+ <span class="<%- acStage.statusClass[notice.status] %>"><%- acStage.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -458,9 +458,9 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-secondary">材料调差</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a href="/tender/<%- notice.tid %>" class="text-success"><%- notice.name %></a>
|
|
|
- <a href="/tender/<%- notice.tid %>/measure/material/<%- notice.order %>" class="text-success">第<%- notice.order %>期 </a>
|
|
|
- <%- acMaterial.statusString[notice.status]%>
|
|
|
+ <a href="/tender/<%- notice.tid %>" class="text-white"><%- notice.name %></a>
|
|
|
+ <a href="/tender/<%- notice.tid %>/measure/material/<%- notice.order %>" class="text-white">第<%- notice.order %>期 </a>
|
|
|
+ <span class="<%- acMaterial.statusClass[notice.status] %>"><%- acMaterial.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -474,7 +474,7 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-info">台账审批</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a data-id="<%- notice.id %>"href="/tender/<%- notice.tid %>/ledger" class="text-success"><%- notice.name %></a> <%- acLedger.statusString[notice.status]%>
|
|
|
+ <a data-id="<%- notice.id %>"href="/tender/<%- notice.tid %>/ledger" class="text-white"><%- notice.name %></a> <span class="<%- acLedger.statusClass[notice.status] %>"><%- acLedger.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -488,9 +488,9 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-info">台账修订</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a href="/tender/<%- notice.tid %>" class="text-success"><%- notice.name %></a>
|
|
|
- <a href="/tender/<%- notice.tid %>/revise/info" class="text-success">台账修订(第<%- notice.corder %>次)</a>
|
|
|
- <%- acRevise.statusString[notice.status]%>
|
|
|
+ <a href="/tender/<%- notice.tid %>" class="text-white"><%- notice.name %></a>
|
|
|
+ <a href="/tender/<%- notice.tid %>/revise/info" class="text-white">台账修订(第<%- notice.corder %>次)</a>
|
|
|
+ <span class="<%- acRevise.statusClass[notice.status] %>"><%- acRevise.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -504,9 +504,9 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-danger">变更审批</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a href="/tender/<%- notice.tid %>" class="text-success"><%- notice.name %></a>
|
|
|
- <a href="/tender/<%- notice.tid %>/change/<%- notice.cid %>/information" class="text-success"><%- notice.c_code %> </a>
|
|
|
- <%- acChange.statusString[notice.status]%>
|
|
|
+ <a href="/tender/<%- notice.tid %>" class="text-white"><%- notice.name %></a>
|
|
|
+ <a href="/tender/<%- notice.tid %>/change/<%- notice.cid %>/information" class="text-white"><%- notice.c_code %> </a>
|
|
|
+ <span class="<%- acChange.statusClass[notice.status] %>"><%- acChange.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -520,9 +520,9 @@
|
|
|
<div class="row">
|
|
|
<div class="col-2"><span class="badge badge-warning">预付款</span></div>
|
|
|
<div class="col-10 text-white">
|
|
|
- <a href="/tender/<%- notice.tid %>" class="text-success"><%- notice.name %></a>
|
|
|
- <a href="/tender/<%- notice.tid %>/advance/<%- notice.vid %>/detail" class="text-success">第<%- notice.order %>期</a>
|
|
|
- <%- acAdvance.statusString[notice.status]%>
|
|
|
+ <a href="/tender/<%- notice.tid %>" class="text-white"><%- notice.name %></a>
|
|
|
+ <a href="/tender/<%- notice.tid %>/advance/<%- notice.vid %>/detail" class="text-white">第<%- notice.order %>期</a>
|
|
|
+ <span class="<%- acAdvance.statusClass[notice.status] %>"><%- acAdvance.statusString[notice.status]%></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<p class="mt-1 mb-0 text-white"><%- notice.su_name %><small class="ml-1 text-muted"><%- (notice.su_role ? '- ' + notice.su_role : '') %></small>
|
|
|
@@ -1279,6 +1279,7 @@
|
|
|
option1_is_tender = true;
|
|
|
}
|
|
|
console.log(tenderList);
|
|
|
+ console.log(_.differenceWith(tenders, tenderList, _.isEqual));
|
|
|
const chart_option4_data = [];
|
|
|
for(const t of tenderList) {
|
|
|
total_price = ZhCalc.add(total_price, t.total_price);
|
