Преглед изворни кода

①当清单为大项费用和父清单时,综合单价列不允许输入值。 OK
②A标进行了调价,复制整块到B标,B标不需要A标的调价数据。OK

chenshilong пре 5 година
родитељ
комит
f520a76e74

+ 5 - 0
web/building_saas/main/js/controllers/block_controller.js

@@ -578,6 +578,9 @@ let BlockController = {
             delete tem_ration.referenceRationID;//删除关联的主定额信息
             delete tem_ration.__v;
             delete tem_ration.sourceType;
+            delete tem_ration.quantityCoe;
+            delete tem_ration.rationQuantityCoe;
+            delete tem_ration.tenderQuantity;
 
             tem_ration.projectID = projectObj.project.ID();
             tem_ration.ID = uuid.v1();
@@ -604,6 +607,8 @@ let BlockController = {
             delete  temData.quantity_details;
             delete  temData.__v;
             delete  temData.sourceType;
+            delete  temData.quantityCoe;
+            delete  temData.rationQuantityCoe;
 
             temData.projectID = projectObj.project.ID();
             let newID = uuid.v1(); //新的清单ID

+ 8 - 3
web/building_saas/main/js/views/tender_price_view.js

@@ -226,12 +226,17 @@ let tender_obj={
 
     },
     onEnterCell : function (sender,args) {
-        let me = tender_obj, row = args.row, col = args.col;
+        let me = tender_obj, row = args.row, col = args.col, lock = false;
         if ([7, 8].includes(col)){                                  // 目标单价、目标合价
             let treeNode = me.tenderTree.items[row];
-            if (calcTools.isCalcBaseBill(treeNode)){                    // 公式结点只读
+            if (calcTools.isCalcBaseBill(treeNode))                   // 公式结点只读
+                lock = true;
+
+            if ((col = 7) && calcTools.isParentBill(treeNode))
+                lock = true;
+
+            if (lock)
                 me.tenderSheet.getCell(row, col).locked(true);
-            };
         }
     },
     updateChildrenValue:function (node,dataCode,value,datas,nodes) {