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

web/building_saas/main/js/views/block_lib.js

@@ -58,7 +58,7 @@ var blockLibObj = {
             {headerName: "编码", headerWidth: 45, dataCode: "code", dataType: "String", hAlign: "center"},
             {headerName: "名称", headerWidth: 100, dataCode: "name", dataType: "String"},
             {headerName: "单位", headerWidth: 40, dataCode: "unit", dataType: "String", hAlign: "center"},
-            {headerName: "分解系数", headerWidth: 40, dataCode: "contain", dataType: "Number"},
+            {headerName: "分解系数", headerWidth: 70, dataCode: "contain", dataType: "Number"},
             {headerName: "取费类别", headerWidth: 70, dataCode: "programName", dataType: "String", hAlign: "center"},
             {headerName: "综合单价", headerWidth: 70, dataCode: "unitFee", dataType: "Number"},
             {headerName: "子目换算状态", headerWidth: 90, dataCode: "adjustState", dataType: "String"}

web/over_write/js/hunan_2014.js

@@ -334,7 +334,6 @@ if (typeof electrovalenceObj !== 'undefined') {
 }
 
 if (typeof gljUtil !== 'undefined') {
-  gljUtil.getCodeSortMath = getCodeSortMath;
   gljUtil.getElecCoe = function () {
       return 0.24;
   }