浙江接口调整

modules/reports/rpt_component/jpc_flow_tab.js

@@ -139,7 +139,7 @@ JpcFlowTabSrv.prototype.createNew = function(){
         return nextPageAutoHeightRecAmt;
     }
     let JpcFlowTabResult = {};
-    JpcFlowTabResult.initialize = function(isEx) {
+    JpcFlowTabResult.initialize = function(isEx, excludeBlankRow = false) {
         let me = this;
         me.isEx = isEx;
         me.paging_option = JV.PAGING_OPTION_NORMAL;
@@ -167,6 +167,10 @@ JpcFlowTabSrv.prototype.createNew = function(){
         me.pageSumValLst = [];
         me.multiCols = 1;
         me.pagesAmt = 0;
+
+        me.excludeBlankRow = excludeBlankRow; //空行提上特性(只针对普通流水，预览及isEx情况不支持)
+        me.excludeTop = -1;    // 空行提上时需要判断的上位置
+        me.excludeBottom = -1; // 空行提上时需要判断的下位置(另：上下位置差会影响 BAND_PROP_MERGE_BAND 的Bottom位置)
     };
     JpcFlowTabResult.sorting = function(rptTpl, dataObj, dataSeq, $CURRENT_RPT) {
         let me = this;
@@ -1047,6 +1051,9 @@ JpcFlowTabSrv.prototype.createNew = function(){
                         if (!(tab_field[JV.PROP_HIDDEN])) {
                             if (contentValuesIdx[rowIdx][0] !== JV.TYPE_FOLLOW_MODE && contentValuesIdx[rowIdx][1] === JV.DISPLAY_VAL_TYPE_NORMAL) {
                                 rst.push(me.outputTabField(band, tab_field, data_field, contentValuesIdx[rowIdx][2], -1, contentValuesIdx.length, rowIdx, 1, 0, unitFactor, false, controls, multiColIdx));
+                                if (this.excludeBlankRow && contentValuesIdx[rowIdx][2] === JV.BLANK_VALUE_INDEX) {
+                                    //
+                                }
                             } else if (contentValuesIdx[rowIdx][1] === JV.DISPLAY_VAL_TYPE_AUTO_HEIGHT) {
                                 if (contentValuesIdx[rowIdx][4] === 1) {
                                     //等效于普通输出

web/building_saas/standard_interface/export/zhejiang_xiangshan.js

@@ -304,11 +304,11 @@ INTERFACE_EXPORT = (() => {
           return '22'
         }
         // 工程一切险
-        if ((node.data.code == '-a') && (node.parent && (node.parent.data.code == '101-1'))) {
+        if ((node.data.code == '-a' || node.data.code == '101-1-1') && (node.parent && (node.parent.data.code == '101-1'))) {
           return '23'
         }
         // 第三者责任险
-        if ((node.data.code == '-b') && (node.parent && (node.parent.data.code == '101-1'))) {
+        if ((node.data.code == '-b' || node.data.code == '101-1-2') && (node.parent && (node.parent.data.code == '101-1'))) {
           return '24'
         }
         return '20';