소스 검색

支付审批调整

Tony Kang 2 년 전
부모
커밋
22cd9fe74e
2개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 7 6
      app/public/report/js/jpc_output.js
  2. 1 0
      app/view/payment/detail.ejs

+ 7 - 6
app/public/report/js/jpc_output.js

@@ -467,6 +467,7 @@ let JpcCanvasOutput = {
                                 cell.isOrgShow = true;
                             }
                         }
+                        let dummyCell = JSON.parse(JSON.stringify(cell));
                         const img = new Image();
                         if (dtlPath.indexOf(OSS_PATH) < 0 && dtlPath[0] !== '/') {
                             img.src = OSS_PATH + dtlPath;
@@ -475,10 +476,10 @@ let JpcCanvasOutput = {
                         }
                         img.crossOrigin = 'anonymous';
                         img.onload = function() {
-                            if (cell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
-                                private_drawImage(cell, control, img,moveSignatureTool, (!!cell.isStamp), [1, 1, 1, 1]);
+                            if (dummyCell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
+                                private_drawImage(dummyCell, control, img,moveSignatureTool, (!!dummyCell.isStamp), [1, 1, 1, 1]);
                             } else {
-                                private_drawImage(cell, control, img,moveSignatureTool);
+                                private_drawImage(dummyCell, control, img,moveSignatureTool);
                             }
                         };
                         img.onerror = function() {
@@ -490,10 +491,10 @@ let JpcCanvasOutput = {
                                 noCroimg.src = dtlPath;
                             }
                             noCroimg.onload = function() {
-                                if (cell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
-                                    private_drawImage(cell, control, noCroimg,moveSignatureTool, (!!cell.isStamp), [1, 1, 1, 1]);
+                                if (dummyCell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
+                                    private_drawImage(dummyCell, control, noCroimg,moveSignatureTool, (!!dummyCell.isStamp), [1, 1, 1, 1]);
                                 } else {
-                                    private_drawImage(cell, control, noCroimg,moveSignatureTool);
+                                    private_drawImage(dummyCell, control, noCroimg,moveSignatureTool);
                                 }
                             };
                         }

+ 1 - 0
app/view/payment/detail.ejs

@@ -164,6 +164,7 @@
                         if (!signCell.orgArea) {
                             signCell.orgArea = JSON.parse(JSON.stringify(signCell.area));
                         }
+                        signCell.signType = 'mixed';
                         for (let path of paths) {
                             let imgSrc = path;
                             if (path.indexOf(OSS_PATH) < 0 && path[0] !== '/') {