Explorar o código

更新团队前台

jinfei %!s(int64=5) %!d(string=hai) anos
pai
achega
a423c811b0

+ 19 - 4
o2web/source/x_component_TeamWork/$ProjectList/default/css.wcss

@@ -388,7 +388,7 @@
         "width":"24px",
         "height":"24px",
         "float":"right",
-        "margin-right":"10px",
+        "margin-right":"5px",
         "background":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_wdxx_2.png) no-repeat center "
     },
     projectBlockItemIconFavTrue:{
@@ -396,15 +396,23 @@
         "width":"24px",
         "height":"24px",
         "float":"right",
-        "margin-right":"10px",
+        "margin-right":"5px",
         "background":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_wdxx_click.png) no-repeat center "
     },
+    projectBlockItemIconGroup:{
+        "cursor":"pointer",
+        "width":"24px",
+        "height":"24px",
+        "float":"right",
+        "margin-right":"5px",
+        "background":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_group.png) no-repeat center "
+    },
     projectBlockItemIconSetting:{
         "cursor":"pointer",
         "width":"24px",
         "height":"24px",
         "float":"right",
-        "margin-right":"10px",
+        "margin-right":"5px",
         "display":"",
         "background":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_shezhi.png) no-repeat center "
     },
@@ -413,7 +421,7 @@
         "width":"24px",
         "height":"24px",
         "float":"right",
-        "margin-right":"10px",
+        "margin-right":"5px",
         "display":"",
         "background":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_delete_white.png) no-repeat center "
     },
@@ -531,6 +539,13 @@
         "display":"",
         background: "url(/x_component_TeamWork/$ProjectList/default/icon/icon_shezhi_grey.png) no-repeat center "
     },
+    projectListItemGroupIcon:{
+        "float":"right",
+        "width":"16px",
+        "height":"16px",
+        "margin":"30px 5px",
+        background: "url(/x_component_TeamWork/$ProjectList/default/icon/icon_group_grey.png) no-repeat center "
+    },
     projectListItemFavIcon:{
         "float":"right",
         "width":"16px",

BIN=BIN
o2web/source/x_component_TeamWork/$ProjectList/default/icon/icon_group.png


BIN=BIN
o2web/source/x_component_TeamWork/$ProjectList/default/icon/icon_group_grey.png


+ 74 - 10
o2web/source/x_component_TeamWork/$ProjectSetting/default/css.wcss

@@ -22,12 +22,12 @@
         "height":"16px",
         "background":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_off.png) no-repeat center "
     },
