报表指标设置，新增含量指标表类型

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -10,19 +10,30 @@
                 <div class="row">
                     <div class="input-group col-2">
                         <div class="input-group-addon">方向</div>
-                        <select class="form-control input-sm" id="rptTplPageOrientation"><option>横向</option><option>竖向</option></select>
+                        <select class="form-control input-sm" id="rptTplPageOrientation">
+                            <option>横向</option>
+                            <option>竖向</option>
+                        </select>
                     </div>
                     <div class="input-group col-2">
                         <div class="input-group-addon">纸张</div>
-                        <select class="form-control input-sm" id="rptTplPageSize"><option>A3</option><option>A4</option></select>
+                        <select class="form-control input-sm" id="rptTplPageSize">
+                            <option>A3</option>
+                            <option>A4</option>
+                        </select>
                     </div>
                     <div class="input-group col-2">
                         <div class="input-group-addon">单位</div>
-                        <select class="form-control input-sm" id="rptTplUnit"><option>厘米</option></select>
+                        <select class="form-control input-sm" id="rptTplUnit">
+                            <option>厘米</option>
+                        </select>
                     </div>
                     <div class="input-group col-4">
                         <div class="input-group-addon">交叉表显示方向</div>
-                        <select class="form-control input-sm" id="element_cross_display_seq" disabled><option value ="0">纵向优先</option><option value ="1">横向优先</option></select>
+                        <select class="form-control input-sm" id="element_cross_display_seq" disabled>
+                            <option value="0">纵向优先</option>
+                            <option value="1">横向优先</option>
+                        </select>
                     </div>
                 </div>
             </div>
@@ -31,7 +42,10 @@
                 <div class="row">
                     <div class="input-group col-3">
                         <div class="input-group-addon">分栏</div>
-                        <select class="form-control input-sm" id="rptTplMultiCols"><option>1</option><option>2</option></select>
+                        <select class="form-control input-sm" id="rptTplMultiCols">
+                            <option>1</option>
+                            <option>2</option>
+                        </select>
                     </div>
                     <div class="input-group input-group-sm col-3">
                         <label class="form-check-label">空行提上
@@ -47,21 +61,31 @@
             <div class="row" id="element_content_height_width">
                 <div class="form-group col-md-3" id="flow_content_height_div">
                     <label>流水显示行 - 高度</label>
-                    <input class="form-control input-sm" id="element_content_height" type="number" value="0.6" step="0.1" min="0" max="50" onchange="zTreeOprObj.changeProperty(`流水式表_信息.流水式表_数据.CommonHeight`, this)" disabled>
+                    <input class="form-control input-sm" id="element_content_height" type="number" value="0.6"
+                        step="0.1" min="0" max="50"
+                        onchange="zTreeOprObj.changeProperty(`流水式表_信息.流水式表_数据.CommonHeight`, this)" disabled>
                 </div>
                 <div class="form-group col-md-3" id="cross_row_height_div" style="display: none">
                     <label>交叉显示行 - 高度</label>
-                    <input class="form-control input-sm" id="element_cross_row_height" type="number" value="3.0" step="0.1" min="0" max="50" onchange="zTreeOprObj.changeProperty(`交叉表_信息.交叉行.CommonHeight`, this)" disabled>
+                    <input class="form-control input-sm" id="element_cross_row_height" type="number" value="3.0"
+                        step="0.1" min="0" max="50"
+                        onchange="zTreeOprObj.changeProperty(`交叉表_信息.交叉行.CommonHeight`, this)" disabled>
                 </div>
                 <div class="form-group col-md-3">
                     <label>交叉显示列 - 宽度</label>
-                    <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>
+                    <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">
                     <div class="input-group-addon">额外标记</div>
-                    <select class="form-control input-sm" id="element_flags_select" onchange="zTreeOprObj.onChangeFlag('taxType', this)"><option value ="NA">N/A</option><option value ="1">一般计税</option><option value ="2">简易计税</option></select>
+                    <select class="form-control input-sm" id="element_flags_select"
+                        onchange="zTreeOprObj.onChangeFlag('taxType', this)">
+                        <option value="NA">N/A</option>
+                        <option value="1">一般计税</option>
+                        <option value="2">简易计税</option>
+                    </select>
                 </div>
                 <div class="input-group col-4">
                     <div class="input-group-addon">工程类型</div>
@@ -79,20 +103,26 @@
                             <li id="valuationSelector_changeBudget" value="changeBudget">变更预算</li>
                             <li id="valuationSelector_settlement" value="settlement">结算</li>
                         </ul>
-                    
+
                     </div>
                 </div>
                 <div class="input-group col-3">
                     <div class="input-group-addon">报表汇总类型</div>
