|
|
@@ -1465,7 +1465,7 @@ function mergeTextSignature(isTxtSignature, status, pageData, singleRoleRel, rpt
|
|
|
let roleRelContent = [];
|
|
|
if (_roleRelList && _roleRelList.rel_content !== null && _roleRelList.rel_content !== undefined && _roleRelList.rel_content !== '') {
|
|
|
roleRelContent = JSON.parse(_roleRelList.rel_content);
|
|
|
- };
|
|
|
+ }
|
|
|
for (const page of _page.items) {
|
|
|
if (page.signature_cells) {
|
|
|
const deleteSCellsIdx = [];
|
|
|
@@ -1477,23 +1477,24 @@ function mergeTextSignature(isTxtSignature, status, pageData, singleRoleRel, rpt
|
|
|
sCell.path = '';
|
|
|
sCell.pic = '';
|
|
|
}
|
|
|
- for (const role_rel of roleRelContent) {
|
|
|
- if (sCell.signature_name === role_rel.signature_name) {
|
|
|
- if (status === 3) {
|
|
|
+ if (status === 3) {
|
|
|
+ for (const role_rel of roleRelContent) {
|
|
|
+ if (sCell.signature_name === role_rel.signature_name) {
|
|
|
sCell.Value = role_rel.user_name; // 只有审核通过了才需要文本签名内容，但不管如何，都不影响迁移
|
|
|
+ break;
|
|
|
}
|
|
|
- const newCell = {
|
|
|
- font: 'Footer',
|
|
|
- control: sCell.control,
|
|
|
- style: sCell.style,
|
|
|
- Value: sCell.Value,
|
|
|
- area: { Left: sCell.area.Left, Right: sCell.area.Right, Top: sCell.area.Top, Bottom: sCell.area.Bottom },
|
|
|
- };
|
|
|
- page.cells.push(newCell); // 迁移
|
|
|
- deleteSCellsIdx.push(scIdx);
|
|
|
- break;
|
|
|
}
|
|
|
}
|
|
|
+ // 无论怎么处理，都得迁移
|
|
|
+ const newCell = {
|
|
|
+ font: 'Footer',
|
|
|
+ control: sCell.control,
|
|
|
+ style: sCell.style,
|
|
|
+ Value: sCell.Value,
|
|
|
+ area: { Left: sCell.area.Left, Right: sCell.area.Right, Top: sCell.area.Top, Bottom: sCell.area.Bottom },
|
|
|
+ };
|
|
|
+ page.cells.push(newCell); // 迁移
|
|
|
+ deleteSCellsIdx.push(scIdx);
|
|
|
}
|
|
|
// 删除 page.signature_cells 签名(草图不能删);
|
|
|
if (isDeleteSignCell) {
|
