|
@@ -3463,7 +3463,7 @@ let calcTemplates = [
|
|
}
|
|
}
|
|
];*/
|
|
];*/
|
|
|
|
|
|
-let calcLabourCoes = [
|
|
|
|
|
|
+/*let calcLabourCoes = [
|
|
{
|
|
{
|
|
"ID" : 1,
|
|
"ID" : 1,
|
|
"ParentID" : null,
|
|
"ParentID" : null,
|
|
@@ -3590,7 +3590,7 @@ let calcLabourCoes = [
|
|
"name" : "盾构用工",
|
|
"name" : "盾构用工",
|
|
"coe" :1.49
|
|
"coe" :1.49
|
|
}
|
|
}
|
|
-];
|
|
|
|
|
|
+];*/
|
|
|
|
|
|
class CalcProgram {
|
|
class CalcProgram {
|
|
constructor(project){
|
|
constructor(project){
|
|
@@ -3600,6 +3600,7 @@ class CalcProgram {
|
|
|
|
|
|
compileAllTemps(){
|
|
compileAllTemps(){
|
|
let calcFeeRates = this.project.FeeRate.datas.rates;
|
|
let calcFeeRates = this.project.FeeRate.datas.rates;
|
|
|
|
+ let calcLabourCoes = this.project.LabourCoe.datas.coes;
|
|
this.calc.compilePublics(calcFeeRates, calcLabourCoes, feeType, rationCalcBase);
|
|
this.calc.compilePublics(calcFeeRates, calcLabourCoes, feeType, rationCalcBase);
|
|
for (let calcTemplate of calcTemplates){
|
|
for (let calcTemplate of calcTemplates){
|
|
this.calc.compileTemplate(calcTemplate);
|
|
this.calc.compileTemplate(calcTemplate);
|