签名日期dummy cell

app/controller/report_controller.js

@@ -245,6 +245,7 @@ module.exports = app => {
                 // fsUtil.writeObjToFile(pageRstArr, 'D:/GitHome/temp/testBuiltPageResult.jsp');
                 runnableRst.push(getExcelByPageData(pageRstArr[idx], params.rpt_names[idx], roleRel));
             }
+            // fsUtil.writeObjToFile(pageRstArr, 'D:/GitHome/temp/计量导出pageArr.js');
             const uuidRst = await Promise.all(runnableRst);
             ctx.body = { data: uuidRst };
             ctx.status = 201;

app/reports/util/rpt_excel_util.js

@@ -1144,25 +1144,47 @@ function resetDummuySignature(pageData, roleRel) {
     }
 }
 
+function _createDummyCell(dummyOrgCells, parentPage) {
+    for (const signature of dummyOrgCells) {
+        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];
+        parentPage[JV.PROP_CELLS].push(dummyCell);
+    }
+}
+
 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);
-            }
+            _createDummyCell(page[JV.PROP_SIGNATURE_CELLS], page);
+            // 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);
+            // }
+        }
+        if (page[JV.PROP_SIGNATURE_DATE_CELLS] && page[JV.PROP_SIGNATURE_DATE_CELLS].length > 0) {
+            _createDummyCell(page[JV.PROP_SIGNATURE_DATE_CELLS], page);
         }
     }
 }