|
|
@@ -815,6 +815,12 @@ let rptSignatureHelper = {
|
|
|
}
|
|
|
},
|
|
|
mergeSignAudit: function (pageData, currRoleRelList, currAuditList, checkAudit = false) {
|
|
|
+ const reg1 = new RegExp('\n\r', 'g');
|
|
|
+ const reg2 = new RegExp('\r\n', 'g');
|
|
|
+ const reg3 = new RegExp('\n', 'g');
|
|
|
+ const reg4 = new RegExp('\r', 'g');
|
|
|
+ const reg5 = new RegExp('<br/>', 'g');
|
|
|
+ const reg6 = new RegExp('<br>', 'g');
|
|
|
for (const page of pageData.items) {
|
|
|
if (page.signature_audit_cells) {
|
|
|
for (const sCell of page.signature_audit_cells) {
|
|
|
@@ -829,6 +835,9 @@ let rptSignatureHelper = {
|
|
|
if (role_rel.acc_id === audit_rel.aid) {
|
|
|
if (audit_rel.end_time > preDate && audit_rel.status === 3) {
|
|
|
sCell.Value = audit_rel.opinion;
|
|
|
+ if (typeof sCell.Value === 'string') {
|
|
|
+ sCell.Value = sCell.Value.replace(reg1, '|').replace(reg2, '|').replace(reg3, '|').replace(reg4, '|').replace(reg5, '|').replace(reg6, '|');
|
|
|
+ }
|
|
|
preDate = audit_rel.end_time;
|
|
|
}
|
|
|
//不能break，实际会有多个审核意见，以最后一个为准
|
