Browse Source

报表,变更概况数据

MaiXinRong 3 years ago
parent
commit
bb572fe14e
2 changed files with 8 additions and 1 deletions
  1. 1 1
      app/service/report_memory.js
  2. 7 0
      builder_report_index_define.js

+ 1 - 1
app/service/report_memory.js

@@ -1264,7 +1264,7 @@ module.exports = app => {
         async getChangeInfo(tid, sid) {
         async getChangeInfo(tid, sid) {
             await this.ctx.service.tender.checkTender(tid);
             await this.ctx.service.tender.checkTender(tid);
             await this.ctx.service.stage.checkStage(sid);
             await this.ctx.service.stage.checkStage(sid);
-            this.changeInfo = await this.ctx.service.change.getChangeAndUsedInfo(tid);
+            this.changeInfo = await this.ctx.service.stageChange.getChangeWithUsedInfo(this.ctx.stage);
             const usedChangesId = await this.ctx.service.stageChange.getStageUsedChangeId(sid);
             const usedChangesId = await this.ctx.service.stageChange.getStageUsedChangeId(sid);
             for (const c of this.changeInfo) {
             for (const c of this.changeInfo) {
                 c.cur_used = usedChangesId.indexOf(c.cid) >= 0;
                 c.cur_used = usedChangesId.indexOf(c.cid) >= 0;

+ 7 - 0
builder_report_index_define.js

@@ -2062,6 +2062,13 @@ const stage_change_info = {
         { name: '附件名称列表', field: 'attNames', type: dataType.currency },
         { name: '附件名称列表', field: 'attNames', type: dataType.currency },
         { name: '截止本期-已执行(%)', field: 'used_ratio', type: dataType.currency },
         { name: '截止本期-已执行(%)', field: 'used_ratio', type: dataType.currency },
         { name: '本期使用', field: 'cur_used', type: dataType.int },
         { name: '本期使用', field: 'cur_used', type: dataType.int },
+        { name: '截止本期-已计量', field: 'used_tp', type: dataType.currency },
+        { name: '正变更金额', field: 'p_tp', type: dataType.currency },
+        { name: '截止本期-正变更-已计量', field: 'p_used_tp', type: dataType.currency },
+        { name: '截止本期-正变更-已执行(%)', field: 'p_used_pt', type: dataType.double },
+        { name: '负变更金额', field: 'cur_used', type: dataType.currency },
+        { name: '截止本期-负变更-已计量', field: 'cur_used', type: dataType.currency },
+        { name: '截止本期-负变更-已执行(%)', field: 'cur_used', type: dataType.double },
     ],
     ],
 };
 };
 const stage_change_info_bills = {
 const stage_change_info_bills = {