|
@@ -174,7 +174,7 @@ let rptSignatureHelper = {
|
|
|
roleRel = roleRelObj;
|
|
|
}
|
|
|
// elementsStrArr.push('');
|
|
|
- rptSignatureHelper.pushDatePickerDom(elementsStrArr, userAcc, roleRel);
|
|
|
+ rptSignatureHelper.pushDatePickerDom(elementsStrArr, userAcc, roleRel, 0);
|
|
|
$(rptSignatureHelper.currentSelectedESignAccDom).append(elementsStrArr.join(' '));
|
|
|
//.appendChild(pNode);
|
|
|
//*/
|
|
@@ -253,7 +253,7 @@ let rptSignatureHelper = {
|
|
|
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);
|
|
|
+ rptSignatureHelper.pushDatePickerDom(elementsStrArr, userAcc, role_rel, idx);
|
|
|
hasPic = true;
|
|
|
break;
|
|
|
}
|
|
@@ -294,8 +294,9 @@ let rptSignatureHelper = {
|
|
|
'</i>-<small class="text-muted">' + userName +
|
|
|
'</small></span><a onclick="rptSignatureHelper.removeSignature(this)" class="text-danger"><i class="fa fa-remove" title="移除签名"></i></a></p>');
|
|
|
},
|
|
|
- pushDatePickerDom: function (elementsStrArr, userAcc, role_rel) {
|
|
|
- let idSuffixStr = 'dtp_' + rptSignatureHelper.currentSelectedESignAccName + '_' + rptSignatureHelper.currentSelectedESignParentDivId;
|
|
|
+ pushDatePickerDom: function (elementsStrArr, userAcc, role_rel, seq = 0) {
|
|
|
+ // let idSuffixStr = 'dtp_' + rptSignatureHelper.currentSelectedESignAccName + '_' + rptSignatureHelper.currentSelectedESignParentDivId;
|
|
|
+ const idSuffixStr = `dtp_${seq}_${rptSignatureHelper.currentSelectedESignParentDivId}`;
|
|
|
elementsStrArr.push('<div class="mt-3">');
|
|
|
elementsStrArr.push('<div class="row">');
|
|
|
//-------------------------------------------------
|
|
@@ -321,7 +322,7 @@ let rptSignatureHelper = {
|
|
|
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(` <label class="form-check-label" for="${idSuffixStr}_rdSign1">单位章</label>`);
|
|
|
+ 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}>`);
|
|
@@ -331,8 +332,8 @@ let rptSignatureHelper = {
|
|
|
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}_sign2" value="option2" onchange="rptSignatureHelper._changeSignType(this, ${userAcc.id}, '${COMPANY_SIGN_STR}')" ${companySignChkStr}>`);
|
|
|
- elementsStrArr.push(` <label class="form-check-label" for="${idSuffixStr}_sign2">单位章</label>`);
|
|
|
+ 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(` <label class="form-check-label" for="${idSuffixStr}_sign10">单位章</label>`);
|
|
|
elementsStrArr.push(' </div>');
|
|
|
}
|
|
|
elementsStrArr.push(' </div>');
|
|
@@ -846,17 +847,6 @@ let rptSignatureHelper = {
|
|
|
roleRel.sign_output.splice(idx, 1);
|
|
|
}
|
|
|
}
|
|
|
- // if (chkStr === COMPANY_SIGN_STR) {
|
|
|
- // let idx = roleRel.sign_output.indexOf(PRIVATE_SIGN_STR);
|
|
|
- // if (idx >= 0) {
|
|
|
- // roleRel.sign_output.splice(idx, 1);
|
|
|
- // }
|
|
|
- // } else if (chkStr === PRIVATE_SIGN_STR) {
|
|
|
- // let idx = roleRel.sign_output.indexOf(COMPANY_SIGN_STR);
|
|
|
- // if (idx >= 0) {
|
|
|
- // roleRel.sign_output.splice(idx, 1);
|
|
|
- // }
|
|
|
- // }
|
|
|
break;
|
|
|
}
|
|
|
}
|