-                    <select class="form-control input-sm" id="element_rptFlags_select" onchange="zTreeOprObj.onChangeFlag('reportType', this)"><option value ="NA">N/A</option><option value ="billSummary">工程清单汇总</option><option value ="gljSummary">工程工料机汇总</option></select>
+                    <select class="form-control input-sm" id="element_rptFlags_select"
+                        onchange="zTreeOprObj.onChangeFlag('reportType', this)">
+                        <option value="NA">N/A</option>
+                        <option value="billSummary">工程清单汇总</option>
+                        <option value="gljSummary">工程工料机汇总</option>
+                    </select>
                 </div>
                 <div class="input-group col-2">
                     <div class="input-group-addon">项目汇总级别</div>
-                    <select class="form-control input-sm" id="element_sumLv_flags" onchange="zTreeOprObj.onChangeFlag('sumLevelType', this)">
-                        <option value ="NA">N/A</option>
-                        <option value ="construct">建设项目级别</option>
-                        <option value ="Single">单项工程级别</option>
-                        <option value ="custom">用户自选工程</option>
+                    <select class="form-control input-sm" id="element_sumLv_flags"
+                        onchange="zTreeOprObj.onChangeFlag('sumLevelType', this)">
+                        <option value="NA">N/A</option>
+                        <option value="construct">建设项目级别</option>
+                        <option value="Single">单项工程级别</option>
+                        <option value="custom">用户自选工程</option>
                         <option value="complexUnit">跨项目自选工程(3个建设项目单位工程)</option>
                         <option value="stageContrast">前后阶段对比（当前项目对其他项目）</option>
                         <option value="stageGLJContrast">前后阶段工料机对比（当前项目对其他项目）</option>
@@ -104,12 +134,13 @@
                     </select>
                 </div>
             </div>
-               
+
         </div>
-        <div class="row">
+        <div class="row p-3">
             <div class="input-group col-3">
                 <div class="input-group-addon">审核对比数据级别</div>
-                <select id="element_contrastType_select" class="form-control" onchange="zTreeOprObj.onChangeFlag('contrastType', this)">
+                <select id="element_contrastType_select" class="form-control"
+                    onchange="zTreeOprObj.onChangeFlag('contrastType', this)">
                     <option value="NA">N/A</option>
                     <option value="chapter">项目节</option>
                     <option value="bill">清单</option>
@@ -118,7 +149,8 @@
             </div>
             <div class="input-group col-2">
                 <div class="input-group-addon">存在数据级别</div>
-                <select id="element_existLevel_select" class="form-control" onchange="zTreeOprObj.onChangeFlag('existLevel', this)">
+                <select id="element_existLevel_select" class="form-control"
+                    onchange="zTreeOprObj.onChangeFlag('existLevel', this)">
                     <option value="NA">N/A</option>
                     <option value="true">是</option>
                     <option value="false">否</option>
@@ -142,8 +174,9 @@
                     <option value="unit">单位工程级别</option>
                 </select>
             </div>
-
-            <div class="input-group col-2">
+        </div>
+        <div class="row p-3">
+            <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)">
@@ -151,9 +184,17 @@
                     <!-- <option value="audit_compare">审核对比</option> -->
                     <option value="project_compare">步骤对比</option>
                 </select>
+
+            </div>
+            <div class="input-group col-3">
+                <div class="input-group-addon">含量指标类型</div>
+                <select class="form-control input-sm" id="element_costIndexFlags_audit"
+                    onchange="zTreeOprObj.onChangeFlag('costIndexType', this)">
+                    <option value="NA">N/A</option>
+                    <option value="mainScaleContrast">各阶段主要工程规模对比</option>
+                </select>
             </div>
-            
         </div>
-      
+
     </div>
 </div>

web/maintain/report/js/rpt_tpl_main.js

@@ -1013,6 +1013,16 @@ let zTreeOprObj = {
                         } else {
                             $("#element_constructSumFlags_audit")[0].selectedIndex = 0;
                         }
+                        if (me.currentNode.flags.hasOwnProperty('costIndexType')) {
+                            let val = me.currentNode.flags['costIndexType'];
+                            if (val === 'mainScaleContrast') {
+                                $("#element_costIndexFlags_audit")[0].selectedIndex = 1;
+                            } else {
+                                $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
+                            }
+                        } else {
+                            $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
+                        }
                     } else {
                         $("#element_flags_select")[0].selectedIndex = 0;
                         $("#element_prjFlags_select")[0].selectedIndex = 0;
@@ -1025,6 +1035,7 @@ let zTreeOprObj = {
                         $('#valuationSelector .mutiSelector li').removeClass('checked');
                         $("#element_existLevel_select")[0].selectedIndex = 0;
                         $("#element_Flags_tplType")[0].selectedIndex = 0;
+                        $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
                     }
 
                     if ($("#rpt_tpl_visual_tab")[0].className === "nav-link p-1 active") {