签名merge cells

app/reports/util/rpt_excel_util.js

@@ -824,9 +824,9 @@ function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj, ap
         let cnt = 0;
         rst.push('<mergeCells count="?">');
         const startIdx = rst.length - 1;
-        const self_setMergedCells = function(theData, theYPos, offsetY) {
-            for (let i = 0; i < theData[JV.PROP_CELLS].length; i++) {
-                const cell = theData[JV.PROP_CELLS][i];
+        const self_setMergedCells = function(cells, theYPos, offsetY) {
+            for (let i = 0; i < cells.length; i++) {
+                const cell = cells[i];
                 const idxR = xPos.indexOf(cell[JV.PROP_AREA][JV.PROP_RIGHT]);
                 const idxL = xPos.indexOf(cell[JV.PROP_AREA][JV.PROP_LEFT]);
                 const idxB = theYPos.indexOf(cell[JV.PROP_AREA][JV.PROP_BOTTOM]);
@@ -838,13 +838,19 @@ function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj, ap
             }
         };
         if (sheetData) {
-            self_setMergedCells(sheetData, yPos, 0);
+            // self_setMergedCells(sheetData, yPos, 0);
+            self_setMergedCells(sheetData[JV.PROP_CELLS], yPos, 0);
+            if (sheetData[JV.PROP_SIGNATURE_DATE_CELLS]) self_setMergedCells(sheetData[JV.PROP_SIGNATURE_DATE_CELLS], yPos, 0);
+            if (sheetData[JV.PROP_SIGNATURE_AUDIT_CELLS]) self_setMergedCells(sheetData[JV.PROP_SIGNATURE_AUDIT_CELLS], yPos, 0);
         } else {
             let osY = 0;
             for (let i = 0; i < pageData.items.length; i++) {
                 const shtItemData = pageData.items[i];
                 const tmpPos = yMultiPos[i];
-                self_setMergedCells(shtItemData, tmpPos, osY);
+                // self_setMergedCells(shtItemData, tmpPos, osY);
+                self_setMergedCells(shtItemData[JV.PROP_CELLS], tmpPos, osY);
+                if (shtItemData[JV.PROP_SIGNATURE_DATE_CELLS]) self_setMergedCells(shtItemData[JV.PROP_SIGNATURE_DATE_CELLS], tmpPos, osY);
+                if (shtItemData[JV.PROP_SIGNATURE_AUDIT_CELLS]) self_setMergedCells(shtItemData[JV.PROP_SIGNATURE_AUDIT_CELLS], tmpPos, osY);
                 osY += tmpPos.length - 2;
             }
         }