diff --git a/src/views/products/Print/AgencyContract_v1120.jsx b/src/views/products/Print/AgencyContract_v1120.jsx index c91ab06..d88d112 100644 --- a/src/views/products/Print/AgencyContract_v1120.jsx +++ b/src/views/products/Print/AgencyContract_v1120.jsx @@ -501,7 +501,7 @@ export default class AgencyContract { return acc.concat(this.createDetailRowSizeSS(sizeSets, row, ri)) }, []), - this.createTable_Memo(3, remarkItem.Memo), + this.createTable_Memo(3, remarkItem.Memo.split(`\n`)), ], }) } @@ -582,7 +582,7 @@ export default class AgencyContract { [], ), - this.createTable_Memo(2 + size.length, remarkItem.Memo), + this.createTable_Memo(2 + size.length, remarkItem.Memo.split(`\n`)), ], }) acc.push(subTable) @@ -682,7 +682,7 @@ export default class AgencyContract { ) }, []), //备注行 - this.createTable_Memo(1 + setItem.length * 2, remarkItem.Memo), + this.createTable_Memo(1 + setItem.length * 2, remarkItem.Memo.split(`\n`)), ], }) rt.push(subTable) @@ -777,7 +777,7 @@ export default class AgencyContract { [], ), //备注行 - this.createTable_Memo(1 + setItem.length * 2, remarkItem.Memo), + this.createTable_Memo(1 + setItem.length * 2, remarkItem.Memo.split(`\n`)), ], }) rt.push(subTable) @@ -812,7 +812,7 @@ export default class AgencyContract { .map((row, ri) => this.createDetailRowSeason2(row, ri, { withSize: false })) .reduce((a, c) => a.concat(c), []), - this.createTable_Memo(3, remarkItem.Memo), + this.createTable_Memo(3, remarkItem.Memo.split(`\n`)), ], }) } @@ -911,7 +911,7 @@ export default class AgencyContract { [], ), //备注行 - this.createTable_Memo(1 + sizeSets.length * 2 + 1, remarkItem.Memo), + this.createTable_Memo(1 + sizeSets.length * 2 + 1, remarkItem.Memo.split(`\n`)), ], }) } @@ -1008,7 +1008,7 @@ export default class AgencyContract { [], ), - this.createTable_Memo(1 + size.length + 1, remarkItem.Memo), + this.createTable_Memo(1 + size.length + 1, remarkItem.Memo.split(`\n`)), ], }) acc.push(subTable) @@ -1485,14 +1485,14 @@ export default class AgencyContract { ] } - createTable_Memo(columnSpan, remarkContent = '') { + createTable_Memo(columnSpan, remarkContent = []) { return new TableRow({ children: [ new TableCell({ borders: tableBorderOne, // verticalAlign: AlignmentType.CENTER, columnSpan, - children: [new Paragraph(`备注: `), new Paragraph(remarkContent)], + children: [new Paragraph(`备注: `), ...remarkContent.map((remarkRow) => new Paragraph(remarkRow))], }), ], })