|
@@ -295,7 +295,7 @@ let BlockController = {
|
|
|
project.quantity_detail.addDatasToList(result.quantity_details);
|
|
|
project.ration_glj.addDatasToList(result.ration_gljs);
|
|
|
project.ration_coe.addDatasToList(result.ration_coes);
|
|
|
- project.ration_installation.addDatasToList(result.ration_installations)
|
|
|
+ project.ration_installation.addDatasToList(result.ration_installations);
|
|
|
for(let u of result.updateData){
|
|
|
let unode = mainTree.findNode(u.query.ID);
|
|
|
if(unode){
|
|
@@ -318,10 +318,15 @@ let BlockController = {
|
|
|
createParentMap(parentMap_b,bills,'bills');
|
|
|
createParentMap(parentMap_r,rations,'ration');
|
|
|
if(parentMap_b[parentID]){
|
|
|
- firstNode = loadTreeNode(parentID,nextID,parentMap_b[parentID][0],'bills');
|
|
|
-
|
|
|
+ for(let i = 0;i < parentMap_b[parentID].length;i++){
|
|
|
+ let temNode = loadTreeNode(parentID,nextID,parentMap_b[parentID][i],'bills');
|
|
|
+ i==0?firstNode = temNode:'';
|
|
|
+ }
|
|
|
}else if(parentMap_r[parentID]){
|
|
|
- firstNode = loadTreeNode(parentID,nextID,parentMap_r[parentID][0],'ration');
|
|
|
+ for(let i = 0;i<parentMap_r[parentID].length;i++){
|
|
|
+ let temNode = loadTreeNode(parentID,nextID,parentMap_r[parentID][i],'ration');
|
|
|
+ i==0?firstNode = temNode:'';
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
ProjectController.syncDisplayNewNodes(projectObj.mainController, newNodes);
|
|
@@ -541,8 +546,8 @@ let BlockController = {
|
|
|
updateData.push({type:blockData.datas[0].sourceType,query:{ID:br[i].ID},doc:{serialNo:br_serialNo}});//更新兄弟节点序列号
|
|
|
}
|
|
|
}
|
|
|
- for(let i = 0 ; i < blockData.datas;i++){
|
|
|
- blockData.datas[i] = firstSerialNo;
|
|
|
+ for(let i = 0 ; i < blockData.datas.length;i++){
|
|
|
+ blockData.datas[i].serialNo = firstSerialNo;
|
|
|
firstSerialNo += 1;
|
|
|
}
|
|
|
},
|