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

modules/reports/controllers/rpt_controller.js

@@ -455,7 +455,7 @@ function getBillsSummaryReportPages(req, user_id, prjIds, rpt_id, pageSize, orie
                     cb('Have errors while on going...', null);
                 }
             } catch (ex) {
-                console.log("报表数据异常： userId " + user_id + ", project id: " + prj_id);
+                console.log("报表数据异常： userId " + user_id + ", project id: " + JSON.stringify(prjIds));
                 console.log(ex.message);
                 cb('Exception occurs while on going...', null);
             }
@@ -489,7 +489,7 @@ function getSummaryComboPages(req, user_id, prjIds, billsSummaryRpt_ids, gljSumm
             pageRstArr.push(pageRst);
         } catch (ex) {
             console.log("Summary报表数据异常： userId " + user_id + ", project ids: " + prjIds);
-            console.log(ex);
+            console.log(ex.message);
         }
     };
 

web/over_write/js/shandong_2016.js

@@ -28,9 +28,9 @@ function overwriteRationCalcBases() {
         { type: 'marketLabour', name: '人工费' },
         { type: 'marketMaterial', name: '材料费' },
         { type: 'marketMachine', name: '施工机械使用费' },
-        { type: 'otherFee', name: '其它工程费' },
-        { type: 'otherFee1', name: '其它工程费I' },
-        { type: 'otherFee2', name: '其它工程费II' },
+        { type: 'otherFee', name: '其他工程费' },
+        { type: 'otherFee1', name: '其他工程费I' },
+        { type: 'otherFee2', name: '其他工程费II' },
         { type: 'indirectFee', name: '间接费' },
         { type: 'manage', name: '企业管理费' },
         { type: 'force', name: '规费' },