①bug: 量价，输入单价p，反算得到单价p1，第二次再输入单价p，单价变成p，不再反算了。（实际反算了，没刷新）

②甘肃养护计算基数、取费类别。

web/building_saas/main/js/views/project_view.js

@@ -195,7 +195,7 @@ var projectObj = {
         }
         if (value!=undefined||value!=null) {
             if (colSetting.data.decimal) {
-                value = value.toDecimal(colSetting.data.decimal);   
+                value = value.toDecimal(colSetting.data.decimal);
             }
         } else if (editingText && editingText !== '') {
             value = null;
@@ -523,8 +523,10 @@ var projectObj = {
                 };
 
                 //计算基数赋值要经过解析和标准化，已在calculate里赋值
-                if(fieldName !== 'calcBase')
-                    calcTools.setFieldValue(node, fieldName, value);
+                if(fieldName !== 'calcBase'){
+                  calcTools.setFieldValue(node, fieldName, value);
+                  projectObj.mainController.refreshTreeNode([node]);  // 量价，输入单价x，反算单价x1，第二次输入单价x，单价不再反算。（实际反算了，没刷新）
+                }
 
                 project.calcProgram.calcAndSave(node);
                 gljOprObj.showRationGLJSheetData();
@@ -559,7 +561,7 @@ var projectObj = {
         projectObj.lastCell = {row: info.row, col: info.col};
         if(colSetting.data.field === 'quantity'){
             SheetDataHelper.hideMoreButton()
-        }  
+        }
     },
     //repaint 动态下拉框
     mainSpreadEnterCell: function (sender, info) {
@@ -581,7 +583,7 @@ var projectObj = {
         let colSetting = projectObj.mainController.setting.cols[info.sheet.getActiveColumnIndex()];
         if(colSetting.data.field === 'quantity'){
             SheetDataHelper.moveMoreButton(info.sheet)
-        }    
+        }
     },
     mainSpreadEditStarting: function (sender, info) {
         let project = projectObj.project;
@@ -634,7 +636,7 @@ var projectObj = {
             }
         }
         if(node.sourceType == ModuleNames.ration){ //在定额编码中双击，如果右侧定额库没有展开，则自动展开。
-          if(node.data.type != rationType.ration) return ;//只有定额类型才需要自动展开，其它都不用 
+          if(node.data.type != rationType.ration) return ;//只有定额类型才需要自动展开，其它都不用
             let libID = node.data.libID;
             if (node.data.from === 'cpt') {
                 libID = node.data.fromUser ? `${rationLibObj.compleRationLibId}*${node.data.fromUser}` : rationLibObj.compleRationLibId;
@@ -961,8 +963,8 @@ var projectObj = {
                             col.data.formatter = MainTreeCol.getNumberFormatter(decimalObj.ration.unitPrice, true);
                     // }
 
-                });    
-                that.mainController = TREE_SHEET_CONTROLLER.createNew(that.project.mainTree, that.mainSpread.getActiveSheet(), that.project.projSetting.mainGridSetting);  
+                });
+                that.mainController = TREE_SHEET_CONTROLLER.createNew(that.project.mainTree, that.mainSpread.getActiveSheet(), that.project.projSetting.mainGridSetting);
                 that.mainController.bind('refreshBaseActn', that.refreshBaseActn);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.beforeTreeSelectedChange, that.beforeMainTreeSelectedChange);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.treeSelectedChanged, that.treeSelectedChanged);
@@ -994,7 +996,7 @@ var projectObj = {
 
 
                 //工程量悬浮窗移动事件
-                that.mainSpread.bind(GC.Spread.Sheets.Events.TopRowChanged, that.TopRowChanged);    
+                that.mainSpread.bind(GC.Spread.Sheets.Events.TopRowChanged, that.TopRowChanged);
                 //let loadOtherStartTime = +new Date();
                 //if(!projectReadOnly){
                     that.loadMainSpreadContextMenu();
@@ -1178,15 +1180,15 @@ var projectObj = {
 
     },
     isInsertEquipmentVisable:function(selected){
-      //浙江不管是预算或者工程量清单，都是隐藏，overwrite文件重写   
+      //浙江不管是预算或者工程量清单，都是隐藏，overwrite文件重写
       if(this.project.property.valuationType !=='ration' ){//属于预算项目的情况下，在固定清单可见
         //属于的固定清单
         let belongFlag = cbTools.getBelongFlag(selected);
         if (belongFlag && belongFlag === fixedFlag.EQUIPMENT_ACQUISITION_FEE) {
             return true;
         }
-        return false; 
-      } 
+        return false;
+      }
       return true
     },
     // 注册自定义插入清单数量
