下载部位台账Excel相关

app/public/js/shares/export_excel.js

@@ -12,8 +12,8 @@ const SpreadExcelObj = (function() {
     const _createHideSpread = function () {
         const div = document.createElement("div");
         div.setAttribute('id', 'exportExcelSpread');
-        // $(div).css("position", "absolute").css('top', 0).css('left', 0).css('height', 300).css('width', 500).css('z-index', 999);
-        // document.body.insertBefore(div, null);
+        //$(div).css("position", "absolute").css('top', 0).css('left', 0).css('height', 300).css('width', 500).css('z-index', 999);
+        //document.body.insertBefore(div, null);
         div.style.display = 'none';
         return div;
     };
@@ -49,12 +49,15 @@ const SpreadExcelObj = (function() {
         for (let iCol = 0; iCol < setting.cols.length; iCol++) {
             const col = setting.cols[iCol];
             const title = col.title.split('|');
-            const colSpan = col.colSpan ? col.colSpan.split('|'): ['1'], rowSpan = col.rowSpan ? col.rowSpan.split('|'): ['1'];
+            const colSpan = col.colSpan ? col.colSpan.split('|') : ['1'],
+                rowSpan = col.rowSpan ? col.rowSpan.split('|') : ['1'];
             for (let i = 0; i < title.length; i++) {
                 const cell = sheet.getCell(i, iCol);
                 cell.text(title[i]).wordWrap(true).hAlign(1).vAlign(1).font(setting.headerFont);
                 if ((colSpan[i] !== '' && colSpan[i] !== '1') || (rowSpan[i] !== '' && rowSpan[i] !== '1')) {
                     sheet.addSpan(i, iCol, parseInt(rowSpan[i]), parseInt(colSpan[i]));
+                } else {
+                    sheet.addSpan(i, iCol, 1, 1);
                 }
             }
             sheet.setColumnWidth(iCol, col.width);

app/public/js/stage_bwtz.js

@@ -148,7 +148,7 @@ $(document).ready(() => {
                 {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'end_qc_tp', hAlign: 2, width: 60, type: 'Number'},
                 {title: '截止本期完成计量|数量', colSpan: '3|1', rowSpan: '1|1', field: 'end_gather_qty', hAlign: 2, width: 60, type: 'Number'},
                 {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'end_gather_tp', hAlign: 2, width: 60, type: 'Number'},
-                {title: '|完成率(%)', colSpan: '1', rowSpan: '|1', field: 'end_gather_percent', hAlign: 2, width: 60, type: 'Number'},
+                {title: '|完成率(%)', colSpan: '|1', rowSpan: '|1', field: 'end_gather_percent', hAlign: 2, width: 60, type: 'Number'},
                 {title: '图(册)号', colSpan: '1', rowSpan: '2', field: 'drawing_code', hAlign: 0, width: 100, formatter: '@'},
                 {title: '本期批注', colSpan: '1', rowSpan: '2', field: 'postil', hAlign: 0, width: 100, formatter: '@'},
                 {title: '备注', colSpan: '1', rowSpan: '2', field: 'memo', hAlign: 0, width: 100, formatter: '@'},

app/view/stage/bwtz.ejs

@@ -120,7 +120,7 @@
             {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'end_qc_tp', hAlign: 2, width: 60, type: 'Number'},
             {title: '截止本期完成计量|数量', colSpan: '3|1', rowSpan: '1|1', field: 'end_gather_qty', hAlign: 2, width: 60, type: 'Number'},
             {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'end_gather_tp', hAlign: 2, width: 60, type: 'Number'},
-            {title: '|完成率(%)', colSpan: '1', rowSpan: '|1', field: 'end_gather_percent', hAlign: 2, width: 60, readOnly: true, type: 'Number'},
+            {title: '|完成率(%)', colSpan: '|1', rowSpan: '|1', field: 'end_gather_percent', hAlign: 2, width: 60, readOnly: true, type: 'Number'},
             {title: '图（册）号', colSpan: '1', rowSpan: '2', field: 'drawing_code_merge', hAlign: 0, width: 80, formatter: '@'},
             {title: '本期批注', colSpan: '1', rowSpan: '2', field: 'postil_merge', hAlign: 0, width: 100, formatter: '@', cellType: 'ellipsisAutoTip'},
             {title: '备注', colSpan: '1', rowSpan: '2', field: 'memo_merge', hAlign: 0, width: 100, formatter: '@', cellType: 'ellipsisAutoTip'},