浏览代码

fix: 报表相关,数据预处理新增造价书中插入补项工料机

lishihao 11 月之前
父节点
当前提交
769d66b03f
共有 2 个文件被更改,包括 11 次插入1 次删除
  1. 1 0
      public/web/rpt_value_define.js
  2. 10 1
      web/maintain/report/js/rpt_tpl_pre_handle.js

+ 1 - 0
public/web/rpt_value_define.js

@@ -78,6 +78,7 @@ 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_ADJUST_COLLECTION: "数据调整集",
     PROP_ADJUST_ACTION: "action",

+ 10 - 1
web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -291,6 +291,7 @@ 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: "纯手工填写", 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 +341,14 @@ 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;
             default:
                 rst = { Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": "排序", "排序方式": "normal", "排序键值集": [] };
                 break;
@@ -392,6 +396,8 @@ let preHandleObj = {
                 break;
             case JV.PROP_HANDLE_TYPE_LAND_COMPS:
                 break;
+            case JV.PROP_HANDLE_TYPE_COST_TREE_BU_GLJ:
+                break;
             default:
                 item[JV.PROP_HANDLE_TYPE] = JV.PROP_HANDLE_TYPE_SORT;
                 item[JV.PROP_SORT_TYPE] = "normal";
@@ -613,6 +619,9 @@ 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;
                     default:
                         break;
                 }