-    projectSettingContent:{
+    "projectSettingContent":{
         "position":"absolute",
         "top":"40px",
         "bottom":"0px"
     },
-    projectSettingNaviLayout:{
+    "projectSettingNaviLayout":{
         "float":"left",
         "width":"200px",
         "height":"100%",
@@ -238,9 +238,73 @@
         "line-height":"30px"
      },
      "authContainer":{
-        "width":"100%",
+        "margin-left":"20px",
+        "margin-top":"20px",
         "height":"60px",
-        "border-bottom":"1px solid #cccccc"
+        "border-bottom":"1px dotted #cccccc"
+     },
+     "authItemContainer":{
+        "cursor":"pointer",
+        "float":"left",
+        "margin-right":"10px",
+        "height":"20px",
+        "display":"flex",
+        "justify-content":"center",
+        "align-items":"center"
+     },
+     "authItemIcon":{
+        "float":"left",
+        "width":"16px",
+        "height":"16px",
+        "background":"url(/x_component_TeamWork/$ProjectSetting/default/icon/icon_unselected.png) no-repeat center "
+     },
+     "authItemTitle":{
+        "float":"left",
+        "margin-left":"6px",
+        "height":"20px",
+        "line-height":"20px"
+     },
+     "detailTopContainer":{
+        "height":"50px",
+        "line-height":"50px",
+        "margin-left":"50px",
+        "color":"#666666",
+        "font-size":"15px",
+        "margin-top":"20px"
+     },
+     "detailStatTitle":{
+        "margin-left":"50px",
+        "height":"30px",
+        "line-height":"30px"
+     },
+     "detailStatContainer":{
+         "padding-left":"50px"
+      },
+     "detailStatTotal":{
+        "margin-top":"5px",
+        "height":"120px",
+        "width":"100px",
+        "float":"left",
+        "margin-right":"20px"
+     },
+     "detailStatTotalTitle":{
+        "height":"30px",
+        "line-height":"30px",
+        "color":"#8c8c8c",
+        "font-size":"12px"
+     },
+     "detailStatTotalCount":{
+        "margin-top":"10px",
+        "margin-bottom":"5px",
+        "font-size":"28px",
+        "color":"#000000"
+     },
+     "detailStatTotalBar":{
+        "transition":"width 0.6s ease",
+        "background-color":"#ff8478",
+        "width":"40px",
+        "height":"3px",
+        "border-radius":"3px"
      },
      "moreActionTitle":{
         "margin-top":"20px",
@@ -248,20 +312,20 @@
         "color":"",
         "height":"30px",
         "line-height":"30px",
-        "padding-left":"20px"
+        "padding-left":"50px"
      },
      "moreActionDescription":{
         "font-size":"12px",
         "color":"",
         "height":"20px",
         "line-height":"20px",
-        "padding-left":"20px"
+        "padding-left":"50px"
      },
      "moreActionContainer":{
-        "padding-left":"20px",
+        "padding-left":"50px",
         "margin-top":"20px"
      },
-     "moreActionComplate":{
+     "moreActionComplete":{
         "float":"left",
         "color":"#e62412",
         "height":"30px",
@@ -270,10 +334,10 @@
         "text-align":"center",
         "border-radius":"2px",
         "border":"1px solid #ffcccc",
-        "margin-right":"10px",
+        "margin-right":"20px",
         "cursor":"pointer"
      },
-     "moreActionUnComplate":{
+     "moreActionUnComplete":{
          "float":"left",
          "color":"#e62412",
          "height":"30px",

+ 3 - 1
o2web/source/x_component_TeamWork/$Task/default/css.wcss

@@ -357,7 +357,9 @@
         "line-height":"50px"
     },
     taskPriorityValueText:{
-        "width":"50px",
+        //"min-width":"50px",
+        "padding-left":"10px",
+        "padding-right":"10px",
         "height":"25px",
         "line-height":"25px",
         "text-align":"center",

+ 1 - 1
o2web/source/x_component_TeamWork/GroupSelect.js

@@ -14,7 +14,7 @@ MWF.xApplication.TeamWork.GroupSelect = new Class({
 
         if(callback)callback();
     },
-    createFirstPage:function(data){ //alert(JSON.stringify(this.data))
+    createFirstPage:function(data){
         var _self = this;
         if(this.contentNode)this.contentNode.empty();
         this.topBar = new Element("div.topBar",{styles:this.css.topBar}).inject(this.contentNode);

+ 122 - 39
o2web/source/x_component_TeamWork/ProjectList.js

@@ -245,37 +245,37 @@ MWF.xApplication.TeamWork.ProjectList = new Class({
                         }.bind(this)
                     });
                 }
-
-                //已归档
-                if(resData.hasOwnProperty("archiveCount")){
-                    this.historyItem = new Element("div.historyItem",{styles:this.css.naviItem}).inject(this.naviContent);
-                    this.historyItemImg = new Element("div.historyItemImg",{styles:this.css.historyItemImg}).inject(this.historyItem);
-                    this.historyItemText = new Element("div.historyItemText",{styles:this.css.historyItemText,text:this.lp.navi.historyItem}).inject(this.historyItem);
-                    this.historyItemCount = new Element("div.historyItemCount",{styles:this.css.historyItemCount,text:resData.archiveCount}).inject(this.historyItem);
-                    // this.historyItemIcon = new Element("div.historyItemIcon",{styles:this.css.historyItemIcon}).inject(this.historyItem);
-                    this.historyItem.addEvents({
-                        mouseover:function(){
-                            this.historyItem.setStyles({
-                                "background-color":"#F2F5F7"
-                            });
-                            this.historyItemImg.setStyles({
-                                "background-image":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_lsck_xm_click.png)"
-                            });
-                            this.historyItemText.setStyles({
-                                "color":"#4A90E2"
-                            });
-                        }.bind(this),
-                        mouseout:function(){
-                            this.historyItem.setStyles(this.css.naviItem);
-                            this.historyItemImg.setStyles(this.css.historyItemImg);
-                            this.historyItemText.setStyles(this.css.historyItemText);
-                        }.bind(this),
-                        click:function(){
-                            this.openItem({type:"archive"});
-                            this.currentNavi = "archive"
-                        }.bind(this)
-                    });
-                }
+                //
+                // //已归档
+                // if(resData.hasOwnProperty("archiveCount")){
+                //     this.historyItem = new Element("div.historyItem",{styles:this.css.naviItem}).inject(this.naviContent);
+                //     this.historyItemImg = new Element("div.historyItemImg",{styles:this.css.historyItemImg}).inject(this.historyItem);
+                //     this.historyItemText = new Element("div.historyItemText",{styles:this.css.historyItemText,text:this.lp.navi.historyItem}).inject(this.historyItem);
+                //     this.historyItemCount = new Element("div.historyItemCount",{styles:this.css.historyItemCount,text:resData.archiveCount}).inject(this.historyItem);
+                //     // this.historyItemIcon = new Element("div.historyItemIcon",{styles:this.css.historyItemIcon}).inject(this.historyItem);
+                //     this.historyItem.addEvents({
+                //         mouseover:function(){
+                //             this.historyItem.setStyles({
+                //                 "background-color":"#F2F5F7"
+                //             });
+                //             this.historyItemImg.setStyles({
+                //                 "background-image":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_lsck_xm_click.png)"
+                //             });
+                //             this.historyItemText.setStyles({
+                //                 "color":"#4A90E2"
+                //             });
+                //         }.bind(this),
+                //         mouseout:function(){
+                //             this.historyItem.setStyles(this.css.naviItem);
+                //             this.historyItemImg.setStyles(this.css.historyItemImg);
+                //             this.historyItemText.setStyles(this.css.historyItemText);
+                //         }.bind(this),
+                //         click:function(){
+                //             this.openItem({type:"archive"});
+                //             this.currentNavi = "archive"
+                //         }.bind(this)
+                //     });
+                // }
 
                 //回收站
                 if(resData.hasOwnProperty("deleteCount")){
@@ -725,25 +725,32 @@ MWF.xApplication.TeamWork.ProjectList = new Class({
             var projectItemData = json.data;
 
             if(options && options.type && options.type=="all"){
-                this.menuTitle.set("text","全部项目");
+                this.menuTitle.set("text",this.lp.navi.allItem);
             }else if(options && options.type && options.type=="star"){
-                this.menuTitle.set("text","我的星标")
+                this.menuTitle.set("text",this.lp.navi.starItem);
             }else if(options && options.type && options.type=="my"){
-                typeAction = "projectMyListNext"
+                this.menuTitle.set("text",this.lp.navi.myItem);
+                //typeAction = "projectMyListNext"
             }else if(options && options.type && options.type=="complete"){
-                typeAction = "projectCompleteListNext"
+                this.menuTitle.set("text",this.lp.navi.completeItem);
+                //typeAction = "projectCompleteListNext"
             }else if(options && options.type && options.type=="archive"){
-                typeAction = "projectArchiveListNext"
+                //typeAction = "projectArchiveListNext";
             }else if(options && options.type && options.type=="remove"){
-                typeAction = "projectRemoveListNext"
+                this.menuTitle.set("text",this.lp.navi.removeItem);
+                //typeAction = "projectRemoveListNext"
             }else if(options && options.type && options.type=="unGroup"){
-                typeAction = "projectUnGroupListNext"
+                this.menuTitle.set("text",this.lp.navi.unGroupItem);
+                //typeAction = "projectUnGroupListNext"
             }
 
             if(options && options.group){
                 groupId = options.group;
                 //typeAction = "projectListNext";
                 filter = {group:groupId};
+                this.rootActions.ProjectGroupAction.get(groupId,function(json){
+                    this.menuTitle.set("text",json.data.name||"");
+                }.bind(this))
             }
 
             this.menuCount.set("text","("+json.count+")");
@@ -886,6 +893,41 @@ MWF.xApplication.TeamWork.ProjectList = new Class({
                 "background-image":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_wdxx_click.png)"
             });
         }
+
+        var projectBlockItemIconGroup = new Element("div.projectBlockItemIconGroup",{styles:this.css.projectBlockItemIconGroup}).inject(projectBlockItemIconContainer);
+        projectBlockItemIconGroup.addEvents({
+            click:function(e){
+                this.getProject(d.id,function(json){
+                    var data = {groups:json.groups};
+                    MWF.xDesktop.requireApp("TeamWork", "GroupSelect", function(){
+                        var gs = new MWF.xApplication.TeamWork.GroupSelect(this.container, projectBlockItemIconGroup, this.app, data, {
+                            axis : "y",
+                            nodeStyles : {
+                                "min-width":"190px",
+                                "z-index" : "102"
+                            },
+                            onClose:function(rs){
+                                if(rs){
+                                    var ddata ={
+                                        id:d.id,
+                                        groups:rs
+                                    };
+
+                                    this.rootActions.ProjectAction.save(ddata,function(json){
+                                        debugger;
+                                    }.bind(this))
+                                }
+                            }.bind(this)
+                        });
+                        gs.load();
+                    }.bind(this));
+                }.bind(this));
+
+                e.stopPropagation();
+            }.bind(this)
+        });
+
+
         if(d.control.founder){
             var projectBlockItemIconSetting = new Element("div.projectBlockItemIconSetting",{styles:this.css.projectBlockItemIconSetting}).inject(projectBlockItemIconContainer);
             projectBlockItemIconSetting.addEvents({
@@ -903,6 +945,7 @@ MWF.xApplication.TeamWork.ProjectList = new Class({
                                     //     _self.loadSingleBlockItem(container,json.data)
                                     // });
                                     //_self.reload();
+                                    if(json)_self.openItem({type:_self.currentNavi});
 
                                 }
                             },{
@@ -980,7 +1023,6 @@ MWF.xApplication.TeamWork.ProjectList = new Class({
                         "background-image":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_wdxx_click.png)"
                     })
                 }
-
                 e.stopPropagation();
             }
         });
@@ -990,6 +1032,41 @@ MWF.xApplication.TeamWork.ProjectList = new Class({
                 "background-image":"url(/x_component_TeamWork/$ProjectList/default/icon/icon_wdxx_click.png)"
             });
         }
+
+        var projectListItemGroupIcon = new Element("div.projectListItemGroupIcon",{styles:this.css.projectListItemGroupIcon}).inject(projectListItemIconContainer);
+        projectListItemGroupIcon.addEvents({
+            click:function(e){
+                this.getProject(d.id,function(json){
+                    var data = {groups:json.groups};
+                    MWF.xDesktop.requireApp("TeamWork", "GroupSelect", function(){
+                        var gs = new MWF.xApplication.TeamWork.GroupSelect(this.container, projectListItemGroupIcon, this.app, data, {
+                            axis : "y",
+                            nodeStyles : {
+                                "min-width":"190px",
+                                "z-index" : "102"
+                            },
+                            onClose:function(rs){
+                                if(rs){
+                                    var ddata ={
+                                        id:d.id,
+                                        groups:rs
+                                    };
+
+                                    this.rootActions.ProjectAction.save(ddata,function(json){
+                                        //debugger;
+                                    }.bind(this))
+                                }
+                            }.bind(this)
+                        });
+                        gs.load();
+                    }.bind(this));
+                }.bind(this));
+
+                e.stopPropagation();
+            }.bind(this)
+        });
+
+
         if(d.control.founder){
             var projectListItemSettingIcon = new Element("div.projectListItemSettingIcon",{styles:this.css.projectListItemSettingIcon}).inject(projectListItemIconContainer);
             projectListItemSettingIcon.addEvents({
@@ -1066,6 +1143,12 @@ MWF.xApplication.TeamWork.ProjectList = new Class({
             p.load();
         }.bind(this));
     },
+    getProject:function(id,callback){
+        this.rootActions.ProjectAction.get(id,function(json){
+            var data = json.data;
+            if(callback) callback(data);
+        }.bind(this))
+    },
     test:function(){
 
     }

+ 131 - 11
o2web/source/x_component_TeamWork/ProjectSetting.js

@@ -94,7 +94,7 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
             click:function(){
                 _self.curNavi = "detail";
                 _self.changeNavi(this);
-                _self.loadGeneral();
+                _self.loadDetail();
             }
         });
 
@@ -513,14 +513,138 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
         // });
         //this.projectSettingAction = new Element("div.projectSettingAction",{styles:this.css.projectSettingAction,text:this.lp.confirm}).inject(this.formTableArea);
 
+    },
+    loadDetail:function(){
+        var _self = this;
+        this.projectSettingLayout.empty();
+        //var authTaskTitle = new Element("div.authTaskTitle",{styles:this.css.authTitle,text:this.lp.auth.task}).inject(this.projectSettingLayout);
+        var tips = this.projectData.creatorPerson.split("@")[0] + " " + this.lp.projectDetails.at+this.projectData.createTime +this.lp.projectDetails.create;
+        var detailTopContainer = new Element("div.detailTopContainer",{ styles: this.css.detailTopContainer, text:tips }).inject(this.projectSettingLayout);
+        var detailStatTitle = new Element("div.detailStatTitle",{styles:this.css.detailStatTitle, text:this.lp.projectDetails.taskStat}).inject(this.projectSettingLayout);
+        var detailStatContainer = new Element("div.detailStatContainer",{styles:this.css.detailStatContainer}).inject(this.projectSettingLayout);
+
+        var detailStatTotal = new Element("div.detailStatTotal",{styles:this.css.detailStatTotal}).inject(detailStatContainer);
+        new Element("div.detailStatTotalTitle",{styles:this.css.detailStatTotalTitle,text:this.lp.projectDetails.total}).inject(detailStatTotal);
+        new Element("div.detailStatTotalCount",{styles:this.css.detailStatTotalCount,text:this.projectData.taskTotal}).inject(detailStatTotal);
+        var tbar = new Element("div.detailStatTotalBar",{styles:this.css.detailStatTotalBar}).inject(detailStatTotal);
+        tbar.setStyles({"background-color":"#95b9e4"});
+
+        var detailStatProcess = new Element("div.detailStatTotal",{styles:this.css.detailStatTotal}).inject(detailStatContainer);
+        new Element("div.detailStatTotalTitle",{styles:this.css.detailStatTotalTitle,text:this.lp.projectDetails.process}).inject(detailStatProcess);
+        new Element("div.detailStatTotalCount",{styles:this.css.detailStatTotalCount,text:this.projectData.progressTotal}).inject(detailStatProcess);
+        var pbar = new Element("div.detailStatTotalBar",{styles:this.css.detailStatTotalBar}).inject(detailStatProcess);
+        pbar.setStyles({"background-color":"#ecedf4"});
+
+        var detailStatCompleted = new Element("div.detailStatTotal",{styles:this.css.detailStatTotal}).inject(detailStatContainer);
+        new Element("div.detailStatTotalTitle",{styles:this.css.detailStatTotalTitle,text:this.lp.projectDetails.complete}).inject(detailStatCompleted);
+        new Element("div.detailStatTotalCount",{styles:this.css.detailStatTotalCount,text:this.projectData.completedTotal}).inject(detailStatCompleted);
+        var cbar = new Element("div.detailStatTotalBar",{styles:this.css.detailStatTotalBar}).inject(detailStatCompleted);
+        cbar.setStyles({"background-color":"#f1f9eb"});
+
+        var detailStatOver = new Element("div.detailStatTotal",{styles:this.css.detailStatTotal}).inject(detailStatContainer);
+        var detailStatTotalTitle = new Element("div.detailStatTotalTitle",{styles:this.css.detailStatTotalTitle,text:this.lp.projectDetails.over}).inject(detailStatOver);
+        var detailStatTotalCount = new Element("div.detailStatTotalCount",{styles:this.css.detailStatTotalCount,text:this.projectData.overtimeTotal}).inject(detailStatOver);
+        var detailStatTotalBar = new Element("div.detailStatTotalBar",{styles:this.css.detailStatTotalBar}).inject(detailStatOver);
+
     },
     loadAccess:function(){
         var _self = this;
         this.projectSettingLayout.empty();
+
         var authTaskTitle = new Element("div.authTaskTitle",{styles:this.css.authTitle,text:this.lp.auth.task}).inject(this.projectSettingLayout);
         authTaskTitle.setStyle("margin-top","20px");
         var authTaskContainer = new Element("div.authTaskContainer",{styles:this.css.authContainer}).inject(this.projectSettingLayout);
 
+
+        this.getProjectAuth(this.projectData.id,function(){
+            //alert(JSON.stringify(this.projectAuthData))
+
+            //创建任务
+            //var taskCreateFlag = true;
+            taskCreateFlag=this.projectAuthData.hasOwnProperty("taskCreate") ? this.projectAuthData.taskCreate:true;
+
+            var newTaskContainer = new Element("div.authItemContainer",{styles:this.css.authItemContainer}).inject(authTaskContainer);
+            var newTaskIcon = new Element("div.authItemIcon",{styles:this.css.authItemIcon}).inject(newTaskContainer);
+            var newTaskTitle = new Element("div.authItemTitle",{styles:this.css.authItemTitle,text:this.lp.auth.taskCreate}).inject(newTaskContainer);
+
+            if(!taskCreateFlag) newTaskIcon.setStyles({"background-image":"url(/x_component_TeamWork/$ProjectSetting/default/icon/icon_unselected.png)"});
+            else newTaskIcon.setStyles({"background-image":"url(/x_component_TeamWork/$ProjectSetting/default/icon/icon_selected.png)"});
+
+            var isChanged = false;
+            newTaskContainer.addEvents({
+                mouseenter:function(){
+                    if(isChanged) return;
+                    if(taskCreateFlag){
+                        newTaskIcon.setStyles({"background-image":"url(/x_component_TeamWork/$ProjectSetting/default/icon/icon_selected_click.png)"});
+                    }else{
+                        newTaskIcon.setStyles({"background-image":"url(/x_component_TeamWork/$ProjectSetting/default/icon/icon_unselected_click.png)"});
+                    }
+                },
+                mouseleave:function(){
+                    if(isChanged) { isChanged = false ; return;}
+                    if(taskCreateFlag){
+                        newTaskIcon.setStyles({"background-image":"url(/x_component_TeamWork/$ProjectSetting/default/icon/icon_selected.png)"});
+                    }else{
+                        newTaskIcon.setStyles({"background-image":"url(/x_component_TeamWork/$ProjectSetting/default/icon/icon_unselected.png)"});
+                    }
+                },
+                click:function(){
+                    if(taskCreateFlag){
+                        this.projectAuthData.taskCreate = false;
+                        taskCreateFlag = false;
+                        newTaskIcon.setStyles({"background-image":"url(/x_component_TeamWork/$ProjectSetting/default/icon/icon_unselected.png)"});
+                    }else{
+                        this.projectAuthData.taskCreate = true;
+                        taskCreateFlag = true;
+                        newTaskIcon.setStyles({"background-image":"url(/x_component_TeamWork/$ProjectSetting/default/icon/icon_selected.png)"});
+                    }
+
+                    this.saveProjectAuth();
+                    isChanged = true;
+                }.bind(this)
+            });
+
+        }.bind(this));
+
+    },
+    getProjectAuth:function(id,callback){
+        this.rootActions.GlobalAction.projectConfigGetByProject(id,function(json){
+            if(json.type == "error"){
+                this.projectAuthData = {};
+            }else{
+                this.projectAuthData = json.data||{};
+            }
+            if(callback)callback(json)
+        }.bind(this),function(json){
+            this.projectAuthData = {};
+            if(callback)callback(json)
+        }.bind(this));
+    },
+    loadAccessItem:function(container,data){
+
+    },
+    saveProjectAuth:function(callback){
+        var data = {
+            id:this.projectAuthData.id||"",
+            project:this.projectData.id,
+            taskCreate:this.projectAuthData.taskCreate || false,
+            taskCopy:this.projectAuthData.taskCopy || false,
+            taskRemove:this.projectAuthData.taskRemove || false,
+            laneCreate:this.projectAuthData.laneCreate || false,
+            laneEdit:this.projectAuthData.laneEdit || false,
+            laneRemove:this.projectAuthData.laneRemove || false,
+            attachmentUpload:this.projectAuthData.attachmentUpload || false,
+            comment:this.projectAuthData.comment || false
+
+        };
+        this.rootActions.GlobalAction.projectConfigSave(data,function(json){
+            this.rootActions.GlobalAction.projectConfigGet(json.data.id,function(d){
+                this.projectAuthData = d.data;
+                if(callback)callback(json);
+            }.bind(this))
+
+        }.bind(this))
+
     },
     loadMore:function(){
         var _self = this;
@@ -529,7 +653,7 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
         this.moreActionDescription = new Element("div.moreActionDescription",{styles:this.css.moreActionDescription,text:this.lp.moreActionDescription}).inject(this.projectSettingLayout);
         this.moreActionContainer = new Element("div.moreActionContainer",{ styles:this.css.moreActionContainer }).inject(this.projectSettingLayout);
         if(this.projectData.completed){
-            this.moreActionUnComplete = new Element("div.moreActionUnComplete",{styles:this.css.moreActionUnComplate, text:this.lp.moreActionUnComplete}).inject(this.moreActionContainer);
+            this.moreActionUnComplete = new Element("div.moreActionUnComplete",{styles:this.css.moreActionUnComplete, text:this.lp.moreActionUnComplete}).inject(this.moreActionContainer);
             this.moreActionUnComplete.addEvents({
                 mouseover:function(){
                     this.setStyles({"background-color":"#ffeded"})
@@ -540,8 +664,8 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
                 click:function(e){
                     _self.app.confirm("warn",e,_self.lp.moreActionUnComplete,_self.lp.moreActionUnCompleteTips,450,100,function(){
                         _self.rootActions.ProjectAction.completeProject(_self.projectData.id,{completed:false},function(){
-
                             this.close();
+                            _self.close({"action":"reload"});
                         }.bind(this))
                     },function(){
                         this.close();
@@ -549,7 +673,7 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
                 }
             });
         }else{
-            this.moreActionComplete = new Element("div.moreActionComplete",{styles:this.css.moreActionComplate, text:this.lp.moreActionComplete}).inject(this.moreActionContainer);
+            this.moreActionComplete = new Element("div.moreActionComplete",{styles:this.css.moreActionComplete, text:this.lp.moreActionComplete}).inject(this.moreActionContainer);
             this.moreActionComplete.addEvents({
                 mouseover:function(){
                     this.setStyles({"background-color":"#ffeded"})
@@ -560,8 +684,8 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
                 click:function(e){
                     _self.app.confirm("warn",e,_self.lp.moreActionComplete,_self.lp.moreActionCompleteTips,450,100,function(){
                         _self.rootActions.ProjectAction.completeProject(_self.projectData.id,{completed:true},function(){
-
                             this.close();
+                            _self.close({"action":"reload"});
                         }.bind(this))
                     },function(){
                         this.close();
@@ -569,7 +693,6 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
                 }
             });
         }
-
         if(this.projectData.deleted){
             this.moreActionRecover = new Element("div.moreActionRemove",{styles:this.css.moreActionRecover, text:this.lp.moreActionRecover}).inject(this.moreActionContainer);
             this.moreActionRecover.addEvents({
@@ -583,7 +706,7 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
                     _self.app.confirm("warn",e,_self.lp.moreActionRecover,_self.lp.moreActionRecoverTips,450,100,function(){
                         _self.rootActions.ProjectAction.recoveryProject(_self.projectData.id,function(){
                             this.close();
-                            //_self.close();
+                            _self.close({"action":"reload"});
                         }.bind(this))
                     },function(){
                         this.close();
@@ -603,7 +726,7 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
                     _self.app.confirm("warn",e,_self.lp.moreActionRemove,_self.lp.moreActionRemoveTips,450,100,function(){
                         _self.rootActions.ProjectAction.delete(_self.projectData.id,function(){
                             this.close();
-                            _self.close();
+                            _self.close({"action":"reload"});
                         }.bind(this))
                     },function(){
                         this.close();
@@ -611,8 +734,6 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
                 }
             });
         }
-
-
     },
     projectInfor:function(callback){
         if(this.data.id){
@@ -633,5 +754,4 @@ MWF.xApplication.TeamWork.ProjectSetting = new Class({
         }.bind(this))
     }
 
-
 });

+ 4 - 6
o2web/source/x_component_TeamWork/Task.js

@@ -1046,7 +1046,8 @@ MWF.xApplication.TeamWork.Task = new Class({
             // if(this.taskData.priority == this.lp.priority.urgency) curColor = "#ffaf38";
             // else if(this.taskData.priority == this.lp.priority.emergency) curColor = "#ff4f3e";
 
-            node.setStyles({"color":color,"border":"1px solid "+color+""})
+            node.setStyles({"color":color,"border":"1px solid "+color+""});
+
         }else{
             node.set("text",this.lp.priority.normal)
         }
@@ -1961,7 +1962,6 @@ MWF.xApplication.TeamWork.Task.PriorityCheck = new Class({
 
         this.rootActions.GlobalAction.priorityList(function(json){
             json.data.each(function(data){
-                debugger;
                 var vContainer = new Element("div",{styles:container}).inject(this.contentNode);
                 var value = new Element("div",{styles:text,text:data.priority}).inject(vContainer);
                 value.setStyles({"color":data.priorityColor,"border":"1px solid "+ data.priorityColor});
@@ -1970,15 +1970,13 @@ MWF.xApplication.TeamWork.Task.PriorityCheck = new Class({
                 }
                 vContainer.addEvents({
                     click:function(){
-                        var data = {"value":this.lp.priority.normal};
-                        this.close(data)
+                        var d = {"value":data.priority+"||"+data.priorityColor};
+                        this.close(d)
                     }.bind(this),
                     mouseover:function(){this.setStyles({"background-color":"#f2f5f7"})},
                     mouseout:function(){this.setStyles({"background-color":""})}
                 });
 
-
-
             }.bind(this))
         }.bind(this));
         if(callback)callback();

+ 10 - 0
o2web/source/x_component_TeamWork/lp/zh-cn.js

@@ -93,6 +93,16 @@ MWF.xApplication.TeamWork.LP = {
 		"updateTime":"最后更新时间",
 		"option":"选项",
 		"projectDetail":"项目详情",
+		"projectDetails":{
+			"title":"项目详情",
+			"total":"总数",
+			"process":"进行中",
+			"complete":"已完成",
+			"over":"已逾期",
+			"taskStat":"任务统计",
+			"create":"创建",
+			"at":"于"
+		},
 		"projectAccess":"权限管理",
 		"projectMore":"更多设置",
 		"auth":{