zhongzewei преди 8 години
родител
ревизия
b53a2aa210
променени са 2 файла, в които са добавени 2 реда и са изтрити 5 реда
  1. 0 4
      modules/std_glj_lib/models/gljModel.js
  2. 2 1
      web/maintain/std_glj_lib/js/gljComponent.js

+ 0 - 4
modules/std_glj_lib/models/gljModel.js

@@ -123,11 +123,9 @@ class GljDao  extends OprDao{
 
     mixUpdateGljItems (repId, lastOpr, updateItems, addItems, rIds, callback) {
         if (updateItems.length == 0 && rIds.length == 0) {
-            console.log(1);
             GljDao.addGljItems(repId, lastOpr, addItems, callback);
         }
         else if(rIds.length > 0 && updateItems.length > 0){
-            console.log(2);
             async.parallel([
                 function (cb) {
                     GljDao.removeGljItems(repId, lastOpr, rIds, cb);
@@ -145,11 +143,9 @@ class GljDao  extends OprDao{
             })
         }
         else if (rIds.length > 0 && updateItems.length === 0) {
-            console.log(3);
             GljDao.removeGljItems(repId, lastOpr, rIds, callback);
         }
         else if(updateItems.length > 0 || addItems.length > 0){
-            console.log(4);
             GljDao.updateGljItems(repId, lastOpr, updateItems, function(err, results){
                 if (err) {
                     callback(true, "Fail to update", false);

+ 2 - 1
web/maintain/std_glj_lib/js/gljComponent.js

@@ -411,7 +411,8 @@ let gljComponentOprObj = {
     reCalGljBasePrc: function (component) {
         let me = gljComponentOprObj, gljBasePrc = 0;
         for(let i = 0; i < component.length; i++){
-            gljBasePrc += me.round(component[i].basePrice * component[i].consumeAmt, 2);
+            let roundBasePrc = me.round(component[i].basePrice, 2);
+            gljBasePrc += me.round(roundBasePrc * component[i].consumeAmt, 2);
         }
         return gljBasePrc;
     }