|
@@ -25,6 +25,9 @@ var projectObj = {
|
|
|
if (!err) {
|
|
|
BillsGridSetting.cols.forEach(function (col) {
|
|
|
col.data.splitFields = col.data.field.split('.');
|
|
|
+ if (col.data.field === 'type') {
|
|
|
+ col.data.getText = ColGetText.mainTree.type;
|
|
|
+ }
|
|
|
});
|
|
|
that.mainController = TREE_SHEET_CONTROLLER.createNew(that.project.mainTree, that.mainSpread.getActiveSheet(), BillsGridSetting);
|
|
|
that.mainController.showTreeData();
|
|
@@ -36,11 +39,12 @@ var projectObj = {
|
|
|
btn.addClass('disabled');
|
|
|
}
|
|
|
};
|
|
|
- setButtonValid(tree.selected && tree.selected.canUpLevel(), $('#upLevel'));
|
|
|
- setButtonValid(tree.selected && tree.selected.canDownLevel(), $('#downLevel'));
|
|
|
- setButtonValid(tree.selected && tree.selected.canUpMove(), $('#upMove'));
|
|
|
- setButtonValid(tree.selected && tree.selected.canDownMove(), $('#downMove'));
|
|
|
- setButtonValid(tree.selected ? true : false, $('#delete'));
|
|
|
+ let selected = tree.selected;
|
|
|
+ setButtonValid(selected && selected.canUpLevel(), $('#upLevel'));
|
|
|
+ setButtonValid(selected && selected.canDownLevel(), $('#downLevel'));
|
|
|
+ setButtonValid(selected && (selected.level > 0) && selected.canUpMove(), $('#upMove'));
|
|
|
+ setButtonValid(selected && (selected.level > 0) && selected.canDownMove(), $('#downMove'));
|
|
|
+ setButtonValid(selected, $('#delete'));
|
|
|
});
|
|
|
|
|
|
/* if(!projectObj.gljSpreed){
|
|
@@ -92,7 +96,13 @@ var projectObj = {
|
|
|
if (selected.sourceType === project.Ration.getSourceType()) {
|
|
|
return false;
|
|
|
} else if (selected.sourceType === project.Bills.getSourceType()) {
|
|
|
- return selected.source.children.length !== 0;
|
|
|
+ if (selected.source.children.length === 0) {
|
|
|
+ return selected.children.length !== 0 ? selected.firstChild().sourceType !== project.Ration.getSourceType() : false;
|
|
|
+ } else {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ } else if (selected.sourceType === project.VolumePrice.getSourceType()) {
|
|
|
+ return true;
|
|
|
};
|
|
|
} else {
|
|
|
return true;
|
|
@@ -109,13 +119,22 @@ var projectObj = {
|
|
|
var selected = project.mainTree.selected;
|
|
|
if (selected) {
|
|
|
if (selected.sourceType === project.Ration.getSourceType()) {
|
|
|
- return false;
|
|
|
+ return true;
|
|
|
} else if (selected.sourceType === project.Bills.getSourceType()) {
|
|
|
- return selected.source.children.length !== 0;
|
|
|
+ if (selected.source.children.length === 0) {
|
|
|
+ return selected.children.length !== 0 ? selected.firstChild().sourceType !== project.VolumePrice.getSourceType() : false;
|
|
|
+ } else {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ } else if (selected.sourceType === project.VolumePrice.getSourceType()) {
|
|
|
+ return true;
|
|
|
};
|
|
|
} else {
|
|
|
return true;
|
|
|
}
|
|
|
+ },
|
|
|
+ callback: function (key, opt) {
|
|
|
+ ProjectController.addVolumePrice(project, controller);
|
|
|
}
|
|
|
},
|
|
|
"spr1": '--------',
|
|
@@ -174,6 +193,8 @@ $('#insert').click(function () {
|
|
|
ProjectController.addBills(project, controller);
|
|
|
} else if (selected.sourceType === project.Ration.getSourceType()) {
|
|
|
ProjectController.addRation(project, controller);
|
|
|
+ } else if (selected.sourceType === project.VolumePrice.getSourceType()) {
|
|
|
+ ProjectController.addVolumePrice(project, controller);
|
|
|
}
|
|
|
});
|
|
|
$('#delete').click(function () {
|
|
@@ -189,6 +210,9 @@ $('#delete').click(function () {
|
|
|
project.ration_glj.deleteByRation(selected.source);
|
|
|
project.ration_coe.deleteByRation(selected.source);
|
|
|
controller.delete();
|
|
|
+ } else if (selected.sourceType === project.VolumePrice.getSourceType()) {
|
|
|
+ project.VolumePrice.delete(selected.source);
|
|
|
+ controller.delete();
|
|
|
};
|
|
|
}
|
|
|
});
|
|
@@ -219,21 +243,23 @@ $('#upMove').click(function () {
|
|
|
} else if (selected.sourceType === project.Ration.getSourceType()) {
|
|
|
project.Ration.changePos(selected.source, selected.preSibling.source);
|
|
|
controller.upMove();
|
|
|
- }
|
|
|
- if (selected) {
|
|
|
+ } else if (selected.sourceType === project.VolumePrice.getSourceType()) {
|
|
|
+ project.VolumePrice.changePos(selected.source, selected.preSibling.source);
|
|
|
+ controller.upMove();
|
|
|
}
|
|
|
});
|
|
|
$('#downMove').click(function () {
|
|
|
var controller = projectObj.mainController, project = projectObj.project;
|
|
|
var selected = controller.tree.selected, next, nextSerialNo;
|
|
|
|
|
|
- if (selected) {
|
|
|
- if (selected.sourceType === project.Bills.getSourceType()) {
|
|
|
- project.Bills.downMoveBills(selected.source);
|
|
|
- controller.downMove();
|
|
|
- } else if (selected.sourceType === project.Ration.getSourceType()) {
|
|
|
- project.Ration.changePos(selected.source, selected.nextSibling.source);
|
|
|
- controller.downMove();
|
|
|
- }
|
|
|
+ if (selected.sourceType === project.Bills.getSourceType()) {
|
|
|
+ project.Bills.downMoveBills(selected.source);
|
|
|
+ controller.downMove();
|
|
|
+ } else if (selected.sourceType === project.Ration.getSourceType()) {
|
|
|
+ project.Ration.changePos(selected.source, selected.nextSibling.source);
|
|
|
+ controller.downMove();
|
|
|
+ } else if (selected.sourceType === project.VolumePrice.getSourceType()) {
|
|
|
+ project.VolumePrice.changePos(selected.source, selected.nextSibling.source);
|
|
|
+ controller.downMove();
|
|
|
}
|
|
|
});
|