bug

public/web/common_util.js

@@ -41,6 +41,11 @@ Array.prototype.hasSubArr = function (subArr){
     return true;
 };
 
+Array.prototype.delete = function (elem){
+    let idx = this.findIndex(function (e){return e == elem});
+    if (idx != -1) this.splice(idx, 1);
+};
+
 function seqString(num,length){
     var numstr = num.toString();
     var l=numstr.length;

web/building_saas/main/js/views/calc_base_view.js

@@ -213,6 +213,7 @@ let calcBaseView = {
                 }
             }
             let bnArr = Object.keys(rationCalcBases);
+            bnArr.sort();
             let baseArr = [];
             for (let bn of bnArr) {
                 baseArr.push({base: bn})

web/building_saas/main/js/views/calc_program_manage.js

@@ -53,7 +53,7 @@ let calcProgramManage = {
         me.detailSpread = sheetCommonObj.buildSheet($('#detailSpread')[0], me.detailSetting, me.datas[0].calcItems.length);
         sheetCommonObj.spreadDefaultStyle(me.detailSpread);
         let arr = projectObj.project.calcProgram.compiledFeeTypeNames.slice();
-        // arr.splice(arr.findIndex(function (e){return e == '暂估费'}), 1);
+        // arr.delete('暂估费');
         let fieldName = new GC.Spread.Sheets.CellTypes.ComboBox();
         fieldName.items(arr);
         me.detailSpread.getSheet(0).getRange(-1, 4, -1, 1).cellType(fieldName);

web/over_write/js/chongqing_2018.js

@@ -47,6 +47,13 @@ if(typeof materialComponent !== 'undefined'){
 
 // CSL, 2018-08-21 计算程序、基数 的覆盖。
 if (rationCalcBases){
+    baseMaterialTypes.push(gljType.OTHER_MATERIAL);
+    allMaterialTypes.delete(gljType.EQUIPMENT);
+    baseMachineTypes.delete(gljType.MACHINE_COMPOSITION);
+    baseMachineTypes.push(gljType.INSTRUMENT, gljType.FUEL_POWER_FEE, gljType.DEPRECIATION_FEE,
+        gljType.INSPECTION_FEE, gljType.MAINTENANCE, gljType.DISMANTLING_FREIGHT_FEE,
+        gljType.VERIFICATION_FEE, gljType.OTHER_FEE, gljType.OTHER_MACHINE_USED);
+
     changePropNames(rationCalcBases,
         ['定额基价人工费', '定额基价材料费', '甲供定额基价人工费', '甲供定额基价材料费', '甲定定额基价人工费', '甲定定额基价材料费', '分包定额基价人工费','分包定额基价材料费'],
         ['定额人工费', '定额材料费', '甲供定额人工费', '甲供定额材料费', '甲定定额人工费', '甲定定额材料费', '分包定额人工费','分包定额材料费']);