holiday

protected/config/routes.conf.php

@@ -363,5 +363,12 @@ $route['*']['/invoiceApproval'] = array('InvoiceController', 'invoiceApproval');
 $route['*']['/invoiceDetail/:iid'] = array('InvoiceController', 'invoiceDetail','extension'=>'.html');
 $route['*']['/invoiceApprovalDo'] = array('InvoiceController', 'invoiceApprovalDo');
 
+//假期管理
+$route['*']['/myList'] = array('HolidayController', 'myList');
+$route['*']['/holidaygroup'] = array('AdminController', 'holidayGroup');
+$route['*']['/addholidayapprover'] = array('AdminController', 'addHolidayApprover');
+$route['*']['/hcsgroup'] = array('AdminController', 'holidayCSGroup');
+$route['*']['/addhcsgroup'] = array('AdminController', 'addHolidayCS');
+
 
 ?>

protected/controller/AdminController.php

@@ -358,10 +358,11 @@ function adminDoEdiUser(){
 
 			$staff->nature=$nature;
 
-
-
 			$staff->update();
 
+			$staffmsg = $staff->getUserById($sid);
+			$this->updateAnnualLeave($staffmsg[0]);
+
 			return "/edi/user/".$sid."/".$msg;
 		}else{
 			return "/adminuser";
@@ -1254,16 +1255,58 @@ function excelTime($date, $time = false)
 		return $result ['count'];
 	}
 
