|
@@ -675,7 +675,7 @@ var Bills = {
|
|
}
|
|
}
|
|
};
|
|
};
|
|
bills.prototype.getMeasureNode = function (controller) {//取措施项目工程节点
|
|
bills.prototype.getMeasureNode = function (controller) {//取措施项目工程节点
|
|
- let roots = controller.tree.roots;
|
|
|
|
|
|
+ let roots = controller?controller.tree.roots:projectObj.project.mainTree.roots;
|
|
for(let root of roots){
|
|
for(let root of roots){
|
|
if(isFlag(root.data)&&root.data.flagsIndex.fixed.flag==fixedFlag.MEASURE){
|
|
if(isFlag(root.data)&&root.data.flagsIndex.fixed.flag==fixedFlag.MEASURE){
|
|
return root;
|
|
return root;
|
|
@@ -954,7 +954,7 @@ var Bills = {
|
|
let controller = projectObj.mainController;
|
|
let controller = projectObj.mainController;
|
|
let parentNode;
|
|
let parentNode;
|
|
if(type == '措施费用'){
|
|
if(type == '措施费用'){
|
|
- parentNode = this.getTechNode();
|
|
|
|
|
|
+ parentNode = installationFeeObj.getMeasureParentNode();
|
|
}else {
|
|
}else {
|
|
let rootNode = this.getFBFXNode(controller);
|
|
let rootNode = this.getFBFXNode(controller);
|
|
parentNode =getLeaveBill(rootNode.source);
|
|
parentNode =getLeaveBill(rootNode.source);
|
|
@@ -987,7 +987,7 @@ var Bills = {
|
|
code : this.newFormatCode(code),
|
|
code : this.newFormatCode(code),
|
|
name:'安装增加费',
|
|
name:'安装增加费',
|
|
unit:'元',
|
|
unit:'元',
|
|
- stdCode:code,
|
|
|
|
|
|
+ stdCode:code.substring(0,9),
|
|
userID:userID,
|
|
userID:userID,
|
|
billsLibId:projectObj.project.projectInfo.engineeringInfo.bill_lib[0].id,
|
|
billsLibId:projectObj.project.projectInfo.engineeringInfo.bill_lib[0].id,
|
|
quantity:'1'
|
|
quantity:'1'
|