Forráskód Böngészése

Merge branch '3.0.4_online'

vian 5 éve
szülő
commit
e4e352c25d

+ 1 - 1
public/web/sheet/sheet_common.js

@@ -409,7 +409,7 @@ var sheetCommonObj = {
     // 无法勾选的复选框
     getReadOnlyCheckBox () {
         function ReadOnlyCheckBox() {}
-        ReadOnlyCheckBox.prototype = new GC.Spread.Sheets.CellTypes.CheckBox();
+        ReadOnlyCheckBox.prototype = this.getCheckBox(true);
         ReadOnlyCheckBox.prototype.processMouseUp = function () {
             return;
         };

+ 2 - 2
web/building_saas/main/js/views/main_tree_col.js

@@ -413,14 +413,14 @@ let MainTreeCol = {
     },
     outPutMaxPrice: function (node) {
       if (node.sourceType === projectObj.project.Bills.getSourceType()) {
-        return projectObj.project.projectInfo.importedByInterface
+        return projectObj.project.projectInfo.importedByInterface  || projectObj.project.projectInfo.property.lockBills
           ? sheetCommonObj.getReadOnlyCheckBox()
           : sheetCommonObj.getCheckBox(true);
       }
     },
     outPutLimitPrice: function (node) {
       if (node.sourceType === projectObj.project.Bills.getSourceType()) {
-        return projectObj.project.projectInfo.importedByInterface
+        return projectObj.project.projectInfo.importedByInterface || projectObj.project.projectInfo.property.lockBills
           ? sheetCommonObj.getReadOnlyCheckBox()
           : sheetCommonObj.getCheckBox(true);
       }