소스 검색

报表指标设置,新增汇总级别类型

lishihao 11 달 전
부모
커밋
449b545e97
2개의 변경된 파일26개의 추가작업 그리고 5개의 파일을 삭제
  1. 12 0
      web/maintain/report/html/rpt_tpl_dtl_info.html
  2. 14 5
      web/maintain/report/js/rpt_tpl_main.js

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

@@ -95,6 +95,7 @@
                         <option value ="custom">用户自选工程</option>
                         <option value="complexUnit">跨项目自选工程(3个建设项目单位工程)</option>
                         <option value="stageContrast">前后阶段对比(当前项目对其他项目)</option>
+                        <option value="stageGLJContrast">前后阶段工料机对比(当前项目对其他项目)</option>
                         <option value="unitPriceContrast">单价偏差对比</option>
                         <option value="complexConstruct">跨项目汇总对比(3个建设项目)</option>
                         <option value="stageBackContrast">审核项目对比(其他项目对当前项目)</option>
@@ -141,6 +142,17 @@
                     <option value="unit">单位工程级别</option>
                 </select>
             </div>
+
+            <div class="input-group col-2">
+                <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> -->
+                    <option value="project_compare">步骤对比</option>
+                </select>
+            </div>
+            
         </div>
       
     </div>

+ 14 - 5
web/maintain/report/js/rpt_tpl_main.js

@@ -955,11 +955,12 @@ let zTreeOprObj = {
                             else if (sumLvType === 'custom') $("#element_sumLv_flags")[0].selectedIndex = 3
                             else if (sumLvType === 'complexUnit') $("#element_sumLv_flags")[0].selectedIndex = 4
                             else if (sumLvType === 'stageContrast') $("#element_sumLv_flags")[0].selectedIndex = 5
-                            else if (sumLvType === 'unitPriceContrast') $("#element_sumLv_flags")[0].selectedIndex = 6
-                            else if (sumLvType === 'complexConstruct') $("#element_sumLv_flags")[0].selectedIndex = 7
-                            else if (sumLvType === 'stageBackContrast') $("#element_sumLv_flags")[0].selectedIndex = 8
-                            else if (sumLvType === 'stageUnitContrast') $("#element_sumLv_flags")[0].selectedIndex = 9
-                            else if (sumLvType === 'stageMultipleUnitContrast') $("#element_sumLv_flags")[0].selectedIndex = 10
+                            else if (sumLvType === 'stageGLJContrast') $("#element_sumLv_flags")[0].selectedIndex = 6
+                            else if (sumLvType === 'unitPriceContrast') $("#element_sumLv_flags")[0].selectedIndex = 7
+                            else if (sumLvType === 'complexConstruct') $("#element_sumLv_flags")[0].selectedIndex = 8
+                            else if (sumLvType === 'stageBackContrast') $("#element_sumLv_flags")[0].selectedIndex = 9
+                            else if (sumLvType === 'stageUnitContrast') $("#element_sumLv_flags")[0].selectedIndex = 10
+                            else if (sumLvType === 'stageMultipleUnitContrast') $("#element_sumLv_flags")[0].selectedIndex = 11
                             else $("#element_sumLv_flags")[0].selectedIndex = 0;
                         } else {
                             $("#element_sumLv_flags")[0].selectedIndex = 0;
@@ -1001,6 +1002,14 @@ let zTreeOprObj = {
                             } else {
                                 $("#element_Flags_tplType")[0].selectedIndex = 0;
                             }
+                        }
+                        if (me.currentNode.flags.hasOwnProperty('auditType')) {
+                            let val = me.currentNode.flags['auditType'];
+                            if (val === 'project_compare') {
+                                $("#element_constructSumFlags_audit")[0].selectedIndex = 1;
+                            } else {
+                                $("#element_constructSumFlags_audit")[0].selectedIndex = 0;
+                            }
                         } else {
                             $("#element_Flags_tplType")[0].selectedIndex = 0;
                         }