优化 + code sync

app/controller/signature_controller.js

@@ -49,7 +49,7 @@ module.exports = app => {
             // console.log(params);
             const bzId = params.business_id;
             const srcKey = sourceTypeConst.sourceTypeKey[params.source_type];
-            console.log(params.rel_content);
+            // console.log(params.rel_content);
             const rst = await ctx.service.roleRptRel.updateRoleRelationship(params.id, params.tender_id, params.rpt_id, params.stage_id, bzId, srcKey, params.rel_content);
             const roleRel = await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_id, params.stage_id, bzId);
             // const roleRel = params.rel_content;

app/public/report/js/rpt_jspdf.js

@@ -73,10 +73,10 @@ const JpcJsPDFHelper = {
         }
 
         let newPageMergeBand = private_getIniPageMergeBorder(pageObj[JV.BAND_PROP_MERGE_BAND]);
-        // let ppStatus = zTreeOprObj._chkPrePayStatus();
+        const auditStatus = getStageStatus();
         if (!keepOrgValue) {
             if (signatureRelArr && signatureRelArr.length > 0) {
-                if (getStageStatus() === 3) {
+                if (auditStatus === 3) {
                     rptSignatureHelper.mergeSignDate(pageObj, signatureRelArr, false);
                     // rptSignatureHelper.mergeSignature(pageObj, signatureRelArr); // 这里merge的意义不大
                     rptSignatureHelper.mergeSignAudit(pageObj, signatureRelArr, signAuditArr);
@@ -128,7 +128,7 @@ const JpcJsPDFHelper = {
                 // 计量有电子签名，要单独处理
                 // let ppStatus = zTreeOprObj._chkPrePayStatus();
                 for (let cell of page.signature_cells) {
-                    if (getStageStatus() === 3) {
+                    if (auditStatus === 3) {
                         private_drawSignature(doc, ctx, cell, styles, controls, newPageMergeBand, false, signatureRelArr);
                     } else {
                         private_drawSignature(doc, ctx, cell, styles, controls, newPageMergeBand, true, signatureRelArr);