|
|
@@ -312,6 +312,7 @@ let divideObj = {
|
|
|
newItem.seq = seq;
|
|
|
datas.push({type:"add",doc:newItem});
|
|
|
await this.updateItem(datas);
|
|
|
+ await this.calcDivideItem(newItem);
|
|
|
},
|
|
|
calcBills:function(bills,deleteMap){
|
|
|
let divideSetting = projectObj.project.divide_setting.datas;
|
|
|
@@ -325,7 +326,12 @@ let divideObj = {
|
|
|
}
|
|
|
if(c.ID == bills.ID) item = c;
|
|
|
}
|
|
|
- projectObj.project.calcProgram.innerCalcBill({data:item, sourceType:"bills", calcType: 3, updateData:[],children:subNodes},3);
|
|
|
+ if(subNodes.length > 0) projectObj.project.calcProgram.innerCalcBill({data:item, sourceType:"bills", updateData:[],children:subNodes},3);
|
|
|
+ if(subNodes.length == 0){
|
|
|
+ item.calcFlag = 2;
|
|
|
+ this.initFeeIndexs(item);
|
|
|
+ projectObj.project.calcProgram.innerCalcBillCustom({data:item, sourceType:"bills", updateData:[],children:[]},3);
|
|
|
+ }
|
|
|
return item;
|
|
|
},
|
|
|
initFeeIndexs:function(item){
|
|
|
@@ -465,7 +471,7 @@ let divideObj = {
|
|
|
}
|
|
|
}
|
|
|
if(children.length > 0){
|
|
|
- projectObj.project.calcProgram.innerCalcBill({data:parent, sourceType:"bills", calcType: 3, updateData:[],children:children},3);
|
|
|
+ projectObj.project.calcProgram.innerCalcBill({data:parent, sourceType:"bills", updateData:[],children:children},3);
|
|
|
updateDatas.push({ID:parent.ID,type:'update',doc:{fees:parent.fees}});
|
|
|
}
|
|
|
}else{
|
|
|
@@ -932,7 +938,7 @@ $('#divide_zmhs_toogle').bind('click',function (){
|
|
|
$("#divide_zmhs_toogle").hide();
|
|
|
});
|
|
|
|
|
|
-$('.divideBottom ul li a').bind('click',function () {
|
|
|
+$('#divideBottom ul li a').on('shown.bs.tab',function () {
|
|
|
divideObj.showRationGLJDatas();
|
|
|
divideObj.showCalcProgramDatas();
|
|
|
});
|