Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation into 1.0.0_online

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -19,7 +19,8 @@ const fixed_material_types = [
     {Name: "钢筋(2)", Title: "", Value: 2},
     {Name: "木材(3)", Title: "", Value: 3},
     {Name: "水泥(4)", Title: "", Value: 4},
-    {Name: "标准砖(5)", Title: "", Value: 5}
+    {Name: "商品砼(5)", Title: "", Value: 5},
+    {Name: "商品砂浆(6)", Title: "", Value: 6}
 ];
 const fixed_glj_types = [
     {Name: "人工(1)", Title: "", Value: 1},

web/maintain/std_glj_lib/js/glj.js

@@ -85,10 +85,9 @@ let repositoryGljObj = {
     currentCache: null,
     parentNodeIds: {},
     gljList: [],
-    //materialType: ['钢材', '木材', '水泥', '钢筋', '标准砖'],//三材类型：钢材1、钢筋101、木材2、水泥3、标准砖4
-    materialType: {textArr: ['钢材', '钢筋', '木材', '水泥', '标准砖'], comboItems: [{text: '钢材', value: 1}, {text: '钢筋', value: 2},{text: '木材', value: 3},//三材类型：钢材1、钢筋101、木材2、水泥3、标准砖4
-         {text: '水泥', value: 4}, {text: '标准砖', value: 5}]},
-    materialTypeIdx: {'1': '钢材', '2': '钢筋', '3': '木材', '4': '水泥', '5': '标准砖'},
+    materialType: {textArr: ['钢材', '钢筋', '木材', '水泥', '商品砼','商品砂浆'], comboItems: [{text: '钢材', value: 1}, {text: '钢筋', value: 2},{text: '木材', value: 3},//三材类型：钢材1、钢筋2、木材3、水泥4、商品砼5、商品砂浆6
+         {text: '水泥', value: 4}, {text: '商品砼', value: 5},{text: '商品砂浆', value: 6}]},
+    materialTypeIdx: {'1': '钢材', '2': '钢筋', '3': '木材', '4': '水泥', '5': '商品砼', '6': '商品砂浆'},
     machineModel: {textArr: ['特', '大', '中', '小'], comboItems: [{text: '特', value: 1}, {text: '大', value: 2},{text: '中', value: 3}, {text: '小', value: 4}]},
     machineModelIdx: {'1': '特', '2': '大', '3': '中', '4': '小'},
     distTypeTree: null,//add