TonyKang пре 6 година
родитељ
комит
b8b74a8349
2 измењених фајлова са 142 додато и 41 уклоњено
  1. 11 0
      config/config.js
  2. 131 41
      web/maintain/report/js/rpt_tpl_pre_handle.js

Разлика између датотеке није приказан због своје велике величине
+ 11 - 0
config/config.js


+ 131 - 41
web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -21,6 +21,33 @@ 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: "其他材料(207)", Title: "", Value: 207},
+//     {Name: "普通机械(301)", Title: "", Value: 301},
+//     {Name: "机械组成物(302)", Title: "", Value: 302},
+//     {Name: "机上人工(303)", Value: 303},
+//     {Name: "仪器仪表(304)", Value: 304},
+//     {Name: "燃料动力费(305)", Value: 305},
+//     {Name: "折旧费(306)", Value: 306},
+//     {Name: "检修费(307)", Value: 307},
+//     {Name: "维护费(308)", Value: 308},
+//     {Name: "安拆费及场外运费(309)", Value: 309},
+//     {Name: "校验费(310)", Value: 310},
+//     {Name: "其他费用(311)", Value: 311},
+//     {Name: "其他施工机具使用费(312)", Value: 312},
+//     {Name: "主材(4)", Title: "", Value: 4},
+//     {Name: "设备(5)", Title: "", Value: 5},
+//     {Name: "企业管理费(6)", Title: "", Value: 6},
+//     {Name: "利润(7)", Title: "", Value: 7},
+//     {Name: "一般风险费(8)", Title: "", Value: 8}
+// ];
 const fixed_glj_types = [
     {Name: "人工(1)", Title: "", Value: 1},
     {Name: "普通材料(201)", Title: "", Value: 201},
@@ -30,7 +57,7 @@ const fixed_glj_types = [
     {Name: "商品混凝土(205)", Title: "", Value: 205},
     {Name: "商品砂浆(206)", Title: "", Value: 206},
     {Name: "其他材料(207)", Title: "", Value: 207},
-    {Name: "普通机械(301)", Title: "", Value: 301},
+    {Name: "机械台班(301)", Title: "", Value: 301},
     {Name: "机械组成物(302)", Title: "", Value: 302},
     {Name: "机上人工(303)", Value: 303},
     {Name: "仪器仪表(304)", Value: 304},
@@ -48,51 +75,114 @@ const fixed_glj_types = [
     {Name: "利润(7)", Title: "", Value: 7},
     {Name: "一般风险费(8)", Title: "", Value: 8}
 ];
+// const fixed_top_bills_nodes = [
+//     {Name: "分部分项工程(1)", Title: "", Value: 1}
+//     ,{Name: "措施项目(2)", Title: "", Value: 2}
+//     ,{Name: "其他项目(7)", Title: "", Value: 7}
+//     ,{Name: "规费(15)", Title: "", Value: 15}
+//     ,{Name: "税金(18)", Title: "", Value: 18}
+//     ,{Name: "工程造价(19)", Title: "", Value: 19}
+// ];
 const fixed_top_bills_nodes = [
-    {Name: "分部分项工程(1)", Title: "", Value: 1}
-    ,{Name: "措施项目(2)", Title: "", Value: 2}
-    ,{Name: "其他项目(7)", Title: "", Value: 7}
-    ,{Name: "规费(15)", Title: "", Value: 15}
-    ,{Name: "税金(18)", Title: "", Value: 18}
-    ,{Name: "工程造价(19)", Title: "", Value: 19}
+    {Name: "建筑安装工程费(1)", Title: "", Value: 1}
+    ,{Name: "土地使用及拆迁补偿费(2)", Title: "", Value: 2}
+    ,{Name: "养护工程其他费用(3)", Title: "", Value: 3}
+    ,{Name: "预备费(4)", Title: "", Value: 4}
+    ,{Name: "一二三四部分合计(7)", Title: "", Value: 7}
+    ,{Name: "贷款利息(8)", Title: "", Value: 8}
+    ,{Name: "总造价(9)", Title: "", Value: 9}
 ];
+
+// const fixed_other_bills_types = [
+//     {Name: "施工技术措施项目(3)", Title: "", Value: 3}
+//     ,{Name: "安全文明施工按实计算费用(4)", Title: "", Value: 4}
+//     ,{Name: "施工组织措施专项费用(5)", Title: "", Value: 5}
+//     ,{Name: "安全文明施工专项费用(6)", Title: "", Value: 6}
+//     ,{Name: "暂列金额(8)", Title: "", Value: 8}
+//     ,{Name: "暂估价(9)", Title: "", Value: 9}
+//     ,{Name: "材料(工程设备)暂估价(10)", Title: "", Value: 10}
+//     ,{Name: "专业工程暂估价(11)", Title: "", Value: 11}
+//     ,{Name: "计日工(12)", Title: "", Value: 12}
+//     ,{Name: "总承包服务费(13)", Title: "", Value: 13}
+//     ,{Name: "索赔与现场签证(14)", Title: "", Value: 14}
+//     ,{Name: "社会保险费及住房公积金(16)", Title: "", Value: 16}
+//     ,{Name: "工程排污费(17)", Title: "", Value: 17}
+//     ,{Name: "增值税(20)", Title: "", Value: 20}
+// ];
 const fixed_other_bills_types = [
-    {Name: "施工技术措施项目(3)", Title: "", Value: 3}
-    ,{Name: "安全文明施工按实计算费用(4)", Title: "", Value: 4}
-    ,{Name: "施工组织措施专项费用(5)", Title: "", Value: 5}
-    ,{Name: "安全文明施工专项费用(6)", Title: "", Value: 6}
-    ,{Name: "暂列金额(8)", Title: "", Value: 8}
-    ,{Name: "暂估价(9)", Title: "", Value: 9}
-    ,{Name: "材料(工程设备)暂估价(10)", Title: "", Value: 10}
-    ,{Name: "专业工程暂估价(11)", Title: "", Value: 11}
-    ,{Name: "计日工(12)", Title: "", Value: 12}
-    ,{Name: "总承包服务费(13)", Title: "", Value: 13}
-    ,{Name: "索赔与现场签证(14)", Title: "", Value: 14}
-    ,{Name: "社会保险费及住房公积金(16)", Title: "", Value: 16}
-    ,{Name: "工程排污费(17)", Title: "", Value: 17}
-    ,{Name: "增值税(20)", Title: "", Value: 20}
+    {Name: "基本预备费(5)", Title: "", Value: 5}
+    ,{Name: "价差预备费(6)", Title: "", Value: 6}
+    ,{Name: "设备购置费(10)", Title: "", Value: 10}
+    ,{Name: "专项费用(11)", Title: "", Value: 11}
+    ,{Name: "施工场地建设费(12)", Title: "", Value: 12}
+    ,{Name: "养护单位(业主)管理费(13)", Title: "", Value: 13}
+    ,{Name: "信息化费", Title: "", Value: 14}
+    ,{Name: "工程监理费(15)", Title: "", Value: 15}
+    ,{Name: "设计文件审查费(16)", Title: "", Value: 16}
+    ,{Name: "勘察设计费(17)", Title: "", Value: 17}
+    ,{Name: "招标代理及标底编制费(18)", Title: "", Value: 18}
+    ,{Name: "第100章至700章清单(19)", Title: "", Value: 19}
+    ,{Name: "专项暂定合计(20)", Title: "", Value: 20}
+    ,{Name: "清单合计扣除专项暂定合计(21)", Title: "", Value: 21}
+    ,{Name: "计日工(22)", Title: "", Value: 22}
+    ,{Name: "劳务(23)", Title: "", Value: 23}
+    ,{Name: "材料(24)", Title: "", Value: 24}
+    ,{Name: "施工机械(25)", Title: "", Value: 25}
+    ,{Name: "暂列金额(26)", Title: "", Value: 26}
+    ,{Name: "安全生产费(27)", Title: "", Value: 27}
+    ,{Name: "100章清单(28)", Title: "", Value: 28}
 ];
+// const fixed_bills_flags = [
+//     {Name: "分部分项工程(1)", Title: "", Value: 1},
+//     {Name: "措施项目(2)", Title: "", Value: 2},
+//     {Name: "施工技术措施项目(3)", Title: "", Value: 3},
+//     {Name: "安全文明施工按实计算费用(4)", Title: "", Value: 4},
+//     {Name: "施工组织措施专项费用(5)", Title: "", Value: 5},
+//     {Name: "安全文明施工专项费用(6)", Title: "", Value: 6},
+//     {Name: "其他项目(7)", Title: "", Value: 7},
+//     {Name: "暂列金额(8)", Title: "", Value: 8},
+//     {Name: "暂估价(9)", Title: "", Value: 9},
+//     {Name: "材料(工程设备)暂估价(10)", Title: "", Value: 10},
+//     {Name: "专业工程暂估价(11)", Title: "", Value: 11},
+//     {Name: "计日工(12)", Title: "", Value: 12},
+//     {Name: "总承包服务费(13)", Title: "", Value: 13},
+//     {Name: "索赔与现场签证(14)", Title: "", Value: 14},
+//     {Name: "规费(15)", Title: "", Value: 15},
+//     {Name: "社会保险费及住房公积金(16)", Title: "", Value: 16},
+//     {Name: "工程排污费(17)", Title: "", Value: 17},
+//     {Name: "税金(18)", Title: "", Value: 18},
+//     {Name: "工程造价(19)", Title: "", Value: 19},
+//     {Name: "增值税(20)", Title: "", Value: 20}
+// ];
 const fixed_bills_flags = [
-    {Name: "分部分项工程(1)", Title: "", Value: 1},
-    {Name: "措施项目(2)", Title: "", Value: 2},
-    {Name: "施工技术措施项目(3)", Title: "", Value: 3},
-    {Name: "安全文明施工按实计算费用(4)", Title: "", Value: 4},
-    {Name: "施工组织措施专项费用(5)", Title: "", Value: 5},
-    {Name: "安全文明施工专项费用(6)", Title: "", Value: 6},
-    {Name: "其他项目(7)", Title: "", Value: 7},
-    {Name: "暂列金额(8)", Title: "", Value: 8},
-    {Name: "暂估价(9)", Title: "", Value: 9},
-    {Name: "材料(工程设备)暂估价(10)", Title: "", Value: 10},
-    {Name: "专业工程暂估价(11)", Title: "", Value: 11},
-    {Name: "计日工(12)", Title: "", Value: 12},
-    {Name: "总承包服务费(13)", Title: "", Value: 13},
-    {Name: "索赔与现场签证(14)", Title: "", Value: 14},
-    {Name: "规费(15)", Title: "", Value: 15},
-    {Name: "社会保险费及住房公积金(16)", Title: "", Value: 16},
-    {Name: "工程排污费(17)", Title: "", Value: 17},
-    {Name: "税金(18)", Title: "", Value: 18},
-    {Name: "工程造价(19)", Title: "", Value: 19},
-    {Name: "增值税(20)", Title: "", Value: 20}
+    {Name: "建筑安装工程费(1)", Title: "", Value: 1}
+    ,{Name: "土地使用及拆迁补偿费(2)", Title: "", Value: 2}
+    ,{Name: "养护工程其他费用(3)", Title: "", Value: 3}
+    ,{Name: "预备费(4)", Title: "", Value: 4}
+    ,{Name: "基本预备费(5)", Title: "", Value: 5}
+    ,{Name: "价差预备费(6)", Title: "", Value: 6}
+    ,{Name: "一二三四部分合计(7)", Title: "", Value: 7}
+    ,{Name: "贷款利息(8)", Title: "", Value: 8}
+    ,{Name: "总造价(9)", Title: "", Value: 9}
+    ,{Name: "设备购置费(10)", Title: "", Value: 10}
+    ,{Name: "专项费用(11)", Title: "", Value: 11}
+    ,{Name: "施工场地建设费(12)", Title: "", Value: 12}
+    ,{Name: "养护单位(业主)管理费(13)", Title: "", Value: 13}
+    ,{Name: "信息化费", Title: "", Value: 14}
+    ,{Name: "工程监理费(15)", Title: "", Value: 15}
+    ,{Name: "设计文件审查费(16)", Title: "", Value: 16}
+    ,{Name: "勘察设计费(17)", Title: "", Value: 17}
+    ,{Name: "招标代理及标底编制费(18)", Title: "", Value: 18}
+    ,{Name: "第100章至700章清单(19)", Title: "", Value: 19}
+    ,{Name: "专项暂定合计(20)", Title: "", Value: 20}
+    ,{Name: "清单合计扣除专项暂定合计(21)", Title: "", Value: 21}
+    ,{Name: "计日工(22)", Title: "", Value: 22}
+    ,{Name: "劳务(23)", Title: "", Value: 23}
+    ,{Name: "材料(24)", Title: "", Value: 24}
+    ,{Name: "施工机械(25)", Title: "", Value: 25}
+    ,{Name: "暂列金额(26)", Title: "", Value: 26}
+    ,{Name: "安全生产费(27)", Title: "", Value: 27}
+    ,{Name: "100章清单(28)", Title: "", Value: 28}
 ];
 const fixed_bills_types = [
     {Name: "大项费用(1)", Title: "", Value: 1},