bugs

public/web/gljUtil.js

@@ -185,12 +185,9 @@ let gljUtil = {
         if (this.notEditType.indexOf(glj.unit_price.type)!=-1&&glj.ratio_data.length>0) {//对于混凝土、配合比、砂浆、机械台班等有组成物的材料，价格需根据组成物计算得出。
             let p =0;
             for(let ratio of glj.ratio_data){
-                let tem =  _.find(projectGLJDatas.gljList,{
-                    'code': ratio.code,
-                    'name': ratio.name,
-                    'specs':ratio.specs,
-                    'type': ratio.type,
-                    'unit': ratio.unit
+                let rIndex = gljUtil.getIndex(ratio);
+                let tem =  _.find(projectGLJDatas.gljList,function(item){
+                    return rIndex == gljUtil.getIndex(item)
                 });
                 if(tem){
                     let tem_marketPrice = this.getMarketPrice(tem,projectGLJDatas,calcOptions,decimalObj,true,_,scMathUtil);  //let priceData=this.getGLJPrice(tem,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,true,_,scMathUtil);
@@ -250,13 +247,10 @@ let gljUtil = {
         } else if (this.notEditType.indexOf(glj.unit_price.type)!=-1&&glj.ratio_data.length>0) {//对于混凝土、配合比、砂浆、机械台班，调整价根据组成物计算得出。
             let p =0;
             for(let ratio of glj.ratio_data){
-                let tem =  _.find( projectGLJDatas.gljList,{
-                    'code': ratio.code,
-                    'name': ratio.name,
-                    'specs':ratio.specs,
-                    'type': ratio.type,
-                    'unit': ratio.unit
-                })
+                let rIndex = gljUtil.getIndex(ratio);
+                let tem =  _.find(projectGLJDatas.gljList,function(item){
+                    return rIndex == gljUtil.getIndex(item);
+                });
                 if(tem){
                     let priceData=this.getGLJPrice(tem,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,true,_,scMathUtil);
                     let temP = scMathUtil.roundForObj(priceData.adjustPrice*scMathUtil.roundForObj(ratio.consumption,quantity_decimal),process_decimal);