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

public/web/rpt_value_define.js

@@ -78,6 +78,8 @@ const JV = {
     PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS_DATA_TYPE: "工程量清单数据类型",
     PROP_HANDLE_TYPE_FX_GLJ: "分项定额人材机处理",
     PROP_HANDLE_TYPE_LAND_COMPS: "清单土地计算合并",
+    PROP_HANDLE_TYPE_COST_TREE_BU_GLJ: "造价书插入补项工料机",
+    PROP_HANDLE_TYPE_FLITE_XMJ_IS_BILL_BUDGET: "筛选清单预算项目节",
 
     PROP_ADJUST_COLLECTION: "数据调整集",
     PROP_ADJUST_ACTION: "action",

web/maintain/ration_repository/js/section_tree.js

@@ -270,6 +270,7 @@ let sectionTreeObj = {
         this.initController(this.tree, this.sheet, this.setting.sheet);
         this.controller.showTreeData();
         this.sheet.setFormatter(-1, 0, '@');
+        this.sheet.setFormatter(-1, -1, '@');
         this.initSelection(this.tree.selected);
         explanatoryOprObj.bindEvents(explanatoryOprObj.exEditor, explanatoryOprObj.erratumEditor, explanatoryOprObj.calcEditor);
         this.loadRateWidth();

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -123,14 +123,15 @@
                         <option value="construct">建设项目级别</option>
                         <option value="Single">单项工程级别</option>
                         <option value="custom">用户自选工程</option>
-                        <option value="complexUnit">跨项目自选工程(3个建设项目单位工程)</option>
+                        <option value="unitPriceContrast">单价偏差对比</option>
+                        <option value="stageUnitContrast">审核项目对比（一对一）</option>
                         <option value="stageContrast">前后阶段对比（当前项目对其他项目）</option>
                         <option value="stageGLJContrast">前后阶段工料机对比（当前项目对其他项目）</option>
-                        <option value="unitPriceContrast">单价偏差对比</option>
-                        <option value="complexConstruct">跨项目汇总对比（3个建设项目）</option>
                         <option value="stageBackContrast">审核项目对比（其他项目对当前项目）</option>
-                        <option value="stageUnitContrast">审核项目对比（一对一）</option>
                         <option value="stageMultipleUnitContrast">审核项目对比（多对多）</option>
+                        <option value="complexUnit">跨项目自选工程(3个建设项目单位工程，一对一对一)</option>
+                        <option value="complexConstruct">跨项目汇总对比（3个建设项目，一对多对多）</option>
+                        <option value="complexConstructMultiple">各阶段项目对比（3个建设项目，多对多对多）</option>
                     </select>
                 </div>
             </div>
@@ -192,7 +193,7 @@
                     onchange="zTreeOprObj.onChangeFlag('costIndexType', this)">
                     <option value="NA">N/A</option>
                     <option value="mainScaleContrast">各阶段主要工程规模对比</option>
-                    <option value="mainScaleContrastGai">各阶段主要工程规模对比(概算)</option>
+                    <option value="mainScaleContrastThree">各阶段主要工程规模对比(3个)</option>
                 </select>
             </div>
         </div>

web/maintain/report/js/rpt_tpl_main.js

@@ -953,14 +953,15 @@ let zTreeOprObj = {
                             if (sumLvType === 'construct') $("#element_sumLv_flags")[0].selectedIndex = 1
                             else if (sumLvType === 'Single') $("#element_sumLv_flags")[0].selectedIndex = 2
                             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 === '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 if (sumLvType === 'unitPriceContrast') $("#element_sumLv_flags")[0].selectedIndex = 4
+                            else if (sumLvType === 'stageUnitContrast') $("#element_sumLv_flags")[0].selectedIndex = 5
+                            else if (sumLvType === 'stageContrast') $("#element_sumLv_flags")[0].selectedIndex = 6
+                            else if (sumLvType === 'stageGLJContrast') $("#element_sumLv_flags")[0].selectedIndex = 7
+                            else if (sumLvType === 'stageBackContrast') $("#element_sumLv_flags")[0].selectedIndex = 8
+                            else if (sumLvType === 'stageMultipleUnitContrast') $("#element_sumLv_flags")[0].selectedIndex = 9
+                            else if (sumLvType === 'complexUnit') $("#element_sumLv_flags")[0].selectedIndex = 10
+                            else if (sumLvType === 'complexConstruct') $("#element_sumLv_flags")[0].selectedIndex = 11
+                            else if (sumLvType === 'complexConstructMultiple') $("#element_sumLv_flags")[0].selectedIndex = 12
                             else $("#element_sumLv_flags")[0].selectedIndex = 0;
                         } else {
                             $("#element_sumLv_flags")[0].selectedIndex = 0;
@@ -1017,6 +1018,8 @@ let zTreeOprObj = {
                             let val = me.currentNode.flags['costIndexType'];
                             if (val === 'mainScaleContrast') {
                                 $("#element_costIndexFlags_audit")[0].selectedIndex = 1;
+                            } else if (val === 'mainScaleContrastThree') {
+                                $("#element_costIndexFlags_audit")[0].selectedIndex = 2;
                             } else {
                                 $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
                             }

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -291,6 +291,8 @@ let preHandleObj = {
         });
         types.push({ Name: JV.PROP_HANDLE_TYPE_FX_GLJ, Title: '' });
         types.push({ Name: JV.PROP_HANDLE_TYPE_LAND_COMPS, Title: '' });
+        types.push({ Name: JV.PROP_HANDLE_TYPE_COST_TREE_BU_GLJ, Title: '' });
+        types.push({ Name: JV.PROP_HANDLE_TYPE_FLITE_XMJ_IS_BILL_BUDGET, Title: '' });
         // types.push({Name: "纯手工填写", Title: ""});
         me.typeTreeObj = $.fn.zTree.init($("#pre_handle_type_reversed"), preHandleTypeSetting, types);
         me.setDisabledBandSelect([0, 1, 2, 3, 4, 5, 6, 7, 8]);
@@ -340,11 +342,17 @@ let preHandleObj = {
                 rst = { Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": preHandleType };
                 break;
             case JV.PROP_HANDLE_TYPE_FX_GLJ:
-                rst = { Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": preHandleType };
+                rst = { Name: "预处理环节", Title: "", "映射数据对象": "", "预处理类型": preHandleType };
                 break;
             case JV.PROP_HANDLE_TYPE_LAND_COMPS:
                 rst = { Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": preHandleType };
                 break;
+            case JV.PROP_HANDLE_TYPE_COST_TREE_BU_GLJ:
+                rst = { Name: "预处理环节", Title: "", "映射数据对象": "", "预处理类型": preHandleType };
+                break;
+            case JV.PROP_HANDLE_TYPE_FLITE_XMJ_IS_BILL_BUDGET:
+                rst = { Name: "预处理环节", Title: "", "映射数据对象": "", "预处理类型": preHandleType };
+                break;
             default:
                 rst = { Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": "排序", "排序方式": "normal", "排序键值集": [] };
                 break;
@@ -392,6 +400,10 @@ let preHandleObj = {
                 break;
             case JV.PROP_HANDLE_TYPE_LAND_COMPS:
                 break;
+            case JV.PROP_HANDLE_TYPE_COST_TREE_BU_GLJ:
+                break;
+            case JV.PROP_HANDLE_TYPE_FLITE_XMJ_IS_BILL_BUDGET:
+                break;
             default:
                 item[JV.PROP_HANDLE_TYPE] = JV.PROP_HANDLE_TYPE_SORT;
                 item[JV.PROP_SORT_TYPE] = "normal";
@@ -613,6 +625,12 @@ let preHandleObj = {
                     case JV.PROP_HANDLE_TYPE_LAND_COMPS:
                         rst.push(preHandleBillDataMoveObj.extractTabFields(handleObj));
                         break;
+                    case JV.PROP_HANDLE_TYPE_COST_TREE_BU_GLJ:
+                        rst.push(preHandleBillDataMoveObj.extractTabFields(handleObj));
+                        break;
+                    case JV.PROP_HANDLE_TYPE_FLITE_XMJ_IS_BILL_BUDGET:
+                        rst.push(preHandleBillDataMoveObj.extractTabFields(handleObj));
+                        break;
                     default:
                         break;
                 }