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

report/src/core/helper/jpc_helper_field.ts

@@ -10,7 +10,7 @@ let JpcFieldHelper = {
         if (dataField && (dataField.length > valueIdx) && (valueIdx >= 0)) {
             rst = dataField[valueIdx];
         }
-        return rst;
+        return `${rst}`;
     },
     setValue: function (dataField: string[], valueIdx: number, newValue: string) {
         if (dataField && (dataField.length > valueIdx) && (valueIdx >= 0)) {

report/src/core/jpc_rte.ts

@@ -91,7 +91,7 @@ const JE = {
             dataObj[field.DataNodeName][field.DataSeq][valIdx] = newValue;
         }
     },
-    getFieldValue: function (field: Fields, dataObj: IDataObj, valIdx: number, newVal: number) {
+    getFieldValue: function (field: Fields, dataObj: IDataObj, valIdx: number, newVal: number|string) {
         let rst = null;
         if (field.DataNodeName === "NA") {
             if (!field.data_field) {

report/src/interface/projectConstsEnum.ts

@@ -26,7 +26,7 @@ let projectConst = {
 
 let projectConstList = [
     'bills',
-    'ration',
+    'rations',
     'GLJ',
     'ration_glj',
     'ration_coe',