Procházet zdrojové kódy

汇总多期,新增本期批注指标

MaiXinRong před 11 měsíci
rodič
revize
99f7c70e17

+ 2 - 2
app/service/revise_audit.js

@@ -440,8 +440,8 @@ module.exports = app => {
          */
         async start(revise, times = 1) {
             const audits = await this.getAllDataByCondition({ where: { rid: revise.id, times, audit_order: 1 } });
-            if (!audits.length === 0) {
-                if(this.ctx.tender.info.shenpi.revise === shenpiConst.sp_status.gdspl) {
+            if (audits.length === 0) {
+                if (this.ctx.tender.info.shenpi.revise === shenpiConst.sp_status.gdspl) {
                     throw '请联系管理员添加审批人';
                 } else {
                     throw '请先选择审批人,再上报数据';

+ 3 - 3
app/service/rpt_stage_sum_memory.js

@@ -53,8 +53,8 @@ module.exports = app => {
                     : await this.ctx.service.stageBills.getLastestStageData2(this.ctx.tender.id, stage.id);
                 const bpcStage = await this.ctx.service.stageBillsPc.getAllDataByCondition({ where: { sid: stage.id } });
                 this.ctx.helper.assignRelaData(billsData, [
-                    {data: curStage, fields: ['contract_qty', 'contract_tp', 'contract_expr', 'qc_qty', 'qc_tp'], prefix: prefix, relaId: 'lid', defaultData},
-                    {data: bpcStage, fields: ['contract_pc_tp', 'qc_pc_tp', 'pc_tp'], prefix: prefix, relaId: 'lid', defaultData},
+                    {data: curStage, fields: ['contract_qty', 'contract_tp', 'contract_expr', 'qc_qty', 'qc_tp', 'postil'], prefix: prefix, relaId: 'lid', defaultData},
+                    {data: bpcStage, fields: ['contract_pc_tp', 'qc_pc_tp', 'pc_tp', 'postil'], prefix: prefix, relaId: 'lid', defaultData},
                 ]);
             }
 
@@ -104,7 +104,7 @@ module.exports = app => {
                     ? await this.ctx.service.stagePos.getAuditorStageData2(this.ctx.tender.id, stage.id, stage.curTimes, stage.curOrder)
                     : await this.ctx.service.stagePos.getLastestStageData2(this.ctx.tender.id, stage.id);
                 this.ctx.helper.assignRelaData(posData, [
-                    {data: curStage, fields: ['contract_qty', 'qc_qty'], prefix: prefix, relaId: 'pid', defaultData},
+                    {data: curStage, fields: ['contract_qty', 'qc_qty', 'postil'], prefix: prefix, relaId: 'pid', defaultData},
                 ]);
             }
             posData.forEach(x => {