增加项目人材机指标选择

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -4,8 +4,8 @@
 
 const sort_types = ["normal", "tree", "accord_to_parent", "self_define"];
 const condition_types = ["==", "===", ">", ">=", "<", "<=", "!=", "in", "not in"];
-const pre_handle_data_objects = ["bills", "ration", "ration_glj"];
-const pre_handle_data_objects_name = ["清单", "定额", "定额人材机"];
+const pre_handle_data_objects = ["bills", "ration", "ration_glj", "projectGLJ"];
+const pre_handle_data_objects_name = ["清单", "定额", "定额人材机", "项目人材机"];
 //供货方式
 const fixed_supply_types = [
     {Name: "自行采购(0)", Title: "", Value: 0},
@@ -21,6 +21,20 @@ const fixed_material_types = [
     {Name: "水泥(4)", Title: "", Value: 4},
     {Name: "标准砖(5)", Title: "", Value: 5}
 ];
+const fixed_glj_types = [
+    {Name: "人工(1)", Title: "", Value: 1},
+    {Name: "普通材料(201)", Title: "", Value: 201},
+    {Name: "混凝土(202)", Title: "", Value: 202},
+    {Name: "砂浆(203)", Title: "", Value: 203},
+    {Name: "配合比(204)", Title: "", Value: 204},
+    {Name: "商品混凝土(205)", Title: "", Value: 205},
+    {Name: "商品砂浆(206)", Title: "", Value: 206},
+    {Name: "普通机械(301)", Title: "", Value: 301},
+    {Name: "机械组成物(302)", Title: "", Value: 302},
+    {Name: "机上人工(303)", Value: 303},
+    {Name: "主材(4)", Title: "", Value: 4},
+    {Name: "设备(5)", Title: "", Value: 5}
+];
 const fixed_bills_flags = [
     {Name: "分部分项工程(1)", Title: "", Value: 1},
     {Name: "措施项目(2)", Title: "", Value: 2},
@@ -47,37 +61,12 @@ const exposed_bills_properties = [
     ,{Name: "清单_ID", Title: "", Key: "ID", Order: "ascend"}
     ,{Name: "清单_层次", Title: "", Key: "treeLevel", Order: "ascend"}
     ,{Name: "清单_标记", Title: "", Key: "flags.flag", Order: "ascend", individualType: fixed_bills_flags}
-    // ,{Name: "清单_项目编码", Title: "", Key: "code", Order: "ascend"}
-    // ,{Name: "清单_项目名称", Title: "", Key: "name", Order: "ascend"}
-    // ,{Name: "清单_项目特征", Title: "", Key: "itemCharacterText", Order: "ascend"}
-    // ,{Name: "清单_计量单位", Title: "", Key: "unit", Order: "ascend"}
-    // ,{Name: "清单_工程量", Title: "", Key: "quantity", Order: "ascend"}
-    // ,{Name: "清单_综合单价", Title: "", Key: "unitFee", Order: "ascend"}
-    // ,{Name: "清单_综合合价", Title: "", Key: "totalFee", Order: "ascend"}
-    // ,{Name: "清单_暂估价", Title: "", Key: "tenderUnitFee", Order: "ascend"}
 ];
 const exposed_ration_properties = [
     {Name: "定额_工程内部ID", Title: "", Key: "ID", Order: "ascend"}
     ,{Name: "定额_所属项目ID", Title: "", Key: "projectID", Order: "ascend"}
     ,{Name: "定额_所属清单ID", Title: "", Key: "billsItemID", Order: "ascend"}
     ,{Name: "定额_清单内顺序", Title: "", Key: "serialNo", Order: "ascend"}
-    // ,{Name: "定额_编号", Title: "", Key: "code", Order: "ascend"}
-    // ,{Name: "定额_项目名称", Title: "", Key: "caption", Order: "ascend"}
-    // ,{Name: "定额_单位", Title: "", Key: "unit", Order: "ascend"}
-    // ,{Name: "定额_数量", Title: "", Key: "quantity", Order: "ascend"}
-    // ,{Name: "定额_人工费", Title: "", Key: "labour", Order: "ascend"}
-    // ,{Name: "定额_材料费", Title: "", Key: "material", Order: "ascend"}
-    // ,{Name: "定额_机械费", Title: "", Key: "machine", Order: "ascend"}
-    // ,{Name: "定额_机上人工费", Title: "", Key: "machineLabour", Order: "ascend"}
-    // ,{Name: "定额_人工费调整", Title: "", Key: "adjustLabour", Order: "ascend"}
-    // ,{Name: "定额_材料费调整", Title: "", Key: "'adjustMaterial'", Order: "ascend"}
-    // ,{Name: "定额_机械费调整", Title: "", Key: "adjustMachine", Order: "ascend"}
-    // ,{Name: "定额_机上人工费调整", Title: "", Key: "adjustMachineLabour", Order: "ascend"}
-    // ,{Name: "定额_人工价差", Title: "", Key: "labourDiff", Order: "ascend"}
-    // ,{Name: "定额_材料价差", Title: "", Key: "materialDiff", Order: "ascend"}
-    // ,{Name: "定额_机械价差", Title: "", Key: "machineDiff", Order: "ascend"}
-    // ,{Name: "定额_风险费用", Title: "", Key: "risk", Order: "ascend"}
-    // ,{Name: "定额_管理费率", Title: "", Key: ""}
 ];
 const exposed_ration_glj_properties = [
     {Name: "定额人材机_ID", Title: "", Key: "ID"}
@@ -85,6 +74,7 @@ const exposed_ration_glj_properties = [
     ,{Name: "定额人材机_所属清单ID", Title: "", Key: "billsItemID", Order: "ascend"}
     ,{Name: "定额人材机_所属工程ID", Title: "", Key: "projectID", Order: "ascend"}
     ,{Name: "定额人材机_代码", Title: "", Key: "code", Order: "ascend"}
+    ,{Name: "定额人材机_类型", Title: "", Key: "type", Order: "ascend", individualType: fixed_glj_types}
     ,{Name: "定额人材机_是否暂估", Title: "", Key: "ref_join(projectGLJID,projectGLJ,id).is_evaluate", Order: "ascend", isBoolean: true, booleanOptions: [1,0]}
     ,{Name: "定额人材机_供货方式", Title: "", Key: "ref_join(projectGLJID,projectGLJ,id).supply", Order: "ascend", individualType: fixed_supply_types}
     ,{Name: "定额人材机_三材类别", Title: "", Key: "ref_join(projectGLJID,projectGLJ,id).materialType", Order: "ascend", individualType: fixed_material_types}
@@ -93,11 +83,12 @@ const exposed_prj_glj_properties = [
     {Name: "项目人材机_ID", Title: "", Key: "ID"}
     ,{Name: "项目人材机_所属工程ID", Title: "", Key: "projectID", Order: "ascend"}
     ,{Name: "项目人材机_代码", Title: "", Key: "code", Order: "ascend"}
+    ,{Name: "项目人材机_类型", Title: "", Key: "type", Order: "ascend", individualType: fixed_glj_types}
     ,{Name: "项目人材机_是否暂估", Title: "", Key: "is_evaluate", Order: "ascend", isBoolean: true, booleanOptions: [1,0]}
     ,{Name: "项目人材机_供货方式", Title: "", Key: "supply", Order: "ascend", individualType: fixed_supply_types}
     ,{Name: "项目人材机_三材类别", Title: "", Key: "materialType", Order: "ascend", individualType: fixed_material_types}
 ];
-const exposed_properties_arr = [exposed_bills_properties, exposed_ration_properties, exposed_ration_glj_properties];
+const exposed_properties_arr = [exposed_bills_properties, exposed_ration_properties, exposed_ration_glj_properties, exposed_prj_glj_properties];
 const fixed_top_bills_nodes = [
     {Name: "分部分项工程(1)", Title: "", Value: 1}
     ,{Name: "措施项目(2)", Title: "", Value: 2}