浏览代码

code sync

TonyKang 5 年之前
父节点
当前提交
8a7a3245b2
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      app/public/report/js/rpt_jspdf.js

+ 3 - 3
app/public/report/js/rpt_jspdf.js

@@ -122,7 +122,9 @@ let JpcJsPDFHelper = {
             } else {
             } else {
                 control = cell[JV.PROP_CONTROL];
                 control = cell[JV.PROP_CONTROL];
             }
             }
-            if (cell.path) {
+            if (cell.pic) {
+                private_drawImage(doc, ctx, cell, control, cell.pic);
+            } else if (cell.path) {
                 let finded = false;
                 let finded = false;
                 for (const rtpSignRel of signatureRelArr) {
                 for (const rtpSignRel of signatureRelArr) {
                     if (!finded) {
                     if (!finded) {
@@ -135,8 +137,6 @@ let JpcJsPDFHelper = {
                         }
                         }
                     }
                     }
                 }
                 }
-            } else if (cell.pic) {
-                private_drawImage(doc, ctx, cell, control, cell.pic);
             }
             }
         }
         }