Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuOperation

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -165,6 +165,14 @@
                     <option value="false">否</option>
                 </select>
             </div>
+            <div class="input-group col-2">
+                <div class="input-group-addon">汇总规则设置</div>
+                <select id="element_summaryRule_select" class="form-control" onchange="zTreeOprObj.onChangeFlag('existSummaryRule', this)">
+                    <option value="NA">N/A</option>
+                    <option value="true">是</option>
+                    <option value="false">否</option>
+                </select>
+            </div>
             <div class="input-group col-3">
                 <div class="input-group-addon">建设项目汇总类型</div>
                 <select class="form-control input-sm" id="element_constructSumFlags_select"

web/maintain/report/js/rpt_tpl_main.js

@@ -1313,6 +1313,18 @@ let zTreeOprObj = {
               } else {
                 $("#element_existLevel_select")[0].selectedIndex = 0;
               }
+              if (me.currentNode.flags.hasOwnProperty("existSummaryRule")) {
+                let existSummaryRule = me.currentNode.flags["existSummaryRule"];
+                if (existSummaryRule === "true") {
+                  $("#element_summaryRule_select")[0].selectedIndex = 1;
+                } else if (existSummaryRule === "false") {
+                  $("#element_summaryRule_select")[0].selectedIndex = 2;
+                } else {
+                  $("#element_summaryRule_select")[0].selectedIndex = 0;
+                }
+              } else {
+                $("#element_summaryRule_select")[0].selectedIndex = 0;
+              }
               if (me.currentNode.flags.hasOwnProperty("constructSumType")) {
                 let val = me.currentNode.flags["constructSumType"];
                 if (val === "constructSum") {