feat: 报表后台系统，数据预处理新增 "显示混凝土子项“和 "合并人材机数据"

public/web/rpt_value_define.js

@@ -80,7 +80,7 @@ const JV = {
   PROP_HANDLE_TYPE_FLOOR_BILL_GLJ: "底层清单人材机处理",
   PROP_HANDLE_TYPE_FLOOR_BILL_GLJ_TYPES: "gljTypeList", // "底层清单人材机处理类型集",
   PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD: "showConcreteChild", // "显示混凝土子项",
-  PROP_HANDLE_TYPE_MERGE_GLJ_DATA: "mergeGljData", // "合并人材机数据",
+  PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA: "notMergeGljData", // "不合并人材机数据",
   PROP_HANDLE_TYPE_LAND_COMPS: "清单土地计算合并",
   PROP_HANDLE_TYPE_COST_TREE_BU_GLJ: "造价书插入补项工料机",
   PROP_HANDLE_TYPE_FLITE_XMJ_IS_BILL_BUDGET: "筛选清单预算项目节",

web/maintain/report/html/rpt_tpl_dtl_pre_hdl_floor_bill_glj_types.html

@@ -14,8 +14,8 @@
                 <span>显示混凝土子项</span>
             </label>
             <label style="display: inline-flex; align-items: center; margin: 0; cursor: pointer; font-size: 12px; font-weight: normal;">
-                <input type="checkbox" id="chk_merge_glj_data" style="margin-right: 4px;" onchange="preHandleFloorBillGljObj.onOptionChange(this)">
-                <span>合并人材机数据</span>
+                <input type="checkbox" id="chk_not_merge_glj_data" style="margin-right: 4px;" onchange="preHandleFloorBillGljObj.onOptionChange(this)">
+                <span>不合并人材机数据</span>
             </label>
         </div>
     </div>

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -669,7 +669,7 @@ let preHandleObj = {
           [JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ_TYPES]:
             getDefaultFloorBillGljTypes(),
           [JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD]: false,
-          [JV.PROP_HANDLE_TYPE_MERGE_GLJ_DATA]: false,
+          [JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA]: false,
         };
         break;
       case JV.PROP_HANDLE_TYPE_LAND_COMPS:
@@ -761,7 +761,7 @@ let preHandleObj = {
         item[JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ_TYPES] =
           getDefaultFloorBillGljTypes();
         item[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD] = false;
-        item[JV.PROP_HANDLE_TYPE_MERGE_GLJ_DATA] = false;
+        item[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA] = false;
         break;
       case JV.PROP_HANDLE_TYPE_LAND_COMPS:
         break;
@@ -2046,8 +2046,8 @@ let preHandleFloorBillGljObj = {
     dest[JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ_TYPES] = values.slice();
     dest[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD] =
       !!src[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD];
-    dest[JV.PROP_HANDLE_TYPE_MERGE_GLJ_DATA] =
-      !!src[JV.PROP_HANDLE_TYPE_MERGE_GLJ_DATA];
+    dest[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA] =
+      !!src[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA];
   },
   refresh_node: function () {
     $("#div_floor_bill_glj_types_bar")[0].style.display = "";
@@ -2091,10 +2091,10 @@ let preHandleFloorBillGljObj = {
         showConcreteChk.checked =
           !!preHandleObj.currentNode[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD];
       }
-      let mergeGljChk = $("#chk_merge_glj_data")[0];
-      if (mergeGljChk) {
-        mergeGljChk.checked =
-          !!preHandleObj.currentNode[JV.PROP_HANDLE_TYPE_MERGE_GLJ_DATA];
+      let notMergeGljChk = $("#chk_not_merge_glj_data")[0];
+      if (notMergeGljChk) {
+        notMergeGljChk.checked =
+          !!preHandleObj.currentNode[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA];
       }
     }
   },
@@ -2110,8 +2110,8 @@ let preHandleFloorBillGljObj = {
       ),
       [JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD]:
         !!handleObj[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD],
-      [JV.PROP_HANDLE_TYPE_MERGE_GLJ_DATA]:
-        !!handleObj[JV.PROP_HANDLE_TYPE_MERGE_GLJ_DATA],
+      [JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA]:
+        !!handleObj[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA],
     };
     return rst;
   },
@@ -2143,8 +2143,8 @@ let preHandleFloorBillGljObj = {
     if (me.currentNode) {
       if (dom && dom.id === "chk_show_concrete_child") {
         me.currentNode[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD] = dom.checked;
-      } else if (dom && dom.id === "chk_merge_glj_data") {
-        me.currentNode[JV.PROP_HANDLE_TYPE_MERGE_GLJ_DATA] = dom.checked;
+      } else if (dom && dom.id === "chk_not_merge_glj_data") {
+        me.currentNode[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA] = dom.checked;
       }
     }
   },