Browse Source

汇总,标段信息,汇总标段属性部分数据

MaiXinRong 5 năm trước cách đây
mục cha
commit
cc1e8362cb
2 tập tin đã thay đổi với 61 bổ sung3 xóa
  1. 5 0
      app/service/rpt_gather_memory.js
  2. 56 3
      builder_report_index_define.js

+ 5 - 0
app/service/rpt_gather_memory.js

@@ -445,6 +445,11 @@ module.exports = app => {
                 info.tp = sum.total_price;
                 info.deal_tp = sum.deal_tp;
             }
+            info.deal_info = tender.info.deal_info;
+            info.construction_unit = tender.info.construction_unit;
+            info.tech_param = tender.info.tech_param;
+            info.deal_param = tender.info.deal_param;
+            info.pay_account = tender.info.pay_account;
             return info;
         }
         async _getStageTenderInfo(stage, info) {

+ 56 - 3
builder_report_index_define.js

@@ -790,11 +790,64 @@ const gather_tender_info = {
         { name: '截止本期-变更-金额', field: 'end_qc_tp', type: dataType.currency },
         { name: '截止本期-完成-金额', field: 'end_gather_tp', type: dataType.currency },
 
-        { name: '截止上期-应付', field: 'pre_yf', type: dataType.currency },
-        { name: '本期-应付', field: 'yf', type: dataType.currency },
-        { name: '截止本期-应付', field: 'end_yf', type: dataType.currency },
+        { name: '截止上期-应付', field: 'pre_yf_tp', type: dataType.currency },
+        { name: '本期-应付', field: 'yf_tp', type: dataType.currency },
+        { name: '截止本期-应付', field: 'end_yf_tp', type: dataType.currency },
 
         { name: '签约清单-金额', field: 'deal_bills_tp', type: dataType.currency },
+
+        { name: '合同信息-建设项目名称', field: 'deal_info.buildName', type: dataType.str},
+        { name: '合同信息-合同编号', field: 'deal_info.dealCode', type: dataType.str},
+        { name: '合同信息-合同名称', field: 'deal_info.dealName', type: dataType.str},
+
+        { name: '参建单位-建设单位-单位名称', field: 'construction_unit.build.company', type: dataType.str},
+        { name: '参建单位-建设单位-法人代表', field: 'construction_unit.build.corporation', type: dataType.str},
+        { name: '参建单位-建设单位-签订日期', field: 'construction_unit.build.date', type: dataType.str},
+
+        { name: '参建单位-承包单位1-单位名称', field: 'construction_unit.contract1.company', type: dataType.str},
+        { name: '参建单位-承包单位1-法人代表', field: 'construction_unit.contract1.corporation', type: dataType.str},
+        { name: '参建单位-承包单位1-签订日期', field: 'construction_unit.contract1.date', type: dataType.str},
+
+        { name: '参建单位-承包单位2-单位名称', field: 'construction_unit.contract2.company', type: dataType.str},
+        { name: '参建单位-承包单位2-法人代表', field: 'construction_unit.contract2.corporation', type: dataType.str},
+        { name: '参建单位-承包单位2-签订日期', field: 'construction_unit.contract2.date', type: dataType.str},
+
+        { name: '参建单位-监理单位1-单位名称', field: 'construction_unit.supervision1.company', type: dataType.str},
+        { name: '参建单位-监理单位1-法人代表', field: 'construction_unit.supervision1.corporation', type: dataType.str},
+        { name: '参建单位-监理单位1-签订日期', field: 'construction_unit.supervision1.date', type: dataType.str},
+
+        { name: '参建单位-监理单位2-单位名称', field: 'construction_unit.supervision2.company', type: dataType.str},
+        { name: '参建单位-监理单位2-法人代表', field: 'construction_unit.supervision2.corporation', type: dataType.str},
+        { name: '参建单位-监理单位2-签订日期', field: 'construction_unit.supervision2.date', type: dataType.str},
+
+        { name: '技术参数-公路等级', field: 'tech_param.loadLevel', type: dataType.int},
+        { name: '技术参数-长度(KM)', field: 'tech_param.loadLength', type: dataType.int},
+        { name: '技术参数-起始桩号', field: 'tech_param.startPeg', type: dataType.str},
+        { name: '技术参数-终止桩号', field: 'tech_param.endPeg', type: dataType.str},
+        { name: '技术参数-车道数', field: 'tech_param.laneCount', type: dataType.int},
+        { name: '技术参数-合同工期', field: 'tech_param.dealPeriod', type: dataType.str},
+        { name: '技术参数-开工日期', field: 'tech_param.startDate', type: dataType.str},
+        { name: '技术参数-计划完工日期', field: 'tech_param.planEndDate', type: dataType.str},
+
+        { name: '合同参数-签约合同价', field: 'deal_param.contractPrice', type: dataType.currency },
+        { name: '合同参数-暂列金额', field: 'deal_param.zanLiePrice', type: dataType.currency },
+        { name: '合同参数-签约合同价(不含暂列金额)', field: 'deal_param.contractPriceWithoutZL', type: dataType.currency },
+        { name: '合同参数-签约开工预付款', field: 'deal_param.startAdvance', type: dataType.currency },
+        { name: '合同参数-签约材料预付款', field: 'deal_param.materialAdvance', type: dataType.currency },
+
+        { name: '付款账号-工程款账户-开户名称', field: 'pay_account.project.name', type: dataType.str },
+        { name: '付款账号-工程款账户-开户银行', field: 'pay_account.project.bank', type: dataType.str },
+        { name: '付款账号-工程款账户-开户账号', field: 'pay_account.project.account', type: dataType.str },
+        { name: '付款账号-工程款账户-分账划拨比例(%)', field: 'pay_account.project.rate', type: dataType.str },
+        { name: '付款账号-工程款账户-联系人', field: 'pay_account.project.contact', type: dataType.str },
+        { name: '付款账号-工程款账户-联系电话', field: 'pay_account.project.phone', type: dataType.str },
+
+        { name: '付款账号-农民工工资专用账户-开户名称', field: 'pay_account.worker.name', type: dataType.str },
+        { name: '付款账号-农民工工资专用账户-开户银行', field: 'pay_account.worker.bank', type: dataType.str },
+        { name: '付款账号-农民工工资专用账户-开户账号', field: 'pay_account.worker.account', type: dataType.str },
+        { 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 },
     ],
 };
 const gather_stage_pay = {