电子签名显示逻辑调整

app/public/report/js/rpt_main.js

@@ -295,8 +295,10 @@ let zTreeOprObj = {
                     ROLE_REL_LIST = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
                     STAGE_AUDIT = result.stageAudit;
                     rptSignatureHelper.originalRoleRelList = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
-                    rptSignatureHelper.mergeSignDate(pageRst);
-                    rptSignatureHelper.mergeSignature(pageRst);
+                    if (current_stage_status === 3) {
+                        rptSignatureHelper.mergeSignDate(pageRst);
+                        rptSignatureHelper.mergeSignature(pageRst);
+                    }
                 } else {
                     CURRENT_ROLE_REL_ID = -1;
                     ROLE_REL_LIST = [];
@@ -581,8 +583,10 @@ let rptControlObj = {
                         }
                         for (let idx = 0; idx < result.data.length; idx++) {
                             let pageData = result.data[idx];
-                            rptSignatureHelper.mergeSignDate();
-                            rptSignatureHelper.mergeSignature(pageData);
+                            if (current_stage_status === 3) {
+                                rptSignatureHelper.mergeSignDate();
+                                rptSignatureHelper.mergeSignature(pageData);
+                            }
                             JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rpt_names[idx], signatureRelArr);
                         }
                     },

app/public/report/js/rpt_signature.js

@@ -311,7 +311,7 @@ let rptSignatureHelper = {
                                 if (role_rel.sign_date !== '') {
                                     sCell.Value = role_rel.sign_date.Format(role_rel.sign_date_format);
                                 } else {
-                                    sCell.Value = '';
+                                    // sCell.Value = '';
                                 }
                             }
                         }
@@ -476,7 +476,7 @@ let rptSignatureHelper = {
                             if (role_rel.sign_date !== '') {
                                 sCell.Value = role_rel.sign_date.Format(role_rel.sign_date_format);
                             } else {
-                                sCell.Value = '';
+                                // sCell.Value = '';
                             }
                         }
                     }

app/view/report/index.ejs

@@ -347,11 +347,12 @@
     }
 
     function setupSignature() {
-        if (current_stage_status === 3) {
-            $('#pnl_eSignature')[0].style.display = '';
-        } else {
-            $('#pnl_eSignature')[0].style.display = 'none';
-        }
+//        if (current_stage_status === 3) {
+//            $('#pnl_eSignature')[0].style.display = '';
+//        } else {
+//            $('#pnl_eSignature')[0].style.display = 'none';
+//        }
+        // 用户可以设置，但只有审核通过后才显示签名
     }
 
     function setupDateFormat() {

app/view/report/rpt_all_popup.ejs

@@ -160,7 +160,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">设置电子签名</h5>
+                <h5 class="modal-title">设置电子签名(审核通过后才显示)</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>