三材

modules/all_models/std_glj.js

@@ -27,6 +27,8 @@ const std_glj = new Schema({
     shortName: String,
     unit: String,
     adjCoe: Number,
+    materialType: String,
+    materialCoe: Number,
     component: [std_gljComponent]
 },{versionKey: false});
 

web/building_saas/main/js/views/side_tools.js

@@ -61,14 +61,14 @@ var sideToolsObj = {
             loadSize(sideResizeEles, 'width', function(){
                 refreshSubSpread();
                 if(id === 'stdRationTab'){//定额库
-                    autoFlashHeight();
+                    //autoFlashHeight();
                     loadSize(rationLibResizeEles, 'height', function(){
                         rationLibObj.refreshSpread();;//subSpread、jobSpread、itemSpread显示问题
                     });
                 }
                 else{//清单库
                     loadSize(billsLibResizeEles, 'height', function(){
-                        autoFlashHeight();
+                        //autoFlashHeight();
                         billsLibObj.refreshBillsSpread();
                         billsLibObj.refreshBillsRelaSpread();
                     });
@@ -81,6 +81,7 @@ var sideToolsObj = {
             tabPanel.hide();
             refreshSubSpread();
         }
+        autoFlashHeight();
     }
 };
 

web/building_saas/pm/js/pm_newMain.js

@@ -1095,6 +1095,7 @@ $(document).ready(function() {
             alert('请选择需要重命名的数据');
             return false;
         }
+        $('#rename-name').val(projTreeObj.tree.selected.data.name ? projTreeObj.tree.selected.data.name : '');
         $('#rename-dialog').modal('show');
     });