Browse Source

文本签名与归档不显示标记处理

Tony Kang 1 year ago
parent
commit
3684c9821b
1 changed files with 5 additions and 5 deletions
  1. 5 5
      app/public/report/js/rpt_archive.js

+ 5 - 5
app/public/report/js/rpt_archive.js

@@ -645,8 +645,6 @@ let rptArchiveObj = {
                     currentRptPageRst.items.forEach((pageItem, pageIdx) => {
                         const dtlSignCells = [];
                         signCells.push(dtlSignCells);
-                        const dtlTxtSignCells = [];
-                        txtSignCells.push(dtlTxtSignCells);
                         for (let sCellIdx = pageItem.signature_cells.length - 1; sCellIdx >= 0; sCellIdx--) {
                             let sCell = pageItem.signature_cells[sCellIdx];
                             if (sCell.signature_name.indexOf('dummy_pic') < 0) {
@@ -659,8 +657,8 @@ let rptArchiveObj = {
                                     if (cCell.area.Left === sCell.orgArea.Left && cCell.area.Right === sCell.orgArea.Right && 
                                         cCell.area.Top === sCell.orgArea.Top && cCell.area.Bottom === sCell.orgArea.Bottom &&
                                         cCell.Value !== '') {
-                                        dtlTxtSignCells.push(cCell);
-                                        pageItem.cells.splice(cIdx, 1);
+                                        txtSignCells.push({bkCell: cCell, bkValue: cCell.Value});
+                                        cCell.Value = '';
                                         break;
                                     }
                                 }
@@ -704,7 +702,9 @@ let rptArchiveObj = {
                 let doc = JpcJsPDFHelper._createPdf(currentRptPageRst, rptControlObj.getCurrentPageSize(), ROLE_REL_LIST, STAGE_AUDIT);
                 restoreCells(signCells, 'signature_cells');
                 signCells = null;
-                restoreCells(txtSignCells, 'cells');
+                txtSignCells.forEach(txtCellBkObj => {
+                    txtCellBkObj.bkCell.Value = txtCellBkObj.bkValue;
+                });
                 txtSignCells = null;
                 if (dummyTxtSignCells.length === currentRptPageRst.items.length) {
                     currentRptPageRst.items.forEach((pageItem, pageIdx) => {