Merge branch '3.0.4_online'

web/building_saas/main/js/views/importBills.js

@@ -334,7 +334,7 @@ const importBills = (function(){
             const unit = rData[colMapping.unit] ? _deESC(rData[colMapping.unit]['value']) : '';
             if (curFileType === uploadType.general) {
                 // 通用表：项目编码非12位或者无单位的
-                return _isDef(code) && !/\w{12}/.test(code) || !_isDef(unit);
+                return !_isDef(code) || !/\w{12}/.test(code) || !_isDef(unit);
             } else {
                 // 09、广联达表：1.无序号 2有编码
                 const serialNo = rData[colMapping.serialNo] ? _deESC(rData[colMapping.serialNo]['value']) : '';

web/building_saas/main/js/views/main_tree_col.js

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