TonyKang 4 лет назад
Родитель
Сommit
48d690ccbf

+ 1 - 0
modules/reports/controllers/rpt_tpl_controller.js

@@ -317,6 +317,7 @@ let mExport = {
                     }
                 }
                 // console.log(topNodeItems);
+                // console.log(doc);
                 rttFacade.updateTree(doc.compilationId, doc.engineerId, doc.userId, doc).then(function (rst) {
                     if (rst) {
                         //success

+ 2 - 1
modules/reports/facade/rpt_tpl_tree_node_facade.js

@@ -29,7 +29,8 @@ async function createNewTree(doc) {
 }
 
 async function updateTree(compilationId, engineerId, userId, doc) {
-    let filter = {"compilationId": compilationId, "engineerId": engineerId, "userId": userId, "$or": [{"isDeleted": null}, {"isDeleted": false}]};
+    // let filter = {"compilationId": compilationId, "engineerId": engineerId, "userId": userId, "$or": [{"isDeleted": null}, {"isDeleted": false}]};
+    let filter = {"compilationId": compilationId, "userId": userId, "$or": [{"isDeleted": null}, {"isDeleted": false}]};
     return await rpt_tpl_tree_mdl.update(filter, doc);
 }
 

+ 4 - 0
web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -54,6 +54,10 @@
                     <div class="input-group-addon">建设项目汇总类型</div>
                     <select class="form-control input-sm" id="element_constructSumFlags_select" onchange="zTreeOprObj.onChangeFlag('constructSumType', this)"><option value ="NA">N/A</option><option value ="constructSum">建设项目汇总</option></select>
                 </div>
+                <div class="input-group col-3">
+                    <div class="input-group-addon">审核对比类型</div>
+                    <select class="form-control input-sm" id="element_constructSumFlags_audit" onchange="zTreeOprObj.onChangeFlag('auditType', this)"><option value ="NA">N/A</option><option value ="audit_compare">审核对比</option></select>
+                </div>
 
             </div>
         </div>

+ 13 - 1
web/maintain/report/js/rpt_tpl_main.js

@@ -146,7 +146,8 @@ let zTreeOprObj = {
     },
     getNodePath: function(node, includeCurrentNode) {
         const rst = [];
-        if (includeCurrentNode && node.level >= 1) {
+        if (includeCurrentNode && node.level > 1) {
+            // 备注:因结构有所变化,这里level判断要>1 (多了一层)
             rst.push(node.name);
         }
         let parentNode = node.getParentNode();
@@ -968,9 +969,20 @@ let zTreeOprObj = {
                             } else {
                                 $("#element_constructSumFlags_select")[0].selectedIndex = 0;
                             }
+                            if (me.currentNode.flags.hasOwnProperty('auditType')) {
+                                let val = me.currentNode.flags['auditType'];
+                                if (val === 'audit_compare') {
+                                    $("#element_constructSumFlags_audit")[0].selectedIndex = 1;
+                                } else {
+                                    $("#element_constructSumFlags_audit")[0].selectedIndex = 0;
+                                }
+                            } else {
+                                $("#element_constructSumFlags_audit")[0].selectedIndex = 0;
+                            }
                         } else {
                             $("#element_flags_select")[0].selectedIndex = 0;
                             $("#element_constructSumFlags_select")[0].selectedIndex = 0;
+                            $("#element_constructSumFlags_audit")[0].selectedIndex = 0;
                         }
 
                         if ($("#rpt_tpl_visual_tab")[0].className === "nav-link p-1 active") {