-	//录入用户假期信息
-	public function AddStaffHoliday(){
+	public function holidayGroup(){
 		Doo::loadModel('staff');
-		$staff = new staff();
-		$stafflist = $staff->find(array('select' => 'sid,hiredate','where' => 'nature=1', 'asArray' => TRUE));
-		var_dump($stafflist);
+		Doo::loadModel("holidayacman");
+		$acman=new HACMan();
+		$staff=new staff();
+
+		$data['staffList']=$staff->find(array('select'=>'username,sid,wxid', 'where' => 'cid!=1','asArray'=>true));
+		$acmanlist=$acman->find(array('where' => 'type=0','asArray'=>true));
+
+		$data['acmanlist'] = $acmanlist;
+		$data['staff']=$this->staff;
+		$data['memu'] = 'holiday';
+		$this->render( "/admin/admin_holidayGroup", $data );
+	}
+
+	public function addHolidayApprover(){
+		if(!isset($_POST['title']) || empty($_POST['title'])){
+			exit('请输入组名');
+		}
+		if(!isset($_POST['staff']) || empty($_POST['staff'])){
+			exit('请选择成员');
+		}
+		$idname = $name = $pinyinname = array();
+		foreach($_POST['staff'] as $k => $v){
+
+			array_push($idname)
+		}
+
+		Doo::loadModel("holidayacman");
+		$acman=new HACMan();
+		$acman->typename = $_POST['title'];
+		var_dump($_POST);
 		exit;
+	}
 
-		Doo::loadModel('holidaystaff');
+	public function holidayCSGroup(){
+		$data['memu'] = 'holiday';
+		$this->render( "/admin/admin_holidayGroup_cc", $data );
+	}
 
+	//检查年假是否过期并更新年假
+	private function updateAnnualLeave($staff){
+		Doo::loadModel('holidaystaff');
+		$hstaff = new HStaff();
+		$hstaffmsg = $hstaff->getOne(array('where' => 'uid='.$staff['sid'],'asArray' => TRUE));
+		$hiredate = $staff['hiredate'];
+		if(intval((time()-strtotime($hiredate))/(86400*365)) != $hstaffmsg['hadyear'] && $staff['nature'] == 1 ){
+			$hstaff->uid = $staff['sid'];
+			$hstaff->hadyear = intval((time()-strtotime($hiredate))/(86400*365));
+			$hstaff->yearnum = intval((time()-strtotime($hiredate))/(86400*365)) != 0 ? 5 : 0;
+			$hstaff->update();
+		}
 	}
 
 

protected/controller/HolidayController.php

@@ -6,37 +6,65 @@
 
 class HolidayController extends DooController {
 
+	public $staff;
+	public static $NEW = 0;
+	public static $NEW2 = 0;
+
 	function __construct() {
+		if(isset($_COOKIE["staff"])){
+			if(!empty($_COOKIE["staff"])){
+				Doo::loadModel ( 'staff' );
+				$staff = new staff ();
+				$this->staff=$staff->getUserByIdList($_COOKIE["staff"]);
+				self::$NEW= $this->getReceiptCount();
+				self::$NEW2= $this->getExeCount();
+				include './protected/controller/ReceiptController.php';
+				ReceiptController::$NEW=self::$NEW;
+				ReceiptController::$NEW2=self::$NEW2;
+				return "/";
+			}
+		}
+
+		Doo::loadCore ( 'uri/DooUriRouter' );
+		$router = new DooUriRouter ();
+		$routeRs = $router->execute ( Doo::app ()->route, Doo::conf ()->SUBFOLDER );
+
+		if($routeRs['1']!="login"){
+			header ( 'Content-Type:text/html;charset=utf-8' );
+			@header ( "Location: /login"  );
+		}
+	}
 
+	public function myList(){
+		$data ['memu'] = 'holiday';
+		$data ['holidaymenu'] = 'mylist';
+		$data ['staff'] = $this->staff;
+		$this->render ( "/holiday-myList", $data );
 	}
 
-//	//录入用户假期信息
-//	public function AddStaffHoliday(){
-//		Doo::loadModel('staff');
-//		$staff = new staff();
-//		$stafflist = $staff->find(array('select' => 'sid,hiredate,nature', 'asArray' => TRUE));
-//
-//		Doo::loadModel('holidaystaff');
-//		$thistime = time();
-//		foreach($stafflist as $k => $v){
-//			if(!empty($v['hiredate'])){
-//				if($thistime > strtotime("+ 1 year", strtotime($v['hiredate']))){
-//					$yearnum = 5;
-//				}else{
-//					$yearnum = 0;
-//				}
-//			}else{
-//				$yearnum = 0;
-//			}
-//			$hstaff = new HStaff();
-//			$hstaff->uid = $v['sid'];
-//			$hstaff->yearnum = $yearnum;
-//			$hstaff->insert();
-//		}
-//		exit;
-//	}
+	private function getReceiptCount(){
+
+		$status=2;
+		$year=date('Y');
+
+		Doo::loadModel('receipt');
+		$receipt=new receipt();
 
+		$dateCondition=" and Year(date) =".$year;
 
+		$approvalCondition=' and nowStaff like "%'.$this->staff[0]['sid'].'%" ';
+		$receiptList=$receipt->find(array('where'=>' status='.$status.$dateCondition.$approvalCondition,'desc'=>'rid','asArray'=>true));
+
+		return count($receiptList);
+	}
+
+	private function getExeCount(){
+		Doo::loadModel('receipt');
+		$receipt=new receipt();
+		$receiptList=$receipt->find(array('where'=>'(executeCopy like \'%["'.$this->staff[0]['sid'].'%\' and executeStaff NOT LIKE \'%'.$this->staff[0]['sid'].'%\' ) and (status=1 or status=6)','desc'=>'rid','asArray'=>true));
+
+		return count($receiptList);
+	}
 }
 
 ?>

protected/model/holiday.php

@@ -11,6 +11,7 @@ class Holiday extends DooModel {
 	public $type;
 	public $starttime;
 	public $endtime;
+	public $dayjson;
 	public $daynum;
 	public $status;
 	public $addtime;
@@ -19,7 +20,7 @@ class Holiday extends DooModel {
 
 	public $_table = 'holiday_msg';
 	public $_primarykey = 'id';
-	public $_fields = array ('id', 'uid','aid','cid', 'type','starttime','endtime','daynum','status','addtime','approvetime','description' );
+	public $_fields = array ('id', 'uid','aid','cid', 'type','starttime','endtime','dayjson','daynum','status','addtime','approvetime','description' );
 	
 
 }

protected/model/holidayacman.php

@@ -5,13 +5,24 @@ Doo::loadCore ( 'db/DooModel' );
 class HACMan extends DooModel {
 	
 	public $id;
+	public $typename;
+	public $idname;
 	public $name;
+	public $pinyinname;
 	public $type;
 
 	public $_table = 'holiday_acman';
 	public $_primarykey = 'id';
-	public $_fields = array ('id', 'name', 'type' );
-	
+	public $_fields = array ('id', 'typename', 'idname', 'name', 'pinyinname', 'type' );
+
+	public function getPinYinNamebyid($id){
+		$result = $this->getOne(array('select' => 'pinyinname', 'where' => 'id='.$id, 'asArray' => TRUE));
+		return $result['pinyinname'];
+	}
+
+	public function getApproverbyid($id){
+		return $this->getOne(array('where' => 'id='.$id, 'asArray' => TRUE));
+	}
 
 }
 

protected/model/holidayday.php

@@ -5,13 +5,15 @@ Doo::loadCore ( 'db/DooModel' );
 class HDay extends DooModel {
 	
 	public $id;
+	public $hid;
 	public $uid;
 	public $type;
 	public $daytime;
+	public $daymsg;
 
 	public $_table = 'holiday_day';
 	public $_primarykey = 'id';
-	public $_fields = array ('id', 'uid', 'type', 'daytime');
+	public $_fields = array ('id', 'hid', 'uid', 'type', 'daytime', 'daymsg');
 	
 
 }

protected/model/holidaystaff.php

@@ -6,14 +6,18 @@ class HStaff extends DooModel {
 	
 	public $uid;
 	public $yearnum;
+	public $hadyear;
 	public $addnum;
 	public $othernum;
+	public $isadmin;
 
 	public $_table = 'holiday_staff';
 	public $_primarykey = 'uid';
-	public $_fields = array ('uid', 'yearnum', 'addnum', 'othernum');
-	
+	public $_fields = array ('uid', 'yearnum', 'hadyear', 'addnum', 'othernum', 'isadmin');
 
+	public function __construct() {
+		parent::setupModel(__CLASS__);
+	}
 }
 
 ?>

protected/model/holidaytype.php

@@ -10,8 +10,11 @@ class HType extends DooModel {
 	public $_table = 'holiday_type';
 	public $_primarykey = 'id';
 	public $_fields = array ('id', 'name');
-	
 
+	public function getTypeNamebyid($id){
+		$result = $this->getOne(array('select' => 'name', 'where' => 'id='.$id, 'asArray' => TRUE));
+		return $result['name'];
+	}
 }
 
 ?>

protected/view/admin/admin_holidayGroup.html

@@ -0,0 +1,137 @@
+<!-- include 'header' -->
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include 'menu' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<!-- include 'admin_menu' -->
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<div class="subNav">
+					<ul class="navTabs">
+						<li class="active"><a href="/holidaygroup">审批组</a></li>
+						<li><a href="/hcsgroup">抄送人</a></li>
+					</ul>
+				</div>
+					<legend>添加审批组</legend>
+						<form method="post" action="/addholidayapprover" name="group" onsubmit="return checkgroup();">
+							<div class="control-group">
+								<label class="control-label">组描述</label>
+								<div class="controls">
+									<input type="text" name="title">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label">成员</label>
+								<div class="controls">
+									<style>
+										.controls > .checkbox{margin-left: 10px}
+									</style>
+									<!-- loop staffList -->
+									<label class="checkbox inline">
+										<input type="checkbox" name="staff[]" id="holiday_{{staffList' value.sid}}" data='{{staffList' value.username}}' value="{{staffList' value.sid}}:{{staffList' value.username}}:{{staffList' value.wxid}}">{{staffList' value.username}}
+									</label>
+									<!-- endloop -->
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label">已选审批人</label>
+								<div class="controls colRed" id="approverlist"></div>
+							</div>
+							<div class="control-group">
+								<div class="controls">
+									<button class="button" type="submit">添加新审查组</button>
+								</div>
+							</div>
+			    		</form>
+						<table class="table table-striped">
+              <thead>
+                <tr>
+                  <th>组描述</th>
+                  <th>成员</th>
+                  <th>审批组操作</th>
+                </tr>
+              </thead>
+              <tbody>
+			  <!-- if isset({{acmanlist}}) && !empty({{acmanlist}}) -->
+			  <!-- loop acmanlist -->
+                <tr>
+                  <td>{{acmanlist' value.typename}}</td>
+                  <td>{{acmanlist' value.name}}</td>
+                  <td><a href="#del" data-toggle="modal">删除审批组</a></td>
+                </tr>
+			  <!-- endloop -->
+			  <!-- endif -->
+              </tbody>
+          	</table>
+			</div>
+		</div>
+	</div>
+
+<!--弹出（删除组）-->
+<div class="modal hide fade" id="del">
+
+  <div class="modal-dialog">
+    <div class="modal-content">
+    <div class="modal-header">
+    <h3>确认删除</h3>
+    </div>
+    <div class="modal-body">
+    	<p>删除后，正在使用该审批组的费用审批将不受影响，可继续审批。</p>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确定</a>
+	</div>
+</div>
+</div>
+</div>
+<!--弹出-->
+<script type="text/javascript">autoFlashHeight();</script>
+<script>
+	function checkgroup(){
+		if($('input[name="title"]').val() == ''){
+			alert('请输入组名');
+			return false;
+		}
+		if(!$('input[name="staff[]"]').is(":checked")){
+			alert('请选择成员');
+			return false;
+		}
+	}
+	$(function(){
+		$('.controls label').live('click',function(e){
+			if($(e.target).is('label')){
+				return;
+			}
+			if($(this).children('input[name="staff[]"]').is(":checked")){
+				if($('#approverlist').text() != ''){
+					$('#approverlist').append(' > '+$(this).children('input[name="staff[]"]').attr('data'));
+				}else{
+					$('#approverlist').append($(this).children('input[name="staff[]"]').attr('data'));
+				}
+			}else{
+				var arr = $('#approverlist').text().split(' > ');
+				for(var i = 0; i<arr.length; i++){
+					if(arr[i] == $(this).children('input[name="staff[]"]').attr('data')) {
+						arr.splice(i, 1);
+						break;
+					}
+				}
+				$('#approverlist').text(arr.join(' > '));
+			}
+		})
+	})
+</script>
+</body>

protected/view/admin/admin_holidayGroup_cc.html

@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<link rel="shortcut icon" href="images/favicon.ico">
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/global.css>
+	<script src=js/jquery-1.7.1.min.js></script>
+	<script src=js/global.js></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="后台管理"><a href="#" class="icon-  selected">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li><a href="admin-admininfo.html">管理员设置</a></li>
+						<li><a href="admin-group.html">办事处</a></li>
+						<li><a href="admin-user.html">员工列表</a></li>
+						<li><a href="admin-product.html">产品列表</a></li>
+						<li><a href="admin-reportGroup.html">报销审查组</a></li>
+						<li><a href="admin-demand.html">需求中心</a></li>
+						<li><a href="admin-reportGroup.html" class="selected">假期审查组</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<div class="subNav">
+					<ul class="navTabs">
+						<li><a href="admin_holidayGroup.html">审批组</a></li>
+						<li class="active"><a href="admin-holidayGroup-cc.html">抄送人</a></li>
+					</ul>
+				</div>
+					<form>
+					<legend>添加抄送人</legend>
+						<table class="table table-striped">
+              <thead>
+                <tr>
+                  <th>组描述</th>
+                  <th>成员</th>
+                  <th>抄送人</th>
+                  <th>审批组操作</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>适用销售人员、客服人员</td>
+                  <td>谭玉堂->何银龄->赵淑燕->杨福芳</td>
+                  <td>黄爱玲<a href="#del" data-toggle="modal" role="button" title="删除" class="icon-">k</a>、陈特<a href="#del" data-toggle="modal" role="button" title="删除" class="icon-">k</a></td>
+                  <td><a href="#add" data-toggle="modal">添加抄送人</a></td>
+                </tr>
+                <tr>
+                  <td>适用开发部</td>
+                  <td>谭玉堂->赵淑燕->杨福芳</td>
+                  <td>黄爱玲<a href="#del" data-toggle="modal" role="button" title="删除" class="icon-">k</a></td>
+                  <td><a href="#add" data-toggle="modal">添加抄送人</a></td>
+                </tr>
+              </tbody>
+          	</table>
+					</form>
+			</div>
+		</div>
+	</div>
+<!--弹出（添加抄送人）-->
+<div class="modal hide fade" id="add">
+
+  <div class="modal-dialog">
+    <div class="modal-content">
+    <div class="modal-header">
+    <h3>添加抄送人</h3>
+    </div>
+    <div class="modal-body">
+    	<div class="control-group">
+    		<div class="controls">
+			    <select style="width:190px">
+			    	<option>总部</option>
+			    	<option>广东办</option>
+			    </select>
+			    <select style="width:190px">
+			    	<option>陈帅</option>
+			    	<option>陈帅</option>
+			    	<option>陈帅</option>
+			    	<option>陈帅</option>
+			    	<option>陈帅</option>
+			    </select>
+			</div>
+		</div>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确定</a>
+	</div>
+</div>
+</div>
+</div>
+<!--弹出-->
+<!--弹出（删除抄送人）-->
+<div class="modal hide fade" id="del">
+
+  <div class="modal-dialog">
+    <div class="modal-content">
+    <div class="modal-header">
+    <h3>确认删除</h3>
+    </div>
+    <div class="modal-body">
+    	<p>删除后，正在使用该审批组的假期审批将不受影响，可继续接收抄送通知。</p>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确定</a>
+	</div>
+</div>
+</div>
+</div>
+<!--弹出-->
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

protected/view/admin/admin_menu.html

@@ -8,4 +8,5 @@
 <li><a href="/adminproduct" <!-- if {{memu}}=="adminproduct" --> class="selected" <!-- endif -->>产品列表</a></li>
 <li><a href="/adminverify" <!-- if {{memu}}=="verify" --> class="selected" <!-- endif -->>报销审查组</a></li>
 <li><a href="/adminInvoice" <!-- if {{memu}}=="invoice" --> class="selected" <!-- endif -->>发票管理</a></li>
+<li><a href="/holidaygroup" <!-- if {{memu}}=="holiday" --> class="selected" <!-- endif -->>假期审查组</a></li>
 <!-- endif -->

protected/view/admin/menuReceipt.html

@@ -9,7 +9,8 @@
 <li data-placement="right" class="topLine" data-toggle="ctooltip" data-original-title="费用管理" <!-- if  ReceiptController::$NEW !=0 || ReceiptController::$NEW2 !=0 --> class=news <!-- endif -->><a href="/saeaBorad" class="icon- <!-- if {{memu}}=="receipt" --> selected <!-- endif -->" >U</a></li>  
  <li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">  
 <a href="/eMailTask" class="icon- <!-- if {{memu}}=="eMailTask" --> selected <!-- endif -->">Z</a></li>
-
+<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
+ <a href="/myList" class="icon- <!-- if {{memu}}=="holiday" --> selected <!-- endif -->">X</a></li>
 <li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine">
 <a href="/app" class="icon- <!-- if {{memu}}=="app" --> selected <!-- endif -->">Y</a></li>
 <li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminmyinfo" class="icon- <!-- if {{memu}}=="adminlock"||{{memu}}=="adminmyinfo"||{{memu}}=="adminoffice" --> selected <!-- endif -->" >F</a></li> 

protected/view/holiday_menu.html

@@ -0,0 +1,8 @@
+<li class="holidayTitle">假期管理</li>
+<li><a href="holiday-borad.html">公布板</a></li>
+<li><a href="/myList" <!-- if {{holidaymenu}} == 'mylist' -->class="selected"<!-- endif -->>我的假期</a></li>
+<li class="topLine"><a href="holiday-reportList.html">请假审批</a></li>
+<li><a href="holiday-copy.html">请假抄送</a></li>
+<li class="topLine"><a href="holiday-close.html">请假结算</a></li>
+<li><a href="holiday-overtime.html">加班管理</a></li>
+<li><a href="holiday-vacation.html">休假管理</a></li>

protected/view/menu.html

@@ -11,7 +11,8 @@
 <li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">  
 <a href="/eMailTask" class="icon- <!-- if {{memu}}=="eMailTask" --> selected <!-- endif -->">Z</a></li>
 
-
+<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
+    <a href="/myList" class="icon- <!-- if {{memu}}=="holiday" --> selected <!-- endif -->">X</a></li>
 <li data-placement="right" data-toggle="ctooltip" class="topLine" data-original-title="APP" >
 <a href="/app" class="icon- <!-- if {{memu}}=="app" --> selected <!-- endif -->">Y</a></li>
 <li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminmyinfo" class="icon- <!-- if {{memu}}=="adminlock"||{{memu}}=="adminmyinfo"||{{memu}}=="adminoffice" --> selected <!-- endif -->" >F</a></li> 

protected/view/menuHoliday.html

@@ -0,0 +1,19 @@
+<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="/" class="icon- <!-- if {{memu}}==" index" --> selected <!-- endif --> ">B</a></li>
+<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="/contacts" class="icon- <!-- if {{memu}}=="contacts" --> selected <!-- endif -->">A</a></li>
+<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库">
+    <a href="/keyonline" class="icon- <!-- if {{memu}}=="keyonline" --> selected <!-- endif -->">C</a></li>
+
+<li class="hide"><a href="#">E</a></li>
+<li class="hide"><a href="#">D</a></li>
+
+<li  data-placement="right" data-toggle="ctooltip" class="topLine" data-original-title="费用管理" <!-- if  HolidayController::$NEW !=0 || HolidayController::$NEW2 !=0 --> class=news <!-- endif -->><a href="/saeaBorad" class="icon- <!-- if {{memu}}=="receipt" --> selected <!-- endif -->" >U</a></li>
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">
+    <a href="/eMailTask" class="icon- <!-- if {{memu}}=="eMailTask" --> selected <!-- endif -->">Z</a></li>
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
+    <a href="/myList" class="icon- <!-- if {{memu}}=="holiday" --> selected <!-- endif -->">X</a></li>
+<li data-placement="right" data-toggle="ctooltip" class="topLine" data-original-title="APP" >
+    <a href="/app" class="icon- <!-- if {{memu}}=="app" --> selected <!-- endif -->">Y</a></li>
+<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminmyinfo" class="icon- <!-- if {{memu}}=="adminlock"||{{memu}}=="adminmyinfo"||{{memu}}=="adminoffice" --> selected <!-- endif -->" >F</a></li>
+<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>