fix: 新增最底层清单工料机的指标预处理

public/web/rpt_value_define.js

@@ -75,6 +75,7 @@ const JV = {
   PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS: "转化工程量清单",
   PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS_SORT_TYPE: "工程量清单排序类型",
   PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS_DATA_TYPE: "工程量清单数据类型",
+  PROP_HANDLE_TYPE_FLOOR_BILL_GLJ: "底层清单人材机处理",
 
   PROP_ADJUST_COLLECTION: "数据调整集",
   PROP_ADJUST_ACTION: "action",

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -295,7 +295,7 @@ let preHandleObj = {
     me.treeObj = $.fn.zTree.init(
       $("#pre_handle_data_info_reversed"),
       preHandleSetting,
-      handles
+      handles,
     );
   },
   build_handle_data_selection: function () {
@@ -307,14 +307,14 @@ let preHandleObj = {
           pre_handle_data_objects[i] +
           "'>" +
           pre_handle_data_objects_name[i] +
-          "</option>"
+          "</option>",
       );
       sel.append(
         "<option value='" +
           pre_handle_data_objects[i] +
           "'>" +
           pre_handle_data_objects_name[i] +
-          "</option>"
+          "</option>",
       );
     }
   },
@@ -331,11 +331,12 @@ let preHandleObj = {
       Name: JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS,
       Title: "",
     });
+    types.push({ Name: JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ, Title: "" });
     // types.push({Name: "纯手工填写", Title: ""});
     me.typeTreeObj = $.fn.zTree.init(
       $("#pre_handle_type_reversed"),
       preHandleTypeSetting,
-      types
+      types,
     );
     me.setDisabledBandSelect([0, 1, 2, 3, 4, 5]);
     me.build_handle_data_selection();
@@ -423,6 +424,14 @@ let preHandleObj = {
           预处理类型: preHandleType,
         };
         break;
