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

报表汇总表,标段信息,汇总新增的中标信息等

MaiXinRong 4 лет назад
Родитель
Сommit
02dcaf8d98
3 измененных файлов с 13 добавлено и 1 удалено
  1. 1 0
      app/service/rpt_gather_memory.js
  2. 0 1
      app/service/tender_info.js
  3. 12 0
      builder_report_index_define.js

+ 1 - 0
app/service/rpt_gather_memory.js

@@ -495,6 +495,7 @@ module.exports = app => {
             info.pay_account = tender.info.pay_account;
             info.deal_param.contractPriceWithoutZL = this.ctx.helper.sub(info.deal_param.contractPrice,
                 info.deal_param.zanLiePrice);
+            info.bid_info = tender.info.bid_info;
             return info;
         }
         async _getStageTenderInfo(stage, info) {

+ 0 - 1
app/service/tender_info.js

@@ -307,7 +307,6 @@ module.exports = app => {
             }
 
             const [billsService] = await this._getLedgerService();
-            console.log(billsService);
 
             const changeBills = await this._reCalcLedger(tenderId, billsService, newDecimal, oldDecimal);
             const [changeSj, changeSb, changeSo] = await this._reCalcStageExtra(tenderId, newDecimal, oldDecimal);

+ 12 - 0
builder_report_index_define.js

@@ -929,6 +929,18 @@ const gather_tender_info = {
         { name: '付款账号-农民工工资专用账户-分账划拨比例(%)', field: 'pay_account.worker.rate', type: dataType.str },
         { name: '付款账号-农民工工资专用账户-联系人', field: 'pay_account.worker.contact', type: dataType.str },
         { name: '付款账号-农民工工资专用账户-联系电话', field: 'pay_account.worker.phone', type: dataType.str },
+
+        { name: '合同信息-工程类别', field: 'deal_info.projectType', type: dataType.str},
+        { name: '合同信息-合同类别', field: 'deal_info.dealType', type: dataType.str},
+        { name: '合同信息-结算书编号', field: 'deal_info.finalCode', type: dataType.str},
+
+        { name: '技术参数-实际开工日期', field: 'tech_param.realStartDate', type: dataType.str},
+        { name: '技术参数-实际完工日期', field: 'tech_param.realEndDate', type: dataType.str},
+        { name: '技术参数-构造物规模', field: 'tech_param.structureScale', type: dataType.str},
+
+        { name: '中标信息-业主控制价', field: 'bid_info.controlPrice', type: dataType.currency },
+        { name: '中标信息-中标价', field: 'bid_info.bidPrice', type: dataType.currency },
+        { name: '中标信息-开标日期', field: 'bid_info.bidStartDate', type: dataType.str },
     ],
 };
 const gather_stage_pay = {