xiongzhu пре 4 година
родитељ
комит
1c985cdb3c

+ 22 - 4
o2web/source/o2_core/o2/xDesktop/$Default/blue/layout-pc.html

@@ -22,10 +22,28 @@
                             <i class="fas fa-suitcase"></i>
                             <span slot="title">公文管理</span>
                         </el-menu-item>
-                        <el-menu-item index="3" @click.native="open(null ,'Calendar')">
-                            <i class="fas fa-calendar-alt"></i>
-                            <span slot="title">工作事务处理</span>
-                        </el-menu-item>
+                        <el-submenu index="3">
+                            <template slot="title">
+                                <i class="fas fa-calendar-alt"></i>
+                                <span slot="title">工作事务处理</span>
+                            </template>
+                            <el-menu-item index="3-1" @click.native="open(null ,'TeamWork')">
+                                <i class="fas fa-suitcase"></i>
+                                <span slot="title">工作计划</span>
+                            </el-menu-item>
+                            <el-menu-item index="3-2" @click.native="open(null ,'TeamWork')">
+                                <i class="fas fa-suitcase"></i>
+                                <span slot="title">接待管理</span>
+                            </el-menu-item>
+                            <el-menu-item index="3-3" @click.native="open(null ,'Calendar')">
+                                <i class="fas fa-suitcase"></i>
+                                <span slot="title">日常事务</span>
+                            </el-menu-item>
+                            <el-menu-item index="3-4" @click.native="open(null ,'Meeting')">
+                                <i class="fas fa-suitcase"></i>
+                                <span slot="title">会议管理</span>
+                            </el-menu-item>
+                        </el-submenu>
                         <el-submenu index="4">
                             <template slot="title">
                                 <i class="fas fa-file-alt"></i>

+ 1 - 0
o2web/source/o2_core/o2/xDesktop/Default.js

@@ -2571,6 +2571,7 @@ o2.xDesktop.Default.TaskItem = new Class({
                     if (!this.app.window){
                         this.desktop.apps[this.app.options.appId] = null;
                         layout.openApplication(null, this.app.options.name, this.app.options, this.app.options.app, false, this, false);
+                        console.log('TaskItem::layout.openApplication::', null, this.app.options.name, this.app.options, this.app.options.app, false, this, false);
                     }else{
                         this.app.setCurrent();
                     }