Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/reports/util/rpt_yanghu_data_util.js

@@ -1298,6 +1298,7 @@ function setupFunc(obj, prop, ownRawObj) {
     obj[prop]["myOwnOrgRawDataObj"] = ownRawObj.data;
     obj[prop].getProperty = ext_getProperty;
     obj[prop].getGljFreightProperty = ext_getGljFreightProperty;
+    obj[prop].getGljOriginalProperty = ext_getGljOriginalProperty;
     obj[prop].getPropertyByRefId = ext_getPropertyByRefId;
     obj[prop].getFee = ext_getFee;
     obj[prop].getPropertyByForeignId = ext_getPropertyByForeignId;
@@ -1533,6 +1534,18 @@ function ext_getGljFreightProperty(propKey) {
     return rst;
 }
 
+function ext_getGljOriginalProperty(propKey) {
+    let rst = [], parentObj = this;
+    let dtObj = parentObj["myOwnRawDataObj"];
+    if (propKey && dtObj) {
+        for (let dItem of getActDataArr(dtObj, "originalList")) {
+            let doc = (dItem._doc === null || dItem._doc === undefined)?dItem:dItem._doc;
+            pri_push_property(propKey, doc, rst);
+        }
+    }
+    return rst;
+}
+
 function ext_getProperty(propKey) {
     let rst = [], parentObj = this;
     let dtObj = parentObj["myOwnRawDataObj"];