瀏覽代碼

delete console message

zhangweicheng 8 年之前
父節點
當前提交
caa5e4fa89

+ 1 - 1
modules/ration_glj/facade/glj_calculate_facade.js

@@ -51,7 +51,7 @@ async function calculateQuantity(query,isMarkPriceAjust){
              let r = await calculateQuantityPerGLJ(gljList[i],impactRation,coeList,assList,adjustState,isMarkPriceAjust);
              result.glj_result.push(r);
          }
-         console.log(result.glj_result);
+
         if(isMarkPriceAjust==null){
             await ration_glj.bulkWrite(generateUpdateTasks(result.glj_result));
         }

+ 0 - 1
modules/ration_glj/facade/ration_ass_facade.js

@@ -30,7 +30,6 @@ function update_ration_ass(user_id,datas) {
     return function (callback) {
         let editAss = datas.query.editAss;
         doRationAssAdjust(datas.query.ration,datas.doc).then(function (result) {
-            console.log(result);
             if(result.err){
                 callback(result.err,'')
             }else {

+ 0 - 2
modules/ration_glj/facade/ration_coe_facade.js

@@ -172,7 +172,6 @@ async function doAdjustUpdate (datas){
         await ration_coe.update(datas.query,datas.doc);
         let cal_result = await glj_calculate_facade.calculateQuantity({projectID:datas.query.projectID,rationID:datas.query.rationID});
         result.cal_result =cal_result;
-        console.log(result);
         return result;
     }catch (err){
         result.err = err;
@@ -200,7 +199,6 @@ async function doCustomerCoeUpdateTasks(datas) {
         };
         let cal_result = await glj_calculate_facade.calculateQuantity({projectID:datas.query.projectID,rationID:datas.query.rationID});
         result.cal_result =cal_result;
-        console.log(result);
         return result;
     }catch (err){
         result.err = err;

+ 0 - 1
modules/ration_glj/facade/ration_glj_facade.js

@@ -286,7 +286,6 @@ async function updateprojectGljAndRationGLJ(query,doc) {
             doc.market_price = doc.base_price;
         }
         delete doc.base_price;
-
         let result = await gljListModel.modifyMarketPrice(doc);
         let updateDoc ={
             marketPrice:result.unit_price.market_price,

+ 4 - 3
web/building_saas/main/js/models/ration_ass.js

@@ -40,7 +40,6 @@ var ration_ass = {
 
         };
         ration_ass.prototype.refreshAfterUpdate=function(data){
-            console.log(data)
             this.updateRation(data.rationID,data.doc);
             //this.updateRationGLJ(data.ration_glj_list);
             gljOprObj.assSheetData[data.editIndex].actualValue = data.actualValue;
@@ -104,8 +103,10 @@ var ration_ass = {
         ration_ass.prototype.updateActualValue=function(assList,index,newVal){
             var selected = projectObj.project.mainTree.selected;
             assList[index].actualValue=newVal;
-            var rationname = selected.data.caption.replace('%s',newVal)
-
+            var rationname = selected.data.name;
+            if(selected.data.hasOwnProperty('caption')){
+                 rationname = selected.data.caption.replace('%s',newVal);
+            }
             var query = {
                 'ration':selected.data,
                 'editAss':assList[index],