bugs

web/building_saas/main/js/models/calc_program.js

@@ -826,7 +826,9 @@ class CalcProgram {
                 for (let glj of treeNode.data.gljList) {
                     if (eTypes.indexOf(glj.type) >= 0) {
                         if (glj.isEstimate){
-                            GLJObjs.push({code: glj.code, quantity: glj.quantity, marketPrice: glj.marketPrice});
+                            'code','name','specs','unit','type'
+                            GLJObjs.push({code: glj.code, name: glj.name, specs: glj.specs, unit: glj.unit, type: glj.type,
+                                quantity: glj.quantity, marketPrice: glj.marketPrice});
                         }
                         else{   // 组成物
                             if (eDetailTypes.indexOf(glj.type) >= 0){
@@ -838,7 +840,7 @@ class CalcProgram {
                                         let mdQ = (parseFloatPlus(glj.quantity) * parseFloatPlus(md.consumption)).toDecimal(decimalObj.process);
 
                                         for (let obj of GLJObjs){
-                                            if (md.code == obj.code){
+                                            if (gljOprObj.getIndex(md, gljKeyArray) == gljOprObj.getIndex(obj, gljKeyArray)){
                                                 isExist = true;
                                                 obj.quantity = (parseFloatPlus(obj.quantity) + mdQ).toDecimal(decimalObj.process);
                                                 break;