Merge branch '1.0.0_online' of http://192.168.1.41:3000/SmartCost/ConstructionCost into 1.0.0_online

modules/users/models/log_model.js

@@ -64,7 +64,7 @@ class LogModel extends BaseModel {
         ip = ip[3] === undefined ? '' : ip[3];
 
         // let ipInfo = '127.0.0.1';//await this.getIpInfoFromApi(ip);
-        let ipInfo = await this.getIpInfoFromApi(ip);
+       // let ipInfo = await this.getIpInfoFromApi(ip);
 
         let userAgentObject = new UAParser(request.headers['user-agent']);
         let osInfo = userAgentObject.getOS();
@@ -74,7 +74,7 @@ class LogModel extends BaseModel {
             os: osInfo.name + ' ' + osInfo.version + ' ' + cpuInfo.architecture,
             browser: browserInfo.name + ' ' + browserInfo.version,
             ip: ip,
-            ip_info: ipInfo
+            ip_info:"" //ipInfo
         };
 
         return this.addLog(userId, LogType.LOGIN_LOG, message);

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

@@ -2156,7 +2156,15 @@ class CalcProgram {
                 treeNode.data.targetTotalFee = (treeNode.data.targetUnitFee * treeNode.data.quantity).toDecimal(decimalObj.decimal('totalPrice', treeNode));
                 treeNode.changed = true;
             }
-            else{
+            else{    // 既没有目标金额也没有目标单价，此时要初始化使调价合价＝原始综合合价，调价单价＝原始综合单价。（交叉调价后，旧值会留下来）
+                if (treeNode.data.feesIndex.common.tenderUnitFee != treeNode.data.feesIndex.common.unitFee) {
+                    treeNode.data.feesIndex.common.tenderUnitFee = treeNode.data.feesIndex.common.unitFee;
+                    treeNode.changed = true;
+                };
+                if (treeNode.data.feesIndex.common.tenderTotalFee != treeNode.data.feesIndex.common.totalFee) {
+                    treeNode.data.feesIndex.common.tenderTotalFee = treeNode.data.feesIndex.common.totalFee;
+                    treeNode.changed = true;
+                };
                 return;
             }
         };