未审核通过时不进行报表签署

app/controller/report_controller.js

@@ -122,7 +122,7 @@ module.exports = app => {
                 // console.log('get the template!');
                 const pageRst = await getAllPagesCommon(ctx, rptTpl, params, JV.PAGING_OPTION_NORMAL, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir);
                 // console.log(pageRst);
-                const roleRel = await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_tpl_id);
+                const roleRel = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_tpl_id)) : [];
                 const stgAudit = await ctx.service.stageAudit.getStageAudit(params.stage_id, params.stage_times);
                 // console.log('after role stage!');
                 // console.log(roleRel);
@@ -132,6 +132,7 @@ module.exports = app => {
                 // ctx.body = { data: { msg: 'test the network' } };
                 ctx.status = 201;
             } catch (ex) {
+                console.log(ex);
                 this.setMessage(ex.toString(), this.messageType.ERROR);
             }
         }
@@ -146,7 +147,8 @@ module.exports = app => {
             // 原则说明：把所有报表模板集中获取，统一filter，只读一次数据！
             const params = JSON.parse(ctx.request.body.params);
             const pageRstArr = await getMultiRptsCommon(ctx, params, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir);
-            const roleRel = await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids);
+            const roleRel = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids)) : [];
+            // const roleRel = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_tpl_id)) : [];
             await encodeSignatureDataUri(roleRel, this.app.baseDir);
             // console.log(pageRstArr);
             ctx.body = { data: pageRstArr, signatureRelInfo: roleRel };
@@ -167,7 +169,8 @@ module.exports = app => {
                     );
                 });
             }
-            const roleRelArr = await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids);
+            const roleRelArr = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids)) : [];
+            // const roleRel = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_tpl_id)) : [];
             const pageRstArr = await getMultiRptsCommon(ctx, params, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir);
             const runnableRst = [];
             for (let idx = 0; idx < pageRstArr.length; idx++) {
@@ -201,7 +204,7 @@ module.exports = app => {
                     );
                 });
             }
-            const roleRelArr = await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids);
+            const roleRelArr = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids)) : [];
             const pageRstArr = await getMultiRptsCommon(ctx, params, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir);
             const runnableRst = [];
             let rptRoleRelArr = [];

app/public/report/js/rpt_main.js

@@ -222,6 +222,7 @@ let zTreeOprObj = {
             params.project_id = PROJECT_ID;
             params.tender_id = TENDER_ID;
             params.stage_id = getStageId();
+            params.stage_status = getStageStatus();
             params.stage_order = getStageOrder();
             params.stage_times = getStageTimes();
             params.custCfg = CUST_CFG;
@@ -257,6 +258,7 @@ let zTreeOprObj = {
             params.project_id = PROJECT_ID;
             params.tender_id = TENDER_ID;
             params.stage_id = getStageId();
+            params.stage_status = getStageStatus();
             params.stage_order = getStageOrder();
             params.stage_times = getStageTimes();
             me.requestNormalReport(params);
@@ -449,6 +451,7 @@ let rptControlObj = {
         rst.project_id = PROJECT_ID;
         rst.tender_id = TENDER_ID;
         rst.stage_id = getStageId();
+        rst.stage_status = getStageStatus();
         rst.stage_order = getStageOrder();
         rst.stage_times = getStageTimes();
         rst.custCfg = CUST_CFG;
@@ -691,6 +694,10 @@ function dynamicLoadJs(url, callback) {
     head.appendChild(script);
 }
 
+function getStageStatus() {
+    return current_stage_status;
+}
+
 function getStageId() {
     return current_stage_id;
 }