Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

modules/all_models/ration.js

@@ -75,6 +75,7 @@ let rationSchema = new Schema({
     referenceRationID:String,//如果是通过模板关联子目生成的定额，这里记录对应的主定额ID
     // 工作内容 （选择自清单）
     jobContentText: String,
+    manageFeeRate:String,//管理费率
 
     //工料机特有属性
     projectGLJID:Number,  //项目工料机ID

modules/all_models/stdRation_ration.js

@@ -46,6 +46,7 @@ const rationItemSchema = new Schema({
     feeType: Number,
     jobContent: String,
     annotation: String,
+    manageFeeRate:String,//管理费费率
     rationGljList: [rationGljItemSchema],
     rationCoeList: Array,
     rationAssList: [rationAssItemSchema],

modules/main/facade/ration_facade.js

@@ -155,6 +155,7 @@ async function insertNewRation(newData,defaultLibID,std,calQuantity) {//插入
         }else {
             newData.programID = std.feeType;
         }
+        newData.manageFeeRate = std.manageFeeRate;
         newData.rationAssList =  createRationAss(std);
         // calculate ration Quantity
     }
@@ -544,6 +545,7 @@ async function  updateRation(std,defaultLibID,rationID,billsItemID,projectID,cal
         ration.stdID = std.ID;
     }
     ration.content = std.jobContent;
+    ration.manageFeeRate = std.manageFeeRate;
     ration.adjustState = '';
     ration.isFromDetail=0;
     ration.isSubcontract=false;

public/web/sheet/sheet_common.js

@@ -1468,5 +1468,11 @@ var sheetCommonObj = {
                 break;
         }
         return result;
+    },
+    // 延迟一段时间刷新表格，因为有的弹窗里面有表格，马上刷新可能会造成，弹窗界面还未完全显示完就完成了表格刷新，导致表格显示不完整
+    refreshWorkbookDelDefer(workbook, time) {
+        if (workbook) {
+            setTimeout(() => workbook.refresh(), time);
+        }
     }
 }

web/building_saas/main/html/main.html

@@ -871,7 +871,9 @@
                                 <li class="nav-item ml-3"><a class="nav-link" data-toggle="pill" href="#compilationIllustrationP" role="tab" id="tab_compilation_illustration_p">编制说明</a></li>
                                 <li class="nav-item"><a class="nav-link disabled">单位工程信息</a></li>
                                 <li class="nav-item ml-3"><a class="nav-link" data-toggle="pill" href="#poj-settings-projFeature" id="tab_poj-settings-projFeature" role="tab">工程特征</a></li>
-                                <li class="nav-item ml-3"><a class="nav-link" data-toggle="pill" href="#poj-settings-indicativeInfo" id="tab_poj-settings-indicativeInfo" role="tab">指标信息</a></li>
+                                <% if (compilationName === '重庆定额(2018)') { %>
+                                    <li class="nav-item ml-3"><a class="nav-link" data-toggle="pill" href="#poj-settings-indicativeInfo" id="tab_poj-settings-indicativeInfo" role="tab">指标信息</a></li>
+                                <% } %>
                                 <li class="nav-item ml-3"><a class="nav-link" data-toggle="pill" href="#poj-settings-4" id="about-calc" role="tab">关于计算</a></li>
                                 <li class="nav-item ml-3"><a class="nav-link" data-toggle="pill" href="#poj-settings-billsQuanDecimal" id="tab_poj-settings-bqDecimal" role="tab">清单工程量精度</a></li>
                                 <li class="nav-item ml-3"><a class="nav-link" data-toggle="pill" href="#poj-settings-decimal" role="tab" id="tab_poj-settings-decimal">小数位数</a></li>

web/building_saas/main/js/views/calc_base_view.js

@@ -370,14 +370,10 @@ $(document).ready(function () {
         if(toggle === 'calcBase'){
             $('#tabCalcBase').tab('show');
         }
-        if(calcBaseView.workBook){
-            calcBaseView.workBook.refresh();
-        }
+        sheetCommonObj.refreshWorkbookDelDefer(calcBaseView.workBook, 100);
     });
     $('#tabCalcBase').on('shown.bs.tab', function () {
-        if(calcBaseView.workBook){
-            calcBaseView.workBook.refresh();
-        }
+        sheetCommonObj.refreshWorkbookDelDefer(calcBaseView.workBook, 100);
     });
 
     /*$('#qd-jsjs').on('hidden.bs.modal', function () {

web/building_saas/main/js/views/fee_rate_view.js

@@ -145,6 +145,7 @@ var feeRateObject={
         let visibleMap = {};
         sheet.suspendPaint();
         sheet.suspendEvent();
+        sheet.setRowCount(data.length);
         for (let col = 0; col < setting.header.length; col++) {
             let hAlign = "left", vAlign = "center";
             if (setting.header[col].hAlign) {

web/building_saas/main/js/views/index_view.js

@@ -110,7 +110,7 @@ let indexObj= {
         if(projectReadOnly){
             disableSpread(this.spread);
         }
-        this.spread.refresh();
+        sheetCommonObj.refreshWorkbookDelDefer(this.spread, 100);
     },
     initEngineerInfoSheet:function () {
         let sheet = this.spread.getSheet(0);

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

@@ -760,7 +760,5 @@ $('#poj-set').on('hidden.bs.modal', function (e) {
 });
 
 $('#tab_display_setting').on('shown.bs.tab', function () {
-    if(colSettingObj.settingSpread){
-        colSettingObj.settingSpread.refresh();
-    }
+    sheetCommonObj.refreshWorkbookDelDefer(colSettingObj.settingSpread, 100);
 });

web/building_saas/main/js/views/project_property_basicInfo.js

@@ -517,7 +517,7 @@ $(document).ready(function () {
     });
 
     $('#tab_poj-settings-basicInfo').on('shown.bs.tab', function () {
-        basicInfoView.workBook.refresh();
+        sheetCommonObj.refreshWorkbookDelDefer(basicInfoView.workBook, 100);
     });
     $('#openProjSet').click(function () {
         $('[data-toggle="tooltip"]').tooltip('hide');

web/building_saas/main/js/views/project_property_bills_quantity_decimal.js

@@ -367,7 +367,7 @@ $(document).ready(function () {
     });
 
     $('#tab_poj-settings-bqDecimal').on('shown.bs.tab', function () {
-        billsDecimalView.workBook.refresh();
+        sheetCommonObj.refreshWorkbookDelDefer(billsDecimalView.workBook, 100);
     });
 
  /*   $('#property_ok').bind('click', function () {

web/building_saas/main/js/views/project_property_projFeature.js

@@ -476,6 +476,6 @@ $(document).ready(function () {
     });
 
     $('#tab_poj-settings-projFeature').on('shown.bs.tab', function () {
-        projFeatureView.workBook.refresh();
+        sheetCommonObj.refreshWorkbookDelDefer(projFeatureView.workBook, 100);
     });
 });