|
|
@@ -412,7 +412,9 @@ let zTreeOprObj = {
|
|
|
}
|
|
|
}
|
|
|
$("#show_project_folder").trigger("click");
|
|
|
- me.prjFolderTreeObj = $.fn.zTree.init($("#prjFolderTree"), rpt_prj_folder_setting, selectedProjects);
|
|
|
+ let topItem = [{name: '所有相关项目', items: selectedProjects}];
|
|
|
+ // me.prjFolderTreeObj = $.fn.zTree.init($("#prjFolderTree"), rpt_prj_folder_setting, selectedProjects);
|
|
|
+ me.prjFolderTreeObj = $.fn.zTree.init($("#prjFolderTree"), rpt_prj_folder_setting, topItem);
|
|
|
me.prjFolderTreeObj.expandAll(true);
|
|
|
} else {
|
|
|
alert('error: ' + result.message);
|
|
|
@@ -446,6 +448,9 @@ let zTreeOprObj = {
|
|
|
let me = zTreeOprObj;
|
|
|
let nodes = me.prjFolderTreeObj.getCheckedNodes(true);
|
|
|
if (nodes.length > 0) {
|
|
|
+ if (nodes[0].level === 0) {
|
|
|
+ nodes.splice(0, 1);
|
|
|
+ }
|
|
|
hintBox.waitBox();
|
|
|
let params = {};
|
|
|
params.pageSize = rptControlObj.getCurrentPageSize();
|
|
|
@@ -493,6 +498,9 @@ let zTreeOprObj = {
|
|
|
let me = zTreeOprObj;
|
|
|
let nodes = me.prjFolderTreeObj.getCheckedNodes(true);
|
|
|
if (nodes.length > 0) {
|
|
|
+ if (nodes[0].level === 0) {
|
|
|
+ nodes.splice(0, 1);
|
|
|
+ }
|
|
|
hintBox.waitBox();
|
|
|
let params = {};
|
|
|
params.pageSize = rptControlObj.getCurrentPageSize();
|
|
|
@@ -761,8 +769,10 @@ let rptControlObj = {
|
|
|
rst.prjIds = [];
|
|
|
zTreeOprObj.selectedPrjIDs = [];
|
|
|
for (let node of nodes) {
|
|
|
- rst.prjIds.push(node.ID);
|
|
|
- zTreeOprObj.selectedPrjIDs.push(node.ID);
|
|
|
+ if (node.level > 0) {
|
|
|
+ rst.prjIds.push(node.ID);
|
|
|
+ zTreeOprObj.selectedPrjIDs.push(node.ID);
|
|
|
+ }
|
|
|
}
|
|
|
// rst.sum_rpt_names = bill_rpt_names.concat(glj_rpt_names);
|
|
|
// rst.rpt_names = rpt_names;
|