@@ -1850,7 +1852,7 @@ var projectObj = {
             for (let row = selectedArea.row; row < (selectedArea.rowCount + selectedArea.row); row++) {
                 const value = sheet.getCell(row, col).text();
                 if (!regular.test(value)) {
-                    if(value) notNumber = true; 
+                    if(value) notNumber = true;
                     continue;
                 }
                 counter++;
@@ -2462,7 +2464,7 @@ $('#poj-set').on('show.bs.modal', function () {
         setCalcFlag($('#billsPrice'), leafBillGetFeeType.billsPrice, ft);
         setCalcFlag($('#zangu_common'), zanguCalcType.common, zg);
         setCalcFlag($('#zangu_gatherMaterial'), zanguCalcType.gatherMaterial, zg);
-        
+
         let showAdjustPrice = projectObj.project.projSetting.glj_col?projectObj.project.projSetting.glj_col.showAdjustPrice:false;
         showAdjustPrice === true ? $("#tab_poj-settings-6").show():$("#tab_poj-settings-6").hide();
         projDisplayView.init();
@@ -3550,4 +3552,4 @@ $('.limit-price-input').bind('input', function () {
         alert(err);
         $(this).val(orgVal);
     }
-});
+});

web/over_write/js/gansu_2017

@@ -0,0 +1,75 @@
+/**
+ * Created by CSL on 2021/04/25.  甘肃养护计算程序、基数 等覆盖。
+ */
+
+let isGS2017 = true;
+function overwriteRationCalcBases() {
+  if (typeof rationCalcBases == 'undefined') return;
+  for (let key in rationCalcBases) delete rationCalcBases[key];
+
+  rationCalcBases['人工费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptMarketPrice, isTender);
+  };
+  rationCalcBases['材料费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptMarketPrice, isTender);
+  };
+  rationCalcBases['施工机械使用费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender);
+  };
+  rationCalcBases['施工机械人工费'] = function (node, isTender) {
+    return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.MACHINE_LABOUR, isTender);
+  };
+  rationCalcBases['设备购置费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
+  };
+
+  rationCalcBases['定额人工费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptBasePrice, isTender);
+  };
+  rationCalcBases['定额材料费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptBasePrice, isTender);
+  };
+  rationCalcBases['定额施工机械使用费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptBasePrice, isTender);
+  };
+  rationCalcBases['定额商品砼费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, [gljType.COMMERCIAL_CONCRETE, gljType.COMMERCIAL_MORTAR], priceTypes.ptBasePrice, isTender);
+  };
+  rationCalcBases['定额设备费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptBasePrice, isTender);
+  };
+  rationCalcBases['定额外购砼构件费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, [gljType.PURCHASE_COMPONENT], priceTypes.ptBasePrice, isTender);
+  };
+  rationCalcBases['定额绿化苗木费'] = function (node, isTender) {
+    return calcTools.rationBaseFee(node, [gljType.GREEN_SEEDLING], priceTypes.ptBasePrice, isTender);
+  };
+};
+
+(function overwriteFeeTypes() {
+  if (typeof cpFeeTypes == 'undefined') return;
+  cpFeeTypes = [
+    { type: 'marketLabour', name: '人工费' },
+    { type: 'marketMaterial', name: '材料费' },
+    { type: 'marketMachine', name: '施工机械使用费' },
+    { type: 'marketMachineLabour', name: '施工机械人工费' },
+    { type: 'marketEquipment', name: '设备购置费' },
+    { type: 'marketDirect', name: '直接费' },
+
+    { type: 'labour', name: '定额人工费' },
+    { type: 'material', name: '定额材料费' },
+    { type: 'machine', name: '定额施工机械使用费' },
+    { type: 'equipment', name: '定额设备费' },
+    { type: 'direct', name: '定额直接费' },
+
+    { type: 'measure', name: '措施费' },
+    { type: 'measure1', name: '措施费I' },
+    { type: 'measure2', name: '措施费II' },
+    { type: 'manage', name: '企业管理费' },
+    { type: 'force', name: '规费' },
+    { type: 'profit', name: '利润' },
+    { type: 'tax', name: '税金' },
+    { type: 'common', name: '建安费' },
+    { type: 'rationCommon', name: '定额建安费' }
+  ];
+})();