09-x表新增未计价材料处理

modules/reports/rpt_component/jpc_rte.js

@@ -174,7 +174,7 @@ const JE = {
             }
         }
     },
-    alignFieldDecimal: function(sourceID, destID) {
+    alignFieldDecimal: function(sourceID, destID, $CURRENT_RPT) {
         // 把source指标的精度align到dest
         const me = JE;
         let sourceField = null;
@@ -194,7 +194,7 @@ const JE = {
             destField[JV.PROP_FIXED_PRECISION_AMT] = sourceField[JV.PROP_FIXED_PRECISION_AMT];
         }
     },
-    batchIniFields: function(IDArr) {
+    batchIniFields: function(IDArr, $CURRENT_RPT) {
         // 批处理查找指标
         const me = JE;
         for (let idxF = 0; idxF < IDArr.length; idxF++) {

modules/reports/util/rpt_construct_data_util.js

@@ -1002,6 +1002,58 @@ function addDummyData(sourceData, addCfg) {
     replaceActDataArr(sourceData, rstArr);
 }
 
+function getGLJBizType2018Ex(orgType, orgCode, orgName) {
+    let rst = orgType;
+    if (orgType === GLJ_TYPE.Labour) {
+        rst = 11;
+        if (orgCode === "000000") rst = 10;
+    } else if (orgType === GLJ_TYPE.Material || (orgType >= 200 && orgType < 300) || orgType === GLJ_TYPE.Main_Material || orgType === GLJ_TYPE.Equipment) {
+        //材料
+        if (orgCode === "000000") {
+            rst = 200; //2.材料
+        } else if (orgCode === "000000_0") {
+            rst = 220; //(0) 未计价材料
+        } else if (orgCode === "000000_1") {
+            rst = 230; //(1) 计价材料
+        } else if (orgCode === "000000_2") {
+            rst = 240; //(2) 其他材料费
+        } else {
+            if (orgType === GLJ_TYPE.OTHER_MATERIAL) {
+                //其他材料
+                rst = 245;
+            } else if (orgType === GLJ_TYPE.Main_Material || orgType === GLJ_TYPE.Equipment) {
+                rst = 225;
+            } else {
+                //计价材料
+                rst = 235;
+            }
+        }
+    } else if (orgType === GLJ_TYPE.Machine || (orgType >= 300 && orgType < 400)) {
+        //机械
+        if (orgCode === "000000") {
+            rst = 300; //3.机械
+        } else if (orgCode === "000000_1") {
+            rst = 330; //(1) 机上人工
+        } else if (orgCode === "000000_2") {
+            rst = 340; //(2) 燃油动力费
+        } else if (orgCode === "000000_3") {
+            rst = 350; //(2) 施工机具摊销费
+        } else {
+            if (orgType === GLJ_TYPE.MACHINE_LABOUR) {
+                //机上人工
+                rst = 335;
+            } else if (orgType === GLJ_TYPE.FUEL_POWER_FEE) {
+                //燃油动力费
+                rst = 345;
+            } else if (oprMachines.indexOf(orgType) >= 0) {
+                //施工机具摊销费
+                rst = 355 + oprMachines.indexOf(orgType);
+            }
+        }
+    }
+    return rst;
+}
+
 function getGLJBizType2018(orgType, orgCode, orgName) {
     let rst = orgType;
     if (orgType === GLJ_TYPE.Labour) {