code sync / “量材数据转移”

modules/reports/util/rpt_construct_data_util.js

@@ -32,6 +32,9 @@ class Rpt_Common{
         }
         for (let i = 0; i < maxLen; i++) {
             let value = ((i < val1.length)?val1[i]:val1[minLen - 1]) * ((i < val2.length)?val2[i]:val2[minLen - 1]);
+            if (value === null || value === undefined) {
+                value = '0';
+            }
             if (fixFormat) value = value.toFixed(fixFormat);
             rst.push(value);
         }
@@ -476,7 +479,7 @@ function moveRationData(rationData, rawDataObj) {
                 copyItem.rationID = rationItem.ID;
                 copyItem.rationItemQuantity = 1;
                 copyItem.quantity = 1;
-                copyItem.specialType_quantity = rationItem.quantity;
+                // copyItem.specialType_quantity = rationItem.quantity;
                 copyItem.name = rationItem.name;
                 if (rationItem.code) {
                     copyItem.code = rationItem.ID + "_" + rationItem.code;
@@ -490,7 +493,6 @@ function moveRationData(rationData, rawDataObj) {
                 copyItem.shortName = rationItem.shortName;
                 copyItem.billsItemID = rationItem.billsItemID;
                 copyItem.type = rationItem.subType;
-                // copyItem.repositoryId = rationItem.?;
                 if (rationItem.projectGLJID) {
                     copyItem.projectGLJID = rationItem.projectGLJID;
                 } else {
@@ -500,17 +502,12 @@ function moveRationData(rationData, rawDataObj) {
                     dummyPrjItem.id = dummyPRJID;
                     dummyPRJID++;
                     dummyPrjItem.unit_price = {};
-                    // dummyPrjItem.unit_price.base_price = 0;
-                    // dummyPrjItem.unit_price.market_price = 0;
                     dummyPrjItem.unit_price.base_price = 0;
-                    dummyPrjItem.unit_price.market_price = rationItem["marketUnitFee"];
+                    dummyPrjItem.unit_price.market_price = (rationItem["marketUnitFee"])?rationItem["marketUnitFee"]:0;
                     dummyPrjItem.quantity = 0;
                     dummyPrjItem.is_evaluate = 0;
                     prjGljData.data.gljList.push(dummyPrjItem);
                 }
-                // copyItem.adjCoe = rationItem.?;
-                // copyItem.from = rationItem.?;
-                // copyItem.createType = rationItem.?;
                 rationGljData.data.push(copyItem);
             }
         }
@@ -1092,6 +1089,7 @@ function ext_getPropertyByForeignId(foreignIdVal, adHocIdKey, propKey, dftValIfN
     let rst = [], parentObj = this;
     let IdKey = (adHocIdKey)?adHocIdKey:"ID";
     let dtObj = parentObj["myOwnRawDataObj"];
+    let splitPKey = propKey.split(".");
     if (foreignIdVal !== null && foreignIdVal !== undefined) {
         let isFound = false;
         if (foreignIdVal instanceof Array) {
@@ -1102,7 +1100,6 @@ function ext_getPropertyByForeignId(foreignIdVal, adHocIdKey, propKey, dftValIfN
                 for (let i = 0; i < dataArr.length; i++) {
                     let item = (dataArr[i]._doc)?dataArr[i]._doc:dataArr[i];
                     if (item[IdKey] === idVal) {
-                        let splitPKey = propKey.split(".");
                         if (splitPKey.length > 1) {
                             let rstP = null;
                             for (let i = 0; i < splitPKey.length; i++) {

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -116,12 +116,13 @@ let preHandleObj = {
         let me = this, types = [];
         types.push({Name: JV.PROP_HANDLE_TYPE_SORT, Title: ""});
         types.push({Name: JV.PROP_HANDLE_TYPE_FILTER, Title: ""});
+        types.push({Name: JV.PROP_HANDLE_TYPE_BILLS_DATA_MOVE, Title: ""});
         types.push({Name: JV.PROP_HANDLE_TYPE_SUM, Title: ""});
         types.push({Name: JV.PROP_HANDLE_TYPE_ADJUST, Title: ""});
         types.push({Name: JV.PROP_HANDLE_TYPE_ADD_DUMMY, Title: ""});
         // types.push({Name: "纯手工填写", Title: ""});
         me.typeTreeObj = $.fn.zTree.init($("#pre_handle_type_reversed"), preHandleTypeSetting, types);
-        me.setDisabledBandSelect([0,1,2,3,4]);
+        me.setDisabledBandSelect([0,1,2,3,4,5]);
         me.build_handle_data_selection();
     },
     setDisabledBandSelect: function(disabledIdxArr) {
@@ -149,6 +150,9 @@ let preHandleObj = {
             case JV.PROP_HANDLE_TYPE_FILTER:
                 item = {Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": preHandleType, "过滤键值集": []};
                 break;
+            case JV.PROP_HANDLE_TYPE_BILLS_DATA_MOVE:
+                item = {Name: "预处理环节", Title: "", "映射数据对象": "ration", "预处理类型": preHandleType};
+                break;
             case JV.PROP_HANDLE_TYPE_SUM:
                 item = {Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": preHandleType, "分组键值集": [], "统计键值集":[]};
                 break;
@@ -179,6 +183,8 @@ let preHandleObj = {
             case JV.PROP_HANDLE_TYPE_FILTER:
                 item[JV.PROP_FILTER_KEYS] = [];
                 break;
+            case JV.PROP_HANDLE_TYPE_BILLS_DATA_MOVE:
+                break;
             case JV.PROP_HANDLE_TYPE_SUM:
                 item[JV.PROP_SUM_GROUP_KEYS] = [];
                 item[JV.PROP_SUM_SUM_KEYS] = [];
@@ -274,7 +280,7 @@ let preHandleObj = {
         //点击预处理环节 节点
         let me = preHandleObj;
         me.currentNode = treeNode;
-        me.setDisabledBandSelect([2,3,4]);
+        me.setDisabledBandSelect([3,4,5]);
         // me.setDisabledBandSelect([]);
         me.refreshByNode(treeNode);
     },