Sfoglia il codice sorgente

Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

MaiXinRong 5 anni fa
parent
commit
539df70ff7
1 ha cambiato i file con 26 aggiunte e 0 eliminazioni
  1. 26 0
      app/reports/util/rpt_excel_util.js

+ 26 - 0
app/reports/util/rpt_excel_util.js

@@ -1144,6 +1144,29 @@ function resetDummuySignature(pageData, roleRel) {
     }
 }
 
+function createDummySignatureCell(pageData) {
+    for (let pageIdx = 0; pageIdx < pageData.items.length; pageIdx++) {
+        const page = pageData.items[pageIdx];
+        if (page[JV.PROP_SIGNATURE_CELLS] && page[JV.PROP_SIGNATURE_CELLS].length > 0) {
+            for (const signature of page[JV.PROP_SIGNATURE_CELLS]) {
+                const dummyCell = {
+                    font: 'Content',
+                    control: 'Default',
+                    style: 'Default_None',
+                    Value: '',
+                    area: { Left: 0, Right: 0, Top: 0, Bottom: 0 }
+                };
+                if (signature.style) dummyCell.style = signature.style;
+                dummyCell[JV.PROP_AREA][JV.PROP_LEFT] = signature[JV.PROP_AREA][JV.PROP_LEFT];
+                dummyCell[JV.PROP_AREA][JV.PROP_RIGHT] = signature[JV.PROP_AREA][JV.PROP_RIGHT];
+                dummyCell[JV.PROP_AREA][JV.PROP_TOP] = signature[JV.PROP_AREA][JV.PROP_TOP];
+                dummyCell[JV.PROP_AREA][JV.PROP_BOTTOM] = signature[JV.PROP_AREA][JV.PROP_BOTTOM];
+                page[JV.PROP_CELLS].push(dummyCell);
+            }
+        }
+    }
+}
+
 function checkAndSetSignatureCache(pageData, signKeyArr, signPathArr, roleRel, signSheetIdxArr) {
     // 备注:电子签名是以图形的方式处理,一页可以有多个签名,多页的签名基本是引用同样的图片,在这里先处理一下,后期统一引用。
     //      另:以后的图片(在电子签名(signature_cells)以外的图片)会单独处理(如计算草图等)
@@ -1247,6 +1270,9 @@ module.exports = {
         // console.log('signPathArr');
         // console.log(signPathArr);
         // console.log('hasSignature: ' + hasSignature);
+        if (!hasSignature) {
+            createDummySignatureCell(pageData);
+        }
         if (isSinglePage) {
             sheets.push({ sheetName: '全部页' });
         } else {