Browse Source

修改审核人打开签字时空白问题

Tony Kang 3 years ago
parent
commit
79789f7838
1 changed files with 7 additions and 4 deletions
  1. 7 4
      app/public/report/js/rpt_signature.js

+ 7 - 4
app/public/report/js/rpt_signature.js

@@ -250,8 +250,10 @@ let rptSignatureHelper = {
                                 rptSignatureHelper.pushDomElementByRole(elementsStrArr, role_rel.role_name, role_rel.user_name);
                             }
                             const userAcc = rptSignatureHelper.getUserAccount(role_rel.acc_id);
-                            role_rel.private_stamp_path = (userAcc.stamp_path && userAcc.stamp_path !== '') ? userAcc.stamp_path : '';
-                            role_rel.company_stamp_path = rptSignatureHelper._getCompanySign(userAcc.company);
+                            if (userAcc) {
+                                role_rel.private_stamp_path = (userAcc.stamp_path && userAcc.stamp_path !== '') ? userAcc.stamp_path : '';
+                                role_rel.company_stamp_path = rptSignatureHelper._getCompanySign(userAcc.company);
+                            }
                     
                             rptSignatureHelper.pushDatePickerDom(elementsStrArr, userAcc, role_rel, idx);
                             hasPic = true;
@@ -314,7 +316,7 @@ let rptSignatureHelper = {
         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是属于用户自己的私章,不是公司章
+        const hasIndividualStamp = (userAcc && userAcc.stamp_path && userAcc.stamp_path !== ''); //用户账号的stamp_path是属于用户自己的私章,不是公司章
         // let chkType = hasIndividualStamp ? `radio` : 'checkbox';
         const chkType = 'checkbox';
         let rdoNameStr = `dtp_${role_rel.signature_name}_${rptSignatureHelper.currentSelectedESignParentDivId}`;
@@ -341,7 +343,8 @@ let rptSignatureHelper = {
         elementsStrArr.push('</div>');
         // 2. 日期
         elementsStrArr.push('<div class="col-6">');
-        let dftDate = _getSignDateByAllScenarios(userAcc.id);
+        let dftDate = '';
+        if (userAcc) dftDate = _getSignDateByAllScenarios(userAcc.id);
         if (dftDate !== '' && dftDate.length > 20) {
             dftDate = (new Date(dftDate)).Format('yyyy-MM-dd');
         }