|
@@ -248,7 +248,7 @@ let rptSignatureHelper = {
|
|
|
const dateIdSuffixStr = `flowdtp_${roleRelObj.signature_name}_${index}`;
|
|
|
if (flowRoleRel.company_stamp_path && flowRoleRel.company_stamp_path !== '') {
|
|
|
let dftDate = '';
|
|
|
- if (flowRoleRel.sign_date !== '' && flowRoleRel.sign_date.length > 20) {
|
|
|
+ if (flowRoleRel.sign_date !== '' && flowRoleRel.sign_date.length >= 10) {
|
|
|
dftDate = (new Date(flowRoleRel.sign_date)).Format('yyyy-MM-dd');
|
|
|
} else if (flowRoleRel.sign_date instanceof Date){
|
|
|
dftDate = flowRoleRel.sign_date.Format('yyyy-MM-dd');
|
|
@@ -265,6 +265,7 @@ let rptSignatureHelper = {
|
|
|
// 收尾
|
|
|
assFlowElements.push('</tr>');
|
|
|
});
|
|
|
+ rptSignatureHelper.currentSelectedESignAccName = roleRelObj.signature_name;
|
|
|
assFlowDialog.append(assFlowElements.join(' '));
|
|
|
},
|
|
|
createEsignatureByAccIdx: function (accIdx) {
|
|
@@ -548,13 +549,13 @@ let rptSignatureHelper = {
|
|
|
// 2. 日期
|
|
|
elementsStrArr.push('<div class="col-4">');
|
|
|
let dftDate = '';
|
|
|
- if (role_rel.sign_date !== '' && role_rel.sign_date.length > 20) {
|
|
|
+ if (role_rel.sign_date !== '' && role_rel.sign_date.length >= 10) {
|
|
|
dftDate = (new Date(role_rel.sign_date)).Format('yyyy-MM-dd');
|
|
|
} else if (role_rel.sign_date instanceof Date){
|
|
|
dftDate = role_rel.sign_date.Format('yyyy-MM-dd');
|
|
|
} else {
|
|
|
if (userAcc) dftDate = _getSignDateByAllScenarios(userAcc.id);
|
|
|
- if (dftDate !== '' && dftDate.length > 20) {
|
|
|
+ if (dftDate !== '' && dftDate.length >= 10) {
|
|
|
dftDate = (new Date(dftDate)).Format('yyyy-MM-dd');
|
|
|
}
|
|
|
}
|
|
@@ -1344,7 +1345,7 @@ function _getSignDateByAllScenarios(userAccId) {
|
|
|
}
|
|
|
}
|
|
|
if (isOrgRpt && !hasAudit && STAGE_AUDIT_ORG && STAGE_AUDIT_ORG.length > 0) {
|
|
|
- if (STAGE_AUDIT_ORG[0].begin_time && STAGE_AUDIT_ORG[0].begin_time !== '' && STAGE_AUDIT_ORG[0].begin_time.length > 20) {
|
|
|
+ if (STAGE_AUDIT_ORG[0].begin_time && STAGE_AUDIT_ORG[0].begin_time !== '' && STAGE_AUDIT_ORG[0].begin_time.length >= 10) {
|
|
|
rst = STAGE_AUDIT_ORG[0].begin_time;
|
|
|
}
|
|
|
}
|