|
@@ -299,17 +299,34 @@ let zTreeOprObj = {
|
|
|
dom.innerHTML = tmpStr;
|
|
|
me.changeCfg();
|
|
|
},
|
|
|
- changeCfg: function() {
|
|
|
+ changeCfg: async function() {
|
|
|
let me = zTreeOprObj;
|
|
|
let params = {};
|
|
|
params.pageSize = rptControlObj.getCurrentPageSize();
|
|
|
params.orientation = rptControlObj.getCurrentOrientation();
|
|
|
params.rpt_tpl_id = me.currentNode.refId;
|
|
|
params.flag = null;
|
|
|
+ // if (me.currentNode.hasOwnProperty('flags')) {
|
|
|
+ // params.flag = me.currentNode.flags;
|
|
|
+ // params.prj_ids = rptTplObj.getAllPrjIds();
|
|
|
+ // }
|
|
|
if (me.currentNode.hasOwnProperty('flags')) {
|
|
|
+ if (me.currentNode.flags.hasOwnProperty('auditType') && me.currentNode.flags.auditType === 'audit_compare') {
|
|
|
+ let pids = [];
|
|
|
+ let comp_pid = await compareObject.getCompareID(); //返回单个对应的project ID
|
|
|
+ if (comp_pid !== null) {
|
|
|
+ pids.push(projectObj.project.projectInfo.ID);
|
|
|
+ pids.push(comp_pid);
|
|
|
+ params.prj_ids = pids;
|
|
|
+ } else {
|
|
|
+ alert('未设置审核对比项目!');
|
|
|
+ exit;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ params.prj_ids = rptTplObj.getAllPrjIds();
|
|
|
+ }
|
|
|
params.flag = me.currentNode.flags;
|
|
|
- params.prj_ids = rptTplObj.getAllPrjIds();
|
|
|
- }
|
|
|
+ }
|
|
|
params.prj_id = projectObj.project.projectInfo.ID;
|
|
|
params.custCfg = me.reportPageCfg;
|
|
|
me.requestReport(params);
|
|
@@ -826,17 +843,34 @@ let rptControlObj = {
|
|
|
}, null
|
|
|
);
|
|
|
},
|
|
|
- confirmCfgChange: function() {
|
|
|
+ confirmCfgChange: async function() {
|
|
|
let treeNode = zTreeOprObj.currentNode;
|
|
|
if (treeNode.nodeType === TPL_TYPE_TEMPLATE && treeNode.refId > 0) {
|
|
|
let params = {};
|
|
|
params.pageSize = rptControlObj.getCurrentPageSize();
|
|
|
params.rpt_tpl_id = treeNode.refId;
|
|
|
params.flag = null;
|
|
|
- if (me.currentNode.hasOwnProperty('flags')) {
|
|
|
- params.flag = me.currentNode.flags;
|
|
|
- params.prj_ids = rptTplObj.getAllPrjIds();
|
|
|
- }
|
|
|
+ // if (me.currentNode.hasOwnProperty('flags')) {
|
|
|
+ // params.flag = me.currentNode.flags;
|
|
|
+ // params.prj_ids = rptTplObj.getAllPrjIds();
|
|
|
+ // }
|
|
|
+ if (treeNode.hasOwnProperty('flags')) {
|
|
|
+ if (treeNode.flags.hasOwnProperty('auditType') && treeNode.flags.auditType === 'audit_compare') {
|
|
|
+ let pids = [];
|
|
|
+ let comp_pid = await compareObject.getCompareID(); //返回单个对应的project ID
|
|
|
+ if (comp_pid !== null) {
|
|
|
+ pids.push(projectObj.project.projectInfo.ID);
|
|
|
+ pids.push(comp_pid);
|
|
|
+ params.prj_ids = pids;
|
|
|
+ } else {
|
|
|
+ alert('未设置审核对比项目!');
|
|
|
+ exit;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ params.prj_ids = rptTplObj.getAllPrjIds();
|
|
|
+ }
|
|
|
+ params.flag = treeNode.flags;
|
|
|
+ }
|
|
|
params.prj_id = projectObj.project.projectInfo.ID;
|
|
|
params.custCfg = zTreeOprObj.reportPageCfg;
|
|
|
zTreeOprObj.requestReport(params);
|