debug

1.同步1.0.5debug
2.补充定额单位问题
3.人材机选择界面增加新增人材机按钮
4.复制到界面默认收起至建设项目
5.项目管理界面的批量替换单价文件和批量替换费率文件的弹窗页面“更换为”底下取消显示“分段文件名称”功能。

public/web/ration_glj_units.js

@@ -31,14 +31,14 @@ const rationAndGljUnits =[
     '部',
     '10t',
     '10m',
-    '10 m2',
-    '10 m3',
+    '10m2',
+    '10m3',
     '100m',
-    '100 m2',
-    '100 m3',
+    '100m2',
+    '100m3',
     '1000m',
-    '1000 m2',
-    '1000 m3',
+    '1000m2',
+    '1000m3',
     '10000块',
     '立方米',
     '平方米',

public/web/sheet/sheet_common.js

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

web/building_saas/main/html/main.html

@@ -1094,7 +1094,8 @@
                             </div>
                         </div>
                 </div>
-                <div class="modal-footer">
+                <div class="modal-footer" style="position: relative;">
+                    <a href="/complementaryGlj" target="_blank" class="btn btn-primary" style="position: absolute; left: 20px">新增人材机</a>
                     <a href="javascript:void(0);" id="glj_selected_conf" class="btn btn-primary">确定</a>
                     <a href="javascript:void(0);" id="replace_next_btn" class="btn btn-primary">下一步</a>
                     <button type="button" id="componentsCacnel" class="btn btn-secondary" data-dismiss="modal">取消</button>

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

@@ -366,14 +366,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/main_tree_col.js

@@ -676,7 +676,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_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

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

web/building_saas/pm/html/project-management.html

@@ -541,7 +541,6 @@
                             </div>
                         </div>
                         <!--从本建设项目中选择-->
-                        <label id="project_name">9.21<!--本建设项目名称--></label>
                         <div class="form-group" id = "fromProject">
                             <select class="form-control" id="currentOptions">
                                 <option>测试5单价文件</option><!--单价文件-->

web/building_saas/pm/js/pm_newMain.js

@@ -643,7 +643,6 @@ const projTreeObj = {
         if(args.sheet.name() == "projectSheet"){
             await projTreeObj.initFileChangePage(projTreeObj.setting.header[args.col].dataCode);
             $("#mr_from").val(projTreeObj.setting.header[args.col].dataCode);
-            $("#project_name").text(projTreeObj.tree.selected.data.name);
             $('#m_replace_file').modal('show');
         }else if(args.sheet.name() == "replaceSheet"){
             let cellType = args.sheet.getCellType(args.row, args.col);
@@ -1295,6 +1294,7 @@ const projTreeObj = {
             datas.push(i.data);
         }
         me.copyTree  = pmTree.createNew(projTreeObj.setting, datas);
+        initNodesVisibility(me.copyTree.items, false);
         me.showTreeData(me.copyTree.items, me.copyToSetting, sheet);
         me.copySelected = null;
         let initSel = sheet.getSelections()[0] ? sheet.getSelections()[0] : {row: 0, rowCount: 1};
@@ -2163,7 +2163,7 @@ function prepareInitialTimer() {
 }
 
 // 初始化节点可见性，默认收起至建设项目层
-function initNodesVisibility(sheet, nodes, visible) {
+function initNodesVisibility(nodes, visible) {
     function recurSetVisible(nodes, visible) {
         nodes.forEach(node => {
             node.visible = visible;
@@ -2199,7 +2199,7 @@ function initProjects(callback) {
             sheet.name('projectSheet');
             sheetCommonObj.spreadDefaultStyle(projTreeObj.workBook);
             projTreeObj.sumEngineeringCost();
-            initNodesVisibility(sheet, projTreeObj.tree.items, false);
+            initNodesVisibility(projTreeObj.tree.items, false);
             projTreeObj.showTreeData(projTreeObj.tree.items, projTreeObj.setting, sheet);
             //初始选择
             const initSel = sheet.getSelections()[0] ? sheet.getSelections()[0] : {row: 0, rowCount: 1};