瀏覽代碼

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

chenshilong 4 年之前
父節點
當前提交
7f2d29f147
共有 2 個文件被更改,包括 9 次插入1 次删除
  1. 1 1
      web/building_saas/main/js/views/main_tree_col.js
  2. 8 0
      web/building_saas/pm/js/pm_newMain.js

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

@@ -249,7 +249,7 @@ let MainTreeCol = {
                 if (calcTools.isTitleBills(node)) {
                     return true;
                 }
-                if(node.data.type==billType.DXFY||(node.data.type==billType.BILL&&MainTreeCol.readOnly.billsParent(node))){//大项费用、分部、清单父项行,工程量只读。
+                if(node.data.type==billType.DXFY||node.data.type==billType.FB||(node.data.type==billType.BILL&&MainTreeCol.readOnly.billsParent(node))){//大项费用、分部、清单父项行,工程量只读。
                     return true;
                 }
             }else if(MainTreeCol.readOnly.glj(node) || OVER_HEIGHT.isOverHeight(node)){

+ 8 - 0
web/building_saas/pm/js/pm_newMain.js

@@ -2178,6 +2178,10 @@ $(document).ready(function() {
             //清空单项工程下拉和文件下拉
             setEngOptions(null);
             setFileOptions(null);
+            let engineeringList = getEngineeringList();
+            let engineeringHtml = getEngineeringHtml(engineeringList);
+            $("#tender-engineering").html(engineeringHtml);
+            initFeeStandardSel();
         }
         else {
             //触发选项
@@ -3720,6 +3724,10 @@ function setProjOptions(projs, selected){
                     curValuationName = projs[i].data.property.valuationName;
                 }
                 getStdCalcProgramFiles();
+                let engineeringList = getEngineeringList();
+                let engineeringHtml = getEngineeringHtml(engineeringList);
+                $("#tender-engineering").html(engineeringHtml);
+                initFeeStandardSel();
                 $('#newProjectSet').hide();//隐藏文件类型、计税方法选项
                 $("#poj-name").val(projs[i].data.name);
                 setFileOptions(projs[i].data.ID);