修改三材类别

web/building_saas/main/js/models/main_consts.js

@@ -186,19 +186,22 @@ const materialType = {
     2: '钢筋',
     3: '木材',
     4: '水泥',
-    5: '标准砖'
+    5: '商品砼',
+    6: '商品砂浆'
 };
 const materialTypeMap = {
     GC: 1,
     GJ: 2,
     MC: 3,
     SN: 4,
-    SZ: 5,
+    ST: 5,
+    SS: 6,
     1:'GC',
     2:'GJ',
     3:'MC',
     4:'SN',
-    5:'SZ'
+    5:'ST',
+    6:'SS'
 
 }
 
@@ -394,7 +397,8 @@ const materialComboMap = [
     {text:materialType[materialTypeMap.GJ],value:materialTypeMap.GJ},
     {text:materialType[materialTypeMap.MC],value:materialTypeMap.MC},
     {text:materialType[materialTypeMap.SN],value:materialTypeMap.SN},
-    {text:materialType[materialTypeMap.SZ],value:materialTypeMap.SZ}
+    {text:materialType[materialTypeMap.ST],value:materialTypeMap.ST},
+    {text:materialType[materialTypeMap.SS],value:materialTypeMap.SS}
 ];
 
 //定额计算基数简称对应关系，目前只有导出标准接口使用

web/building_saas/main/js/views/project_glj_view.js

@@ -417,7 +417,7 @@ projectGljObject={
     getUpdateData :function (id,value,dataCode,quantity,updateMap) {
         let me = projectGljObject;
         let supplyMap = {"自行采购":0,"部分甲供":1,"完全甲供":2,"甲定乙供":3};
-        let materialMap = {"钢材":1,"钢筋":2,"木材":3,"水泥":4,"标准砖":5};
+        let materialMap = {"钢材":1,"钢筋":2,"木材":3,"水泥":4,"商品砼":5,"商品砂浆":6};
         let data = updateMap[id]?updateMap[id]:{};
         //供货方式 和三材类型 粘贴和填充过来的数据，要做对应转换，因为这里value只是中文文本，并不是实际的值
         // 如果是供货方式则需要处理数据
@@ -541,9 +541,10 @@ projectGljObject={
         let GC = {id:'GC',name:materialType[materialTypeMap.GC],code:'GC',unit:'t',ParentID:-1,NextSiblingID:'MC'};
         let GJ = {id:'GJ',name:materialType[materialTypeMap.GJ],code:'GJ',unit:'t',ParentID:'GC',NextSiblingID:-1};
         let MC = {id:'MC',name:materialType[materialTypeMap.MC],code:'MC',unit:'m3',ParentID:-1,NextSiblingID:'SN'};
-        let SN = {id:'SN',name:materialType[materialTypeMap.SN],code:'SN',unit:'t',ParentID:-1,NextSiblingID:'SZ'};
-        let SZ = {id:'SZ',name:materialType[materialTypeMap.SZ],code:'BZZ',unit:'千块',ParentID:-1,NextSiblingID:-1};
-        let rootDatas= [GC,GJ,MC,SN,SZ];
+        let SN = {id:'SN',name:materialType[materialTypeMap.SN],code:'SN',unit:'t',ParentID:-1,NextSiblingID:'ST'};
+        let ST = {id:'ST',name:materialType[materialTypeMap.ST],code:'SPT',unit:'m3',ParentID:-1,NextSiblingID:'SS'};
+        let SS= {id:'SS',name:materialType[materialTypeMap.SS],code:'SPJS',unit:'m3',ParentID:-1,NextSiblingID:'-1'};
+        let rootDatas= [GC,GJ,MC,SN,ST,SS];
         let parentMap = {};
         let sumMap = {};
         this.materialTree.nodes={},this.materialTree.selected = null,this.materialTree.roots = [],this.materialTree.items=[];