Merge remote-tracking branch 'remotes/origin/dev' into uat

app/controller/report_controller.js

@@ -1015,7 +1015,6 @@ async function getMultiRptsCommon(ctx, params, outputType, baseDir) {
             let customSelect = rptTpl[JV.NODE_CUSTOM_DEFINE] && rptTpl[JV.NODE_CUSTOM_DEFINE][JV.NODE_CUS_AUDIT_SELECT].enable
                 ? await ctx.service.rptCustomDefine.getCustomDefine(params.tender_id, params.stage_id, rptTpl.id)
                 : await ctx.service.rptCustomDefine.getCustomDefine(params.tender_id, -1, rptTpl.id);
-            console.log(rptTpl[JV.NODE_CUSTOM_DEFINE],customSelect);
             if (rptTpl[JV.NODE_CUSTOM_DEFINE] && rptTpl[JV.NODE_CUSTOM_DEFINE][JV.NODE_CUS_CHANGE_SELECT] && rptTpl[JV.NODE_CUSTOM_DEFINE][JV.NODE_CUS_CHANGE_SELECT].enable) {
                 customSelect = { tid: params.tender_id, rid: params.rpt_tpl_id, sid: -1, change_select: params.customSelect[tplIdx].change_select };
             }

app/service/change_audit_list.js

@@ -367,11 +367,11 @@ module.exports = app => {
          * @param {tid} tid - 标段id
          * @return {void}
          */
-        async getChangeAuditBills(tid) {
+        async getChangeAuditBills(tid, onlyChecked) {
             const sql = 'SELECT cb.*' +
                 '  FROM ' + this.tableName + ' cb' +
                 '  LEFT JOIN ' + this.ctx.service.change.tableName + ' c ON cb.cid = c.cid' +
-                '  WHERE c.tid = ? and c.status = 3' +
+                '  WHERE c.tid = ? ' + (onlyChecked ? 'and c.status = 3' : '') +
                 '  ORDER BY cb.cid, cb.code';
             const param = [tid];
             const result = await this.db.query(sql, param);

app/service/report_memory.js

@@ -751,7 +751,7 @@ module.exports = app => {
                     });
                     c.attNames = names.join('\n');
                 }
-                const changeBills = await this.ctx.service.changeAuditList.getChangeAuditBills(tid);
+                const changeBills = await this.ctx.service.changeAuditList.getChangeAuditBills(tid, this.ctx.session.sessionProject.page_show.isOnlyChecked);
                 for (const d of changeBills) {
                     d.o_qty = d.oamount;
                     d.o_tp = this.ctx.helper.mul(d.o_qty, d.unit_price, decimal.tp);
@@ -760,7 +760,7 @@ module.exports = app => {
                     d.s_qty = d.samount ? parseFloat(d.samount) : 0;
                     d.s_tp = this.ctx.helper.mul(d.s_qty, d.unit_price, decimal.tp);
 
-                    const auditAmount = d.audit_amount.split(',');
+                    const auditAmount = d.audit_amount ? d.audit_amount.split(',') : [];
                     const relaChange = ctx.helper._.find(change, {cid: d.cid});
                     for (const [i, aa] of auditAmount.entries()) {
                         const amountField = 'qty_' + (i+1), tpField = 'tp_' + (i+1);
@@ -1264,7 +1264,7 @@ module.exports = app => {
         async getChangeInfo(tid, sid) {
             await this.ctx.service.tender.checkTender(tid);
             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);
             for (const c of this.changeInfo) {
                 c.cur_used = usedChangesId.indexOf(c.cid) >= 0;

builder_report_index_define.js

@@ -2062,6 +2062,13 @@ const stage_change_info = {
         { name: '附件名称列表', field: 'attNames', type: dataType.currency },
         { name: '截止本期-已执行(%)', field: 'used_ratio', type: dataType.currency },
         { 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 = {