组成物列表中的“名称”列应显示组成物的名称+规格型号

web/maintain/std_glj_lib/html/gongliao.html

@@ -273,6 +273,7 @@
             }
         };
         $(document).ready(function(){
+            console.log(scMathUtil.reRoundTo('268.89472', -2));
             //test
             console.log(scMathUtil.roundTo(parseFloat(25*1.277), -2));
             console.log(25*1.277);

web/maintain/std_glj_lib/js/glj.js

@@ -300,10 +300,11 @@ let repositoryGljObj = {
         for(let i = 0; i < gljComponent.length; i++){
             let obj = {};
             for(let j = 0; j < me.gljList.length; j++){
+                let specs = me.gljList[j].specs ? ' ' + me.gljList[j].specs : '';
                 if(gljComponent[i].ID == me.gljList[j].ID){
                     obj.ID = me.gljList[j].ID;
                     obj.code = me.gljList[j].code;
-                    obj.name = me.gljList[j].name;
+                    obj.name = me.gljList[j].name + specs
                     obj.unit = me.gljList[j].unit;
                     obj.basePrice = me.gljList[j].basePrice;
                     obj.consumeAmt = gljComponent[i].consumeAmt;

web/maintain/std_glj_lib/js/gljComponent.js

@@ -239,6 +239,7 @@ let gljComponentOprObj = {
         }
     },
     onCellEditEnd: function (sender, args) {
+        console.log('enterED');
         let me = gljComponentOprObj, that = repositoryGljObj, updateBasePrc = [];
         let gljList = that.gljList, updateArr = [];
         //if(args.editingText !== me.currentEditingComponent.code){
@@ -537,6 +538,8 @@ let gljComponentOprObj = {
             //gljBasePrc = scMathUtil.roundTo(scMathUtil.roundTo(roundBasePrc * parseFloat(component[i].consumeAmt), -2) + gljBasePrc, -2); 旧算法
             gljBasePrc = scMathUtil.roundTo(scMathUtil.roundTo(roundBasePrc * roundConsumeAmt, me.processDecimal) + gljBasePrc, me.processDecimal);
         }
+        console.log(`scMathUtil.roundTo(gljBasePrc, -2)`);
+        console.log(scMathUtil.roundTo(gljBasePrc, -2));
         return scMathUtil.roundTo(gljBasePrc, -2);
     }
 };