Merge remote-tracking branch 'origin/master'

modules/main/facade/project_facade.js

@@ -411,7 +411,7 @@ function saveProperty(data, callback){
             logger.err(pn + ' save error: ' + err);
             callback(err, null)
         } else {
-            logger.info(pn + ' saved.');
+            // logger.info(pn + ' saved.');
             callback('', null);
         }}
     );

web/building_saas/main/js/views/tender_price_view.js

@@ -257,8 +257,11 @@ let tender_obj={
     cleanTenderPrice:function (updateData,node) {//清空调整后报价
         if(node.data.fees){
             for(let i =0; i< node.data.fees.length; i++){
-                node.data.fees[i].tenderUnitFee?updateData.data["fees."+i+'.tenderUnitFee'] = 0:'';
-                node.data.fees[i].tenderTotalFee?updateData.data["fees."+i+'.tenderTotalFee'] = 0:'';
+                // 问题：清空调价后，报表显示为空。解决：清空后仍然要保留调后单价和调后金额，初始化使之与原始综合单价、综合合价相等。
+                // node.data.fees[i].tenderUnitFee?updateData.data["fees."+i+'.tenderUnitFee'] = 0:'';
+                // node.data.fees[i].tenderTotalFee?updateData.data["fees."+i+'.tenderTotalFee'] = 0:'';
+                node.data.fees[i].tenderUnitFee?updateData.data["fees."+i+'.tenderUnitFee'] = node.data.fees[i].unitFee:'';
+                node.data.fees[i].tenderTotalFee?updateData.data["fees."+i+'.tenderTotalFee'] = node.data.fees[i].totalFee:'';
             }
         }
     },