支付审批报表调整

app/controller/report_controller.js

@@ -671,7 +671,19 @@ module.exports = app => {
                     waterMarkStr = await getWatermarkPicData(pageRstArr[0], this.app.baseDir);
                 }
             }
-            const stgAudit = await ctx.service.stageAudit.getStageAudit(params.stage_id, params.stage_times);
+
+            let stgAudit = null,
+                stageList = [];
+            if (![-100, -200, -300].includes(params.stage_id)) {
+                stgAudit = await ctx.service.stageAudit.getStageAudit(params.stage_id, params.stage_times);
+                stageList = await ctx.service.stage.getValidStagesShort(params.tender_id);
+            } else {
+                stgAudit = await ctx.service.paymentDetailAudit.getAuditors(params.detail_id);
+            }
+
+            // const stgAudit = await ctx.service.stageAudit.getStageAudit(params.stage_id, params.stage_times);
+            // const stageList = await ctx.service.stage.getValidStagesShort(params.tender_id);
+
             // const roleRel = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids, params.stage_id)) : [];
             const roleRel = await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids, params.stage_id); // 新需求：在审批流程中的签名需要显示
             roleRel.sort(function(rr1, rr2) {
@@ -679,7 +691,6 @@ module.exports = app => {
             });
             // console.log('roleRel: ');
             // console.log(roleRel);
-            const stageList = await ctx.service.stage.getValidStagesShort(params.tender_id);
             mergeStampSignature(ctx, params.stage_status, pageRstArr, roleRel, params.rpt_ids, stgAudit, stageList);
             mergeTextSignature(params.isTextSignature, params.stage_status, pageRstArr, roleRel, params.rpt_ids, stgAudit, stageList);
 

app/public/report/js/rpt_main.js

@@ -496,12 +496,6 @@ let zTreeOprObj = {
                     CURRENT_ROLE_REL_ID = result.signatureRelInfo[0].id;
                     ROLE_REL_LIST = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
                     rptSignatureHelper.originalRoleRelList = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
-                    // if (getStageStatus() === 3) {
-                    //     rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST, true);
-                    //     rptSignatureHelper.mergeSignature(pageRst, ROLE_REL_LIST, true);
-                    //     await rptSignatureHelper.resetDummySignature(pageRst, ROLE_REL_LIST); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到，挪到前端处理)
-                    //     rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT);
-                    // }
                     rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST, true, getStageStatus() !== 3);
                     rptSignatureHelper.mergeSignature(pageRst, ROLE_REL_LIST, true, getStageStatus() !== 3);
                     await rptSignatureHelper.resetDummySignature(pageRst, ROLE_REL_LIST, getStageStatus() !== 3); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到，挪到前端处理)