瀏覽代碼

审核比对切换A3/A4时丢失数据问题

TonyKang 4 年之前
父節點
當前提交
0438857356
共有 1 個文件被更改,包括 42 次插入8 次删除
  1. 42 8
      web/building_saas/report/js/rpt_main.js

+ 42 - 8
web/building_saas/report/js/rpt_main.js

@@ -299,17 +299,34 @@ let zTreeOprObj = {
         dom.innerHTML = tmpStr;
         dom.innerHTML = tmpStr;
         me.changeCfg();
         me.changeCfg();
     },
     },
-    changeCfg: function() {
+    changeCfg: async function() {
         let me = zTreeOprObj;
         let me = zTreeOprObj;
         let params = {};
         let params = {};
         params.pageSize = rptControlObj.getCurrentPageSize();
         params.pageSize = rptControlObj.getCurrentPageSize();
         params.orientation = rptControlObj.getCurrentOrientation();
         params.orientation = rptControlObj.getCurrentOrientation();
         params.rpt_tpl_id = me.currentNode.refId;
         params.rpt_tpl_id = me.currentNode.refId;
         params.flag = null;
         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.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.flag = me.currentNode.flags;
-            params.prj_ids = rptTplObj.getAllPrjIds();
-        }
+        }        
         params.prj_id = projectObj.project.projectInfo.ID;
         params.prj_id = projectObj.project.projectInfo.ID;
         params.custCfg = me.reportPageCfg;
         params.custCfg = me.reportPageCfg;
         me.requestReport(params);
         me.requestReport(params);
@@ -826,17 +843,34 @@ let rptControlObj = {
             }, null
             }, null
         );
         );
     },
     },
-    confirmCfgChange: function() {
+    confirmCfgChange: async function() {
         let treeNode = zTreeOprObj.currentNode;
         let treeNode = zTreeOprObj.currentNode;
         if (treeNode.nodeType === TPL_TYPE_TEMPLATE && treeNode.refId > 0) {
         if (treeNode.nodeType === TPL_TYPE_TEMPLATE && treeNode.refId > 0) {
             let params = {};
             let params = {};
             params.pageSize = rptControlObj.getCurrentPageSize();
             params.pageSize = rptControlObj.getCurrentPageSize();
             params.rpt_tpl_id = treeNode.refId;
             params.rpt_tpl_id = treeNode.refId;
             params.flag = null;
             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.prj_id = projectObj.project.projectInfo.ID;
             params.custCfg = zTreeOprObj.reportPageCfg;
             params.custCfg = zTreeOprObj.reportPageCfg;
             zTreeOprObj.requestReport(params);
             zTreeOprObj.requestReport(params);