签章交互bug + 增加流水表页码数量上限

app/public/report/js/rpt_signature.js

@@ -296,7 +296,8 @@ let rptSignatureHelper = {
     },
     pushDatePickerDom: function (elementsStrArr, userAcc, role_rel, seq = 0) {
         // let idSuffixStr = 'dtp_' + rptSignatureHelper.currentSelectedESignAccName + '_' + rptSignatureHelper.currentSelectedESignParentDivId;
-        const idSuffixStr = `dtp_${seq}_${rptSignatureHelper.currentSelectedESignParentDivId}`;
+        let milliSec = (new Date()).getMilliseconds();
+        const idSuffixStr = `dtp_${seq}_${milliSec}_${rptSignatureHelper.currentSelectedESignParentDivId}`;
         elementsStrArr.push('<div class="mt-3">');
         elementsStrArr.push('<div class="row">');
         //-------------------------------------------------
@@ -310,7 +311,7 @@ let rptSignatureHelper = {
         elementsStrArr.push('<div class="col-6">');
         elementsStrArr.push('   <div class="form-control form-control-sm d-inline pt-2">');
         elementsStrArr.push('       <div class="form-check form-check-inline px-2">');
-        elementsStrArr.push(`           <input class="form-check-input" type="checkbox" id="${idSuffixStr}_sign1" value="option1" ${normalSignChkStr} onchange="rptSignatureHelper._changeSignType(this, ${userAcc.id}, '${NORMAL_SIGN_STR}')" >`);
+        elementsStrArr.push(`           <input class="form-check-input" type="checkbox" id="${idSuffixStr}_sign1" value="option1" ${normalSignChkStr} onchange="rptSignatureHelper._changeSignType(this, '${role_rel.signature_name}', '${NORMAL_SIGN_STR}')" >`);
         elementsStrArr.push(`           <label class="form-check-label" for="${idSuffixStr}_sign1">签字</label>`);
         elementsStrArr.push('       </div>');
         const hasIndividualStamp = (userAcc.stamp_path && userAcc.stamp_path !== ''); //用户账号的stamp_path是属于用户自己的私章，不是公司章
@@ -321,18 +322,18 @@ let rptSignatureHelper = {
             elementsStrArr.push('       <div class="form-check form-check-inline mx-1">');
             elementsStrArr.push('           <div class="form-group">');
             elementsStrArr.push('               <div class="form-check form-check-inline px-1">');
-            elementsStrArr.push(`                   <input class="form-check-input" type="${chkType}" id="${idSuffixStr}_sign2" value="companyStamp" name="${rdoNameStr}" onchange="rptSignatureHelper._changeSignType(this, ${userAcc.id}, '${COMPANY_SIGN_STR}')" ${companySignChkStr}>`);
+            elementsStrArr.push(`                   <input class="form-check-input" type="${chkType}" id="${idSuffixStr}_sign2" value="companyStamp" name="${rdoNameStr}" onchange="rptSignatureHelper._changeSignType(this, '${role_rel.signature_name}', '${COMPANY_SIGN_STR}')" ${companySignChkStr}>`);
             elementsStrArr.push(`                   <label class="form-check-label" for="${idSuffixStr}_sign2">单位章</label>`);
             elementsStrArr.push('               </div>');
             elementsStrArr.push('               <div class="form-check form-check-inline">');
-            elementsStrArr.push(`                   <input class="form-check-input" type="${chkType}" id="${idSuffixStr}_sign3" value="individualStamp" name="${rdoNameStr}" onchange="rptSignatureHelper._changeSignType(this, ${userAcc.id}, '${PRIVATE_SIGN_STR}')" ${privateSignChkStr}>`);
+            elementsStrArr.push(`                   <input class="form-check-input" type="${chkType}" id="${idSuffixStr}_sign3" value="individualStamp" name="${rdoNameStr}" onchange="rptSignatureHelper._changeSignType(this, '${role_rel.signature_name}', '${PRIVATE_SIGN_STR}')" ${privateSignChkStr}>`);
             elementsStrArr.push(`                   <label class="form-check-label" for="${idSuffixStr}_sign3">个人章</label>`);
             elementsStrArr.push('               </div>');
             elementsStrArr.push('           </div>');
             elementsStrArr.push('       </div>');
         } else {
             elementsStrArr.push('       <div class="form-check form-check-inline px-2">');
-            elementsStrArr.push(`           <input class="form-check-input" type="${chkType}" id="${idSuffixStr}_sign10" value="option2" onchange="rptSignatureHelper._changeSignType(this, ${userAcc.id}, '${COMPANY_SIGN_STR}')" ${companySignChkStr}>`);
+            elementsStrArr.push(`           <input class="form-check-input" type="${chkType}" id="${idSuffixStr}_sign10" value="option2" onchange="rptSignatureHelper._changeSignType(this, '${role_rel.signature_name}', '${COMPANY_SIGN_STR}')" ${companySignChkStr}>`);
             elementsStrArr.push(`           <label class="form-check-label" for="${idSuffixStr}_sign10">单位章</label>`);
             elementsStrArr.push('       </div>');
         }
@@ -846,9 +847,9 @@ let rptSignatureHelper = {
             }
         }
     },
-    _changeSignType: function(dom, acc_id, chkStr) {
+    _changeSignType: function(dom, signature_name, chkStr) {
         for (const roleRel of ROLE_REL_LIST) {
-            if (roleRel.acc_id === acc_id) {
+            if (roleRel.signature_name === signature_name) {
                 if (dom.checked) {
                     if (roleRel.sign_output.indexOf(chkStr) < 0) {
                         roleRel.sign_output.push(chkStr);

app/reports/rpt_component/jpc_ex.js

@@ -248,12 +248,12 @@ JpcExSrv.prototype.createNew = function() {
                 const expression = execFmlMe.formulas[execFmlIdx][JV.PROP_EXPRESSION];
                 if (expression) {
                     const $ME = execFmlMe.formulas[execFmlIdx];
-                    // console.log("current expression idx: " + execFmlIdx);
+                    // console.log('current expression idx: ' + execFmlIdx);
                     // console.log(expression);
                     try {
                         eval(expression);
                     } catch (ex) {
-                        console.log("current expression idx: " + execFmlIdx);
+                        console.log('current expression idx: ' + execFmlIdx);
                         console.log(expression);
                         console.log(ex);
                     }