清单固定类别新增第100章 总则

modules/common/const/bills_fixed.js

@@ -55,7 +55,9 @@ const fixedFlag = {
     //暂列金额
     PROVISIONAL:26,
     //安全生产费
-    SAFE_COST:27
+    SAFE_COST:27,
+    //100章清单
+    ONE_HUNDRED_BILLS: 28
 };
 /*建筑安装工程费、土地使用及拆迁补偿费、养护工程其他费用、预备费、基本预备费、价差预备费、一二三四部分合计、贷款利息、总造价、
 
@@ -89,7 +91,8 @@ const fixedFlagList = [
     {name: "材料", value: fixedFlag.MATERIAL},
     {name: "施工机械", value: fixedFlag.CONSTRUCTION_MACHINE},
     {name: "暂列金额", value: fixedFlag.PROVISIONAL},
-    {name:"安全生产费",value:fixedFlag.SAFE_COST}
+    {name:"安全生产费",value:fixedFlag.SAFE_COST},
+    {name:"第100章清单 总则",value:fixedFlag.ONE_HUNDRED_BILLS},
 ];
 
 export {fixedFlag as default, fixedFlagList as List};

web/maintain/std_glj_lib/js/glj.js

@@ -85,8 +85,6 @@ let repositoryGljObj = {
     currentCache: null,
     parentNodeIds: {},
     gljList: [],
-    machineModel: {textArr: ['特', '大', '中', '小'], comboItems: [{text: '特', value: 1}, {text: '大', value: 2},{text: '中', value: 3}, {text: '小', value: 4}]},
-    machineModelIdx: {'1': '特', '2': '大', '3': '中', '4': '小'},
     feeDataCode: ['grossWeightCoe', 'purchaseStorageRate', 'offSiteTransportLossRate', 'handlingLossRate'],
     distTypeTree: null,//add
     setting: {
@@ -1286,7 +1284,8 @@ let repositoryGljObj = {
         let me = repositoryGljObj;
         let updateArr = [], addArr = [];
         let items = sheetCommonObj.analyzePasteData(me.setting, info);
-        let beginRow = info.cellRange.row, endRow = info.cellRange.row + info.cellRange.rowCount - 1,
+        let beginRow = info.cellRange.row,
+            endRow = info.cellRange.row + info.cellRange.rowCount - 1,
             maxRow = me.currentCache.length - 1,
             updateBasePrcArr = [],
             updateCount, resumeArr = [];