zhangweicheng 6 роки тому
батько
коміт
d13d0f9e00

+ 2 - 2
server.js

@@ -44,9 +44,9 @@ app.use(session({
     cookie: {maxAge: 3600 * 24 * 1000},
     resave: false,
     rolling: true,
-    saveUninitialized: true
+    saveUninitialized: true,
     //*
-    ,store: new DBStore({
+    store: new DBStore({
         url: config.getSessionURL(process.env.NODE_ENV)
     })
     //*/

+ 5 - 4
web/building_saas/main/js/controllers/material_controller.js

@@ -164,7 +164,7 @@ let MaterialController = {
     showReplaceDiv:function (node) {
         $("#subSpread").addClass("ration_glj_spread");
         $("#replaceM").show();
-        this.showReplaceSpread(node);
+        if(node) this.showReplaceSpread(node);//如果不是只刷新页面
         refreshSubSpread();
     },
     hideReplaceDiv:function(){
@@ -192,8 +192,9 @@ let MaterialController = {
     },
     showData:function(node){
         this.datas = [];
-        let parent = node.parent;
-        if(parent){
+        let selected = node?node:projectObj.project.mainTree.selected;
+        let parent = selected.parent;
+        if(selected&&parent){
             this.getItems(parent.data.itemCharacterText);
         }
         sheetCommonObj.showData(this.sheet, this.setting,this.datas);
@@ -228,7 +229,7 @@ let MaterialController = {
             for(let key in tem){//检查属性是否做了改变,如果没有改变不用提交替换
                 if(ration_glj[key] != tem[key]) doc[key] = tem[key]
             }
-            if(!_.isEmpty(doc)) this.postReplace([{glj:ration_glj,doc:doc}])
+            if(!_.isEmpty(doc)) this.postReplace([{glj:ration_glj,doc:doc}]);
         }
     }
 };

+ 0 - 1
web/building_saas/main/js/models/main_consts.js

@@ -367,4 +367,3 @@ const materialComboMap = [
     {text:materialType[materialTypeMap.SN],value:materialTypeMap.SN},
     {text:materialType[materialTypeMap.SZ],value:materialTypeMap.SZ}
 ];
-

+ 2 - 1
web/building_saas/main/js/views/sub_view.js

@@ -471,7 +471,8 @@ function refreshSubSpread(){
         characterOprObj.workBook.refresh();
     }
     else{
-        subSpread?subSpread.refresh():'';
+        if(subSpread) subSpread.refresh();
+        if(MaterialController.spread) MaterialController.spread.refresh();
     }
 }