+      case JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ:
+        rst = {
+          Name: "预处理环节",
+          Title: "",
+          映射数据对象: "",
+          预处理类型: preHandleType,
+        };
+        break;
       default:
         rst = {
           Name: "预处理环节",
@@ -472,6 +481,8 @@ let preHandleObj = {
         item[JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS_SORT_TYPE] = "all"; // 工程量清单排序
         item[JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS_DATA_TYPE] = "bills"; // 工程量清单输出级别
         break;
+      case JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ:
+        break;
       default:
         item[JV.PROP_HANDLE_TYPE] = JV.PROP_HANDLE_TYPE_SORT;
         item[JV.PROP_SORT_TYPE] = "normal";
@@ -499,6 +510,10 @@ let preHandleObj = {
       src[JV.PROP_HANDLE_TYPE] === JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS
     ) {
       preHandleQuantitiesBillsSortObj.copyNode(src, dest);
+    } else if (
+      src[JV.PROP_HANDLE_TYPE] === JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ
+    ) {
+      preHandleAddDummyObj.copyNode(src, dest);
     }
   },
   private_set_title: function (node) {
@@ -592,23 +607,23 @@ let preHandleObj = {
       preHandleSortObj.childTreeObj = $.fn.zTree.init(
         $("#child_sorting_keys"),
         sortingKeysSetting,
-        exposed_properties_arr[dom.selectedIndex]
+        exposed_properties_arr[dom.selectedIndex],
       );
       preHandleSortObj.treeObj = $.fn.zTree.init(
         $("#pre_handle_sort_keys_reversed"),
         sortingKeysSetting,
-        exposed_properties_arr[dom.selectedIndex]
+        exposed_properties_arr[dom.selectedIndex],
       );
       preHandleFilterObj.treeObj = $.fn.zTree.init(
         $("#pre_handle_filter_keys_reversed"),
         filterKeysSetting,
-        exposed_properties_arr[dom.selectedIndex]
+        exposed_properties_arr[dom.selectedIndex],
       );
     } else if (oprType === "accord_to_parent") {
       preHandleSortObj.parentTreeObj = $.fn.zTree.init(
         $("#parent_sorting_keys"),
         sortingKeysSetting,
-        exposed_properties_arr[dom.selectedIndex]
+        exposed_properties_arr[dom.selectedIndex],
       );
       preHandleObj.currentNode[JV.PROP_PARENT_CHILD_SORT_KEY][
         JV.PROP_PARENT_DATA_KEY
@@ -724,9 +739,20 @@ let preHandleObj = {
             break;
           case JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS:
             rst.push(
-              preHandleQuantitiesBillsSortObj.extractTabFields(handleObj)
+              preHandleQuantitiesBillsSortObj.extractTabFields(handleObj),
             );
             break;
+          case JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ:
+            let me = preHandleQuantitiesBillsSortObj;
+            let rstData = {};
+            me.copyNode(handleObj, rstData);
+            rstData = {
+              预处理类型: "底层清单人材机处理",
+              映射数据对象: "bills",
+            };
+            rst.push(rstData);
+            break;
+
           default:
             break;
         }
@@ -774,7 +800,7 @@ let preHandleSortObj = {
           src[JV.PROP_FILTER_OTHER_BILLS_NODES].length > 0
         ) {
           otherBillKeys = otherBillKeys.concat(
-            src[JV.PROP_FILTER_OTHER_BILLS_NODES]
+            src[JV.PROP_FILTER_OTHER_BILLS_NODES],
           );
         }
         dest[JV.PROP_FILTER_OTHER_BILLS_NODES] = otherBillKeys;
@@ -789,7 +815,7 @@ let preHandleSortObj = {
           JV.PROP_PARENT_SORT_KEYS
         ]) {
           dest[JV.PROP_PARENT_CHILD_SORT_KEY][JV.PROP_PARENT_SORT_KEYS].push(
-            item
+            item,
           );
         }
         dest[JV.PROP_PARENT_CHILD_SORT_KEY][JV.PROP_CHILD_SORT_KEYS] = [];
@@ -797,7 +823,7 @@ let preHandleSortObj = {
           JV.PROP_CHILD_SORT_KEYS
         ]) {
           dest[JV.PROP_PARENT_CHILD_SORT_KEY][JV.PROP_CHILD_SORT_KEYS].push(
-            item
+            item,
           );
         }
         dest[JV.PROP_OTHER_SUB_SORT] = [];
@@ -830,7 +856,7 @@ let preHandleSortObj = {
       let sel = $("#select_sort_types")[0];
       let idx = -1;
       let sortTypeIdx = sort_types.indexOf(
-        preHandleObj.currentNode[JV.PROP_SORT_TYPE]
+        preHandleObj.currentNode[JV.PROP_SORT_TYPE],
       );
       sel.selectedIndex = sortTypeIdx;
       switch (sortTypeIdx) {
@@ -841,12 +867,12 @@ let preHandleSortObj = {
           //normal
           $("#div_sort_type_normal")[0].style.display = "";
           idx = pre_handle_data_objects.indexOf(
-            preHandleObj.currentNode[JV.PROP_DATA_KEY]
+            preHandleObj.currentNode[JV.PROP_DATA_KEY],
           );
           me.normalTreeObj = $.fn.zTree.init(
             $("#pre_handle_sort_keys_reversed"),
             sortingKeysSetting,
-            exposed_properties_arr[idx]
+            exposed_properties_arr[idx],
           );
           let nodes = me.normalTreeObj.getNodes();
           for (let sortItem of preHandleObj.currentNode[JV.PROP_SORT_KEYS]) {
@@ -865,7 +891,7 @@ let preHandleSortObj = {
           me.topBillsTreeObj = $.fn.zTree.init(
             $("#bills_top_nodes"),
             sortingTreeSetting,
-            fixed_top_bills_nodes
+            fixed_top_bills_nodes,
           );
           let topBillnodes = me.topBillsTreeObj.getNodes();
           if (preHandleObj.currentNode[JV.PROP_FILTER_TOP_BILLS_NODES]) {
@@ -878,7 +904,7 @@ let preHandleSortObj = {
                     topBillsNode,
                     true,
                     false,
-                    false
+                    false,
                   );
                   break;
                 }
@@ -890,7 +916,7 @@ let preHandleSortObj = {
           me.otherBillsTreeObj = $.fn.zTree.init(
             $("#bills_other_nodes"),
             sortingTreeSetting2,
-            fixed_other_bills_types
+            fixed_other_bills_types,
           );
           let otherBillnodes = me.otherBillsTreeObj.getNodes();
           if (preHandleObj.currentNode[JV.PROP_FILTER_OTHER_BILLS_NODES]) {
@@ -903,7 +929,7 @@ let preHandleSortObj = {
                     otherBillsNode,
                     true,
                     false,
-                    false
+                    false,
                   );
                   break;
                 }
@@ -921,33 +947,33 @@ let preHandleSortObj = {
           idx = pre_handle_data_objects.indexOf(
             preHandleObj.currentNode[JV.PROP_PARENT_CHILD_SORT_KEY][
               JV.PROP_PARENT_DATA_KEY
-            ]
+            ],
           );
           sel.selectedIndex = idx;
           me.parentTreeObj = $.fn.zTree.init(
             $("#parent_sorting_keys"),
             sortingKeysSetting,
-            exposed_properties_arr[idx]
+            exposed_properties_arr[idx],
           );
           me.checkupNode(
             preHandleObj.currentNode[JV.PROP_PARENT_CHILD_SORT_KEY][
               JV.PROP_PARENT_SORT_KEYS
             ],
-            me.parentTreeObj
+            me.parentTreeObj,
           );
           idx = pre_handle_data_objects.indexOf(
-            preHandleObj.currentNode[JV.PROP_DATA_KEY]
+            preHandleObj.currentNode[JV.PROP_DATA_KEY],
           );
           me.childTreeObj = $.fn.zTree.init(
             $("#child_sorting_keys"),
             sortingKeysSetting,
-            exposed_properties_arr[idx]
+            exposed_properties_arr[idx],
           );
           me.checkupNode(
             preHandleObj.currentNode[JV.PROP_PARENT_CHILD_SORT_KEY][
               JV.PROP_CHILD_SORT_KEYS
             ],
-            me.childTreeObj
+            me.childTreeObj,
           );
           break;
         case 3:
@@ -987,11 +1013,11 @@ let preHandleSortObj = {
     if (treeNode.checked) {
       if (
         preHandleObj.currentNode[JV.PROP_FILTER_TOP_BILLS_NODES].indexOf(
-          treeNode.Value
+          treeNode.Value,
         ) < 0
       ) {
         preHandleObj.currentNode[JV.PROP_FILTER_TOP_BILLS_NODES].push(
-          treeNode.Value
+          treeNode.Value,
         );
       }
     } else {
@@ -1008,11 +1034,11 @@ let preHandleSortObj = {
     if (treeNode.checked) {
       if (
         preHandleObj.currentNode[JV.PROP_FILTER_OTHER_BILLS_NODES].indexOf(
-          treeNode.Value
+          treeNode.Value,
         ) < 0
       ) {
         preHandleObj.currentNode[JV.PROP_FILTER_OTHER_BILLS_NODES].push(
-          treeNode.Value
+          treeNode.Value,
         );
       }
     } else {
@@ -1022,7 +1048,7 @@ let preHandleSortObj = {
       if (idx >= 0) {
         preHandleObj.currentNode[JV.PROP_FILTER_OTHER_BILLS_NODES].splice(
           idx,
-          1
+          1,
         );
       }
     }
@@ -1087,12 +1113,12 @@ let preHandleSortObj = {
       preHandleSortObj.parentTreeObj = $.fn.zTree.init(
         $("#parent_sorting_keys"),
         sortingKeysSetting,
-        exposed_properties_arr[0]
+        exposed_properties_arr[0],
       );
       preHandleSortObj.childTreeObj = $.fn.zTree.init(
         $("#child_sorting_keys"),
         sortingKeysSetting,
-        exposed_properties_arr[data_dom.selectedIndex]
+        exposed_properties_arr[data_dom.selectedIndex],
       );
       me.currentNode[JV.PROP_PARENT_CHILD_SORT_KEY] = {};
       me.currentNode[JV.PROP_PARENT_CHILD_SORT_KEY][JV.PROP_PARENT_DATA_KEY] =
@@ -1107,7 +1133,7 @@ let preHandleSortObj = {
       preHandleSortObj.normalTreeObj = $.fn.zTree.init(
         $("#pre_handle_sort_keys_reversed"),
         sortingKeysSetting,
-        exposed_properties_arr[data_dom.selectedIndex]
+        exposed_properties_arr[data_dom.selectedIndex],
       );
       me.currentNode[JV.PROP_SORT_KEYS] = [];
     } else if (dom.selectedIndex === 1) {
@@ -1115,7 +1141,7 @@ let preHandleSortObj = {
       preHandleSortObj.normalTreeObj = $.fn.zTree.init(
         $("#bills_top_nodes"),
         sortingTreeSetting,
-        fixed_top_bills_nodes
+        fixed_top_bills_nodes,
       );
     } else {
       //自定义
@@ -1221,12 +1247,12 @@ let preHandleFilterObj = {
     $("#div_filter_type")[0].style.display = "";
     if (preHandleObj.currentNode) {
       let idx = pre_handle_data_objects.indexOf(
-        preHandleObj.currentNode[JV.PROP_DATA_KEY]
+        preHandleObj.currentNode[JV.PROP_DATA_KEY],
       );
       me.treeObj = $.fn.zTree.init(
         $("#pre_handle_filter_keys_reversed"),
         filterKeysSetting,
-        exposed_properties_arr[idx]
+        exposed_properties_arr[idx],
       );
       let nodes = me.treeObj.getNodes();
       for (let filterItem of preHandleObj.currentNode[JV.PROP_FILTER_KEYS]) {
@@ -1242,7 +1268,7 @@ let preHandleFilterObj = {
                 filterItem[JV.PROP_FILTER_COMPARE_VAL];
               $("#diyCheck_" + keyNode.tId)[0].checked =
                 keyNode["booleanOptions"].indexOf(
-                  filterItem["compareValue"]
+                  filterItem["compareValue"],
                 ) === 0;
             } else if (keyNode.hasOwnProperty("individualType")) {
               $("#diySelect_" + keyNode.tId)[0].selectedIndex =
@@ -1277,7 +1303,7 @@ let preHandleFilterObj = {
                 keyNode[JV.PROP_FILTER_COMPARE_OBJ] =
                   filterItem[JV.PROP_FILTER_COMPARE_OBJ];
                 let idx = pre_handle_data_objects.indexOf(
-                  filterItem[JV.PROP_FILTER_COMPARE_OBJ]
+                  filterItem[JV.PROP_FILTER_COMPARE_OBJ],
                 );
                 cmpObjDom.selectedIndex = idx + 1;
                 me.private_setup_compare_obj(cmpObjDom);
@@ -1328,7 +1354,7 @@ let preHandleFilterObj = {
   build_filter_handle_data_selection_str: function (treeId, treeNode) {
     let rst = [];
     rst.push(
-      "<select class='selDemo' id='diyDataSelect_" + treeNode.tId + "'>"
+      "<select class='selDemo' id='diyDataSelect_" + treeNode.tId + "'>",
     );
     rst.push("<option value='empty'>无</option>");
     for (let i = 0; i < pre_handle_data_objects.length; i++) {
@@ -1337,7 +1363,7 @@ let preHandleFilterObj = {
           pre_handle_data_objects[i] +
           "'>" +
           pre_handle_data_objects_name[i] +
-          "</option>"
+          "</option>",
       );
     }
     rst.push("</select>");
@@ -1346,7 +1372,7 @@ let preHandleFilterObj = {
   build_filter_handle_data_detail_selection_str: function (treeId, treeNode) {
     let rst = [];
     rst.push(
-      "<select class='selDemo' id='diyDataDetailSelect_" + treeNode.tId + "'>"
+      "<select class='selDemo' id='diyDataDetailSelect_" + treeNode.tId + "'>",
     );
     rst.push("</select>");
     return rst.join("");
@@ -1354,7 +1380,7 @@ let preHandleFilterObj = {
   build_individual_filter_selection_str: function (individualTypes, treeNode) {
     let rst = [];
     rst.push(
-      "<select class='selDemo' id='diyDataDetailSelect_" + treeNode.tId + "'>"
+      "<select class='selDemo' id='diyDataDetailSelect_" + treeNode.tId + "'>",
     );
     for (let i = 0; i < individualTypes.length; i++) {
       rst.push(
@@ -1362,7 +1388,7 @@ let preHandleFilterObj = {
           individualTypes[i].Value +
           "'>" +
           individualTypes[i].Name +
-          "</option>"
+          "</option>",
       );
     }
     rst.push("</select>");
@@ -1382,7 +1408,7 @@ let preHandleFilterObj = {
     } else if (treeNode.hasOwnProperty("individualType")) {
       let dataDtlSelStr = me.build_individual_filter_selection_str(
         treeNode.individualType,
-        treeNode
+        treeNode,
       );
       aObj.after(dataDtlSelStr);
       let editStr =
@@ -1409,12 +1435,12 @@ let preHandleFilterObj = {
       //注意：这是后面的DOM先生成
       let dataDtlSelStr = me.build_filter_handle_data_detail_selection_str(
         treeId,
-        treeNode
+        treeNode,
       );
       aObj.after(dataDtlSelStr);
       let dataSelStr = me.build_filter_handle_data_selection_str(
         treeId,
-        treeNode
+        treeNode,
       );
       aObj.after(dataSelStr);
       let editStr =
@@ -1487,7 +1513,7 @@ let preHandleFilterObj = {
       let jdtlSel = $("#" + dtlKey);
       for (let item of exposed_properties_arr[idx]) {
         jdtlSel.append(
-          "<option value='" + item.Key + "'>" + item.Name + "</option>"
+          "<option value='" + item.Key + "'>" + item.Name + "</option>",
         );
       }
     } else {
@@ -1528,7 +1554,7 @@ let preHandleFilterObj = {
     rst[JV.PROP_OTHER_SUB_FILTER] = [];
     let private_extract_other_sub_filter = function (
       parentFilter,
-      currentFilterNode
+      currentFilterNode,
     ) {
       let dtlRst = {};
       me.copyNode(currentFilterNode, dtlRst);