Преглед изворни кода

feat: 报表后台编辑器,汇总类型的报表,新增选项忽略各分段项目节或者清单名称当中的空格进行汇总匹配。GLY-5597

lishihao пре 1 дан
родитељ
комит
97e87b5040
2 измењених фајлова са 25 додато и 0 уклоњено
  1. 12 0
      web/maintain/report/html/rpt_tpl_dtl_info.html
  2. 13 0
      web/maintain/report/js/rpt_tpl_main.js

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

@@ -76,6 +76,7 @@
                     <input class="form-control input-sm" id="element_content_width" type="number" value="4.0" step="0.1"
                         min="0" max="50" onchange="zTreeOprObj.changeProperty(`交叉表_信息.交叉列.CommonWidth`, this)" disabled>
                 </div>
+               
             </div>
             <div class="row" id="element_adhoc_flags">
                 <div class="input-group col-2">
@@ -233,6 +234,17 @@
                 </select>
             </div>
         </div>
+        <div>
+            <div class="input-group input-group-sm col-3">
+                <div class="input-group-addon">汇总表汇总忽略名称空格</div>
+                <select class="form-control input-sm" id="element_flags_ignoreSpaces_select"
+                    onchange="zTreeOprObj.onChangeFlag('ignoreSpaces', this)">
+                    <option value="NA">N/A</option>
+                    <option value="true">是</option>
+                    <option value="false">否</option>
+                </select>
+            </div>
+        </div>
         <p>
         <div class="form-group col-md-6">
             <label>同类表 <input id="hasAssociationChk" type="checkbox" disabled></label>

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

@@ -1419,6 +1419,18 @@ let zTreeOprObj = {
               } else {
                 $("#report_format_adjustable")[0].selectedIndex = 0;
               }
+              if (me.currentNode.flags.hasOwnProperty("ignoreSpaces")) {
+                let val = me.currentNode.flags["ignoreSpaces"];
+                if (val === "true") {
+                  $("#element_flags_ignoreSpaces_select")[0].selectedIndex = 1;
+                } else if (val === "false") {
+                  $("#element_flags_ignoreSpaces_select")[0].selectedIndex = 2;
+                } else {
+                  $("#element_flags_ignoreSpaces_select")[0].selectedIndex = 0;
+                }
+              } else {
+                $("#element_flags_ignoreSpaces_select")[0].selectedIndex = 0;
+              }
             } else {
               $("#element_flags_select")[0].selectedIndex = 0;
               $("#element_prjFlags_select")[0].selectedIndex = 0;
@@ -1434,6 +1446,7 @@ let zTreeOprObj = {
               $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
               $("#select_aid_report_data_select")[0].selectedIndex = 0;
               $("#report_format_adjustable")[0].selectedIndex = 0;
+              $("#element_flags_ignoreSpaces_select")[0].selectedIndex = 0;
             }
 
             if (