bugs

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

@@ -314,8 +314,10 @@ let calcTools = {
         };
 
         if (priceType == priceTypes.ptDiffPrice){
-            result = (temp.toDecimal(decimalObj.ration.unitPrice) - temp2.toDecimal(decimalObj.ration.unitPrice)).toDecimal(decimalObj.ration.unitPrice);
-            // result = (temp - temp2).toDecimal(decimalObj.ration.unitPrice);
+            if (gljTypes == baseMaterialTypes)
+                result = (temp - temp2).toDecimal(decimalObj.ration.unitPrice)
+            else
+                result = (temp.toDecimal(decimalObj.ration.unitPrice) - temp2.toDecimal(decimalObj.ration.unitPrice)).toDecimal(decimalObj.ration.unitPrice);
         }
         else{
             result = result.toDecimal(decimalObj.ration.unitPrice);

web/building_saas/main/js/views/project_view.js

@@ -584,11 +584,13 @@ var projectObj = {
         }
     },
     onClipboardPasting: function (sender, info){
-/*        if (!node.parent){
+        let rIdx = info.sheet.getActiveRowIndex();
+        let node = projectObj.project.mainTree.items[rIdx];
+        if (!node.parent){
             info.cancel = true;
             hintBox.infoBox('系统提示','大项费用不允许粘贴！', 1);
             return false;
-        };*/
+        };
 
         let colName = projectObj.project.projSetting.main_tree_col.cols[info.cellRange.col].data.field;
         if (colName == 'code'){
@@ -695,8 +697,6 @@ var projectObj = {
                 projectObj.mainController.refreshTreeNode(nodes);
             };
 
-            let rIdx = info.sheet.getActiveRowIndex();
-            let node = projectObj.project.mainTree.items[rIdx];
             let tagType = getNodeType(node);
             if (!tagType){
                 hintBox.infoBox('系统提示', '该树结点类型不支持从项目编码列粘贴！', 1);