Explorar o código

解决签章在归档时丢失问题

Tony Kang %!s(int64=3) %!d(string=hai) anos
pai
achega
d0b86284e7
Modificáronse 1 ficheiros con 6 adicións e 3 borrados
  1. 6 3
      app/public/report/js/rpt_archive.js

+ 6 - 3
app/public/report/js/rpt_archive.js

@@ -461,7 +461,8 @@ let rptArchiveObj = {
             let page = pageData.items[i];
             for (let sCell of page.signature_cells) {
                 // sCell.signature_name 草图不用加密
-                if (sCell.signature_name !== 'dummy_pic') {
+                if (sCell.signature_name.indexOf('dummy_pic') < 0) {
+                // if (sCell.signature_name !== 'dummy_pic') {
                     let control = null;
                     if (typeof sCell[JV.PROP_CONTROL] === "string") {
                         control = controls[sCell[JV.PROP_CONTROL]];
@@ -506,7 +507,8 @@ let rptArchiveObj = {
             for (let sCellIdx = 0; sCellIdx < currentRptPageRst.items[pageIdx].signature_cells.length; sCellIdx++) {
                 let sCell = currentRptPageRst.items[pageIdx].signature_cells[sCellIdx];
                 // if (sCell.signature_name === 'dummy_pic' && sCell.path.indexOf('/sign') < 0) {
-                if (sCell.signature_name === 'dummy_pic') {
+                if (sCell.signature_name.indexOf('dummy_pic') >= 0) {
+                // if (sCell.signature_name === 'dummy_pic') {
                     //1. 草图就不考虑重复问题,重复就重复吧;
                     //2. 如果是dummy_pic,也不用判断是否为签名了,因为有其他的逻辑直接选择审核人,不经过签名过程,就当草图一样放过去了
                     let picIdx = picKeys.indexOf(sCell.path);
@@ -577,7 +579,8 @@ let rptArchiveObj = {
                         signCells.push(dtlSignCells);
                         for (let sCellIdx = pageItem.signature_cells.length - 1; sCellIdx >= 0; sCellIdx--) {
                             let sCell = pageItem.signature_cells[sCellIdx];
-                            if (sCell.signature_name !== 'dummy_pic') {
+                            if (sCell.signature_name.indexOf('dummy_pic') < 0) {
+                            // if (sCell.signature_name !== 'dummy_pic') {
                                 dtlSignCells.push(sCell);
                                 pageItem.signature_cells.splice(sCellIdx, 1);
                             }