新增材差数据

app/service/material.js

@@ -70,7 +70,8 @@ module.exports = app => {
 
         async checkMaterial(tid, order) {
             if (this.ctx.material) return;
-            this.ctx.material = await this.getSelectMaterial(tid, order);
+            const materials = await this.getSelectMaterial(tid, order);
+            this.ctx.material = materials[0]
         }
 
         /**

app/service/report.js

@@ -165,7 +165,7 @@ module.exports = app => {
                             runnableKey.push(filter);
                             break;
                         case 'mem_select_material_audit':
-                            runnableRst.push(service.material.getSelectMaterialAuditors(params.tender_id, params.material_order));
+                            runnableRst.push(service.reportMemory.getSelectMaterialAuditors(params.tender_id, params.material_order));
                             runnableKey.push(filter);
                             break;
                         case 'mem_material':

app/service/report_memory.js

@@ -922,8 +922,8 @@ module.exports = app => {
         }
 
         async getSelectMaterialAuditors(tid, material_order, fields) {
-            this.material = await this.ctx.service.material.checkMaterial(tid, material_order);
-            const auditors = await this.ctx.service.materialAudit.getFinalAuditGroup(this.material.id, this.ctx.material.curTimes);
+            await this.ctx.service.material.checkMaterial(tid, material_order);
+            const auditors = await this.ctx.service.materialAudit.getFinalAuditGroup(this.ctx.material.id, this.ctx.material.curTimes);
             const user = await this.ctx.service.projectAccount.getDataById(this.ctx.material.user_id);
             const result = [{
                 aid: user.id,
@@ -941,7 +941,14 @@ module.exports = app => {
         }
 
         async getMaterial(tender_id, material_order, fields) {
-            return await this.ctx.service.material.getValidMaterials(tender_id);
+            const result = await this.ctx.service.material.getValidMaterials(tender_id);
+            if (this._checkFieldsExist(fields, ['checked_time'])) {
+                for (const r of result) {
+                    const auditors = await this.ctx.service.materialAudit.getFinalAuditGroup(r.id, r.curTimes || r.times);
+                    r.checked_time = !r.curTimes ? auditors[auditors.length - 1].end_time : null;
+                }
+            }
+            return result;
         }
 
         _completeMaterialGl(materialGl) {

builder_report_index_define.js

@@ -1311,6 +1311,16 @@ const material = {
         { name: '截止上期金额', field: 'pre_tp', type: dataType.currency },
         { name: '税率', field: 'rate', type: dataType.int },
         { name: '创建时间', field: 'in_time', type: dataType.str },
+        { name: '月信息价-年月份列表', field: 'months', type: dataType.str },
+        { name: '指数本期金额', field: 'ex_tp', type: dataType.currency },
+        { name: '指数截止上期金额', field: 'ex_pre_tp', type: dataType.currency },
+        { name: '指数调差结果公式', field: 'ex_expr', type: dataType.str },
+        { name: '调差基数值json', field: 'ex_calc', type: dataType.str },
+        { name: '是否已使用材料税，默认为0', field: 'material_tax', type: dataType.int },
+        { name: '材料含税总金额', field: 'm_tax_tp', type: dataType.currency },
+        { name: '截止上期材料含税金额', field: 'm_tax_pre_tp', type: dataType.currency },
+        { name: '小数位数设置JSON', field: 'decimal', type: dataType.currency },
+        { name: '批复时间', field: 'checked_time', type: dataType.str },
 
     ],
 };