Browse Source

fix: 报表设置,新增汇总规则设置,补充提交

lishihao 3 months atrás
parent
commit
ac8885bae2

+ 1 - 1
web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -167,7 +167,7 @@
             </div>
             <div class="input-group col-2">
                 <div class="input-group-addon">汇总规则设置</div>
-                <select id="element_summaryRule_select" class="form-control" onchange="zTreeOprObj.onChangeFlag('summaryRule', this)">
+                <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>

+ 4 - 4
web/maintain/report/js/rpt_tpl_main.js

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