|
|
@@ -390,10 +390,12 @@ function overwriteRationCalcBases() {
|
|
|
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);
|
|
|
};
|
|
|
@@ -419,10 +421,10 @@ function overwriteRationCalcBases() {
|
|
|
|
|
|
if (typeof projectObj !== 'undefined') {
|
|
|
projectObj.isInsertEquipmentVisable = function (selected) {
|
|
|
- return true; //广西不管是预算或者工程量清单,都是显示
|
|
|
+ return true; //广西不管是预算或者工程量清单,都是显示
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
if (typeof feeRateObject !== 'undefined') {
|
|
|
feeRateObject.feeRateSpecialHandle = function (subRate, value) {
|
|
|
@@ -451,6 +453,7 @@ if (typeof feeRateObject !== 'undefined') {
|
|
|
{ type: 'marketLabour', name: '人工费' },
|
|
|
{ type: 'marketMaterial', name: '材料费' },
|
|
|
{ type: 'marketMachine', name: '施工机械使用费' },
|
|
|
+ { type: 'marketMachineLabour', name: '施工机械人工费' },
|
|
|
{ type: 'marketEquipment', name: '设备购置费' },
|
|
|
|
|
|
{ type: 'labour', name: '定额人工费' },
|