3.17holiday提交

protected/config/routes.conf.php

@@ -370,6 +370,9 @@ $route['*']['/getstaffcategory'] = array('HolidayController', 'getStaffCategory'
 $route['*']['/getholidaystaff'] = array('HolidayController', 'getHolidayStaff');
 $route['*']['/addhcsgroup'] = array('AdminController', 'addHolidayCS');
 $route['*']['/delhcsgroup'] = array('AdminController', 'delHolidayCS');
+$route['*']['/holidayadmin'] = array('AdminController', 'HolidayAdmin');
+$route['*']['/addholidayadmin'] = array('AdminController', 'addHolidayAdmin');
+$route['*']['/delholidayadmin'] = array('AdminController', 'delHolidayAdmin');
 
 $route['*']['/holidayborad'] = array('HolidayController', 'holidayBorad');
 $route['*']['/holidayallList'] = array('HolidayController', 'allList');

protected/controller/AdminController.php

@@ -1356,10 +1356,15 @@ class AdminController extends DooController {
 
 		$data['staffList']=$staff->find(array('select'=>'username,sid,wxid', 'where' => 'cid!=1','asArray'=>true));
 		$acmanlist=$acman->find(array('where' => 'type=0', 'desc' => 'id','asArray'=>true));
-
+		if(!empty($acmanlist)){
+			foreach($acmanlist as $k => $v){
+				$acmanlist[$k]['name'] = implode('->', explode(' ', $v['name']));
+			}
+		}
 		$data['acmanlist'] = $acmanlist;
 		$data['staff']=$this->staff;
 		$data['memu'] = 'holiday';
+		$data['noindexjs'] = 'noindexjs';
 		$this->render( "/admin/admin_holidayGroup", $data );
 	}
 	public function addHolidayApprover() {
@@ -1370,7 +1375,8 @@ class AdminController extends DooController {
 			exit ( '请选择成员' );
 		}
 		$idname = $name = $pinyinname = array ();
-		foreach ( $_POST ['staff'] as $k => $v ) {
+		$stafflist = explode(',',$_POST['staff']);
+		foreach ( $stafflist as $k => $v ) {
 			$msg = explode ( ':', $v );
 			array_push ( $idname, $msg [0] );
 			array_push ( $name, $msg [1] );
@@ -1413,9 +1419,9 @@ class AdminController extends DooController {
 		$acman->id = $_POST['approvalid'];
 		$acman->delete();
 
-		$acman2 = new HACMan();
-		$acman2->type = $_POST['approvalid'];
-		$acman2->delete();
+//		$acman2 = new HACMan();
+//		$acman2->type = $_POST['approvalid'];
+//		$acman2->delete();
 
 		//删除管理员资格
 		$acman3 = new HACMan();
@@ -1482,6 +1488,7 @@ class AdminController extends DooController {
 
 
 		$data['memu'] = 'holiday';
+		$data['noindexjs'] = 'noindexjs';
 		$this->render( "/admin/admin_holidayGroup_cc", $data );
 	}
 
@@ -1578,6 +1585,62 @@ class AdminController extends DooController {
 		return '/hcsgroup';
 	}
 
+	public function HolidayAdmin(){
+		Doo::loadModel('staff');
+		$staff=new staff();
+		$staffList=$staff->find(array('select'=>'username,sid', 'where' => 'cid!=1','asArray'=>true));
+
+		Doo::loadModel('holidayadmin');
+		$admin = new HAdmin();
+		$adminList = $admin->find(array('asArray' => TRUE));
+
+		if(!empty($adminList)){
+			foreach($adminList as $k => $v){
+				foreach($staffList as $sk => $sv){
+					if($sv['sid'] == $v['uid']){
+						array_splice($staffList, $sk,1);
+						break;
+					}
+				}
+			}
+		}
+
+		$data['staffList'] = $staffList;
+		$data['adminList'] = $adminList;
+		$data['memu'] = 'holiday';
+		$data['noindexjs'] = 'noindexjs';
+		$this->render( "/admin/admin_holidayuser", $data );
+	}
+
+	public function addHolidayAdmin(){
+		if(!isset($_POST['staff']) || empty($_POST['staff'])){
+			exit('请选择管理人');
+		}
+
+		Doo::loadModel('holidayadmin');
+		foreach($_POST['staff'] as $k => $v){
+			$staffmsg = explode(':',$v);
+			$admin = new HAdmin();
+			$admin->uid = $staffmsg[0];
+			$admin->username = $staffmsg[1];
+			$admin->insert();
+		}
+		return '/holidayadmin';
+	}
+
+	public function delHolidayAdmin(){
+		if(!isset($_POST['cidstaff']) || empty($_POST['cidstaff'])){
+			exit('请选择管理人删除');
+		}
+
+		Doo::loadModel('holidayadmin');
+		$admin = new HAdmin();
+		$admin->id = $_POST['cidstaff'];
+		$admin->delete();
+
+		return '/holidayadmin';
+	}
+
 
 	//检查年假是否过期并更新年假
 	private function updateAnnualLeave($staff){

protected/controller/HolidayController.php

@@ -30,6 +30,10 @@ class HolidayController extends DooController {
 	}
 
 	public function myList(){
+		$checkadmin = $this->checkisadmin();
+		if($checkadmin){
+			$data['cansee'] = 1;
+		}
 		Doo::loadModel('holidayday');
 		Doo::loadModel('holiday');
 		Doo::loadModel('holidaystaff');
@@ -92,8 +96,6 @@ class HolidayController extends DooController {
 
 		$data['yearround'] = $this->getYearRoundtime($hstaffmsg['hadyear'],$this->staff[0]['hiredate']);
 
-
-
 //		var_dump($holidaymsg);
 //		exit;
 
@@ -102,10 +104,15 @@ class HolidayController extends DooController {
 		$data ['memu'] = 'holiday';
 		$data ['holidaymenu'] = 'mylist';
 		$data ['staff'] = $this->staff;
+		$data['noindexjs'] = 'noindexjs';
 		$this->render ( "/holiday-myList", $data );
 	}
 
 	public function holidayBorad(){
+		$checkadmin = $this->checkisadmin();
+		if($checkadmin){
+			$data['cansee'] = 1;
+		}
 		Doo::loadModel('holiday');
 		Doo::loadModel('holidayday');
 		Doo::loadModel('holidaystaff');
@@ -176,10 +183,15 @@ class HolidayController extends DooController {
 		$data ['memu'] = 'holiday';
 		$data ['holidaymenu'] = 'borad';
 		$data ['staff'] = $this->staff;
+		$data['noindexjs'] = 'noindexjs';
 		$this->render ( "/holiday-borad", $data );
 	}
 
 	public function allList(){
+		$checkadmin = $this->checkisadmin();
+		if($checkadmin){
+			$data['cansee'] = 1;
+		}
 		Doo::loadModel('holiday');
 		Doo::loadModel('holidaytype');
 		$holiday = new Holiday();
@@ -188,7 +200,7 @@ class HolidayController extends DooController {
 			if($this->params['type'] == 4 ){//加班、值班
 				$sql = ' and (type=4 or type=5)';
 			}elseif($this->params['type'] == 6){//其他长假
-				$sql = ' and type in(3,6,7,8,9,12,13)';
+				$sql = ' and type in(3,6,7,8,9,13)';
 			}else{
 				$sql = ' and type='.$this->params['type'];
 			}
@@ -250,10 +262,16 @@ class HolidayController extends DooController {
 		$data ['memu'] = 'holiday';
 		$data ['holidaymenu'] = 'borad';
 		$data ['staff'] = $this->staff;
+		$data['noindexjs'] = 'noindexjs';
 		$this->render ( "/holiday-allList", $data );
 	}
 
 	public function holidayClose(){
+		$checkadmin = $this->checkisadmin();
+		if(!$checkadmin){
+			exit('非假期管理员无法访问此页面');
+		}
+		$data['cansee'] = 1;
 	//获取办事处列表
 		Doo::loadModel('staff');
 		Doo::loadModel('holidaystaff');
@@ -321,10 +339,16 @@ class HolidayController extends DooController {
 		$data ['memu'] = 'holiday';
 		$data ['holidaymenu'] = 'close';
 		$data ['staff'] = $this->staff;
+		$data['noindexjs'] = 'noindexjs';
 		$this->render ( "/holiday-close", $data );
 	}
 
 	public function holidayClose2(){
+		$checkadmin = $this->checkisadmin();
+		if(!$checkadmin){
+			exit('非假期管理员无法访问此页面');
+		}
+		$data['cansee'] = 1;
 		//获取办事处列表
 		Doo::loadModel('staff');
 		Doo::loadModel('holidaystaff');
@@ -396,6 +420,7 @@ class HolidayController extends DooController {
 		$data ['memu'] = 'holiday';
 		$data ['holidaymenu'] = 'close';
 		$data ['staff'] = $this->staff;
+		$data['noindexjs'] = 'noindexjs';
 		$this->render ( "/holiday-close2", $data );
 	}
 
@@ -410,7 +435,7 @@ class HolidayController extends DooController {
 				$holiday->type = $_POST['type'];
 				$holiday->dayjson = json_encode($dayjson);
 				$holiday->daynum = 1.0;
-				$holiday->status = 1;
+				$holiday->status = 3;
 				$holiday->addtime = time();
 				$holiday->approvetime = time();
 				$holiday->description = $_POST['description'];
@@ -436,7 +461,7 @@ class HolidayController extends DooController {
 				$holiday->starttime = $thismonth['start'];
 				$holiday->endtime = $thismonth['end'];
 				$holiday->daynum = $_POST['daynum'];
-				$holiday->status = 1;
+				$holiday->status = 3;
 				$holiday->addtime = time();
 				$holiday->approvetime = time();
 				$holiday->description = $_POST['description'];
@@ -448,6 +473,11 @@ class HolidayController extends DooController {
 	}
 
 	public function holidayOvertime(){
+		$checkadmin = $this->checkisadmin();
+		if(!$checkadmin){
+			exit('非假期管理员无法访问此页面');
+		}
+		$data['cansee'] = 1;
 		//获取办事处列表
 		Doo::loadModel('staff');
 		Doo::loadModel('holidaystaff');
@@ -569,6 +599,7 @@ class HolidayController extends DooController {
 		$data ['memu'] = 'holiday';
 		$data ['holidaymenu'] = 'overtime';
 		$data ['staff'] = $this->staff;
+		$data['noindexjs'] = 'noindexjs';
 		$this->render ( "/holiday-overtime", $data );
 	}
 
@@ -590,7 +621,7 @@ class HolidayController extends DooController {
 					$holiday->type = $_POST['type'];
 					$holiday->dayjson = json_encode($dayjson);
 					$holiday->daynum = 1.0;
-					$holiday->status = 1;
+					$holiday->status = 3;
 					$holiday->addtime = time();
 					$holiday->approvetime = time();
 					$holiday->description = $_POST['description'];
@@ -621,7 +652,7 @@ class HolidayController extends DooController {
 						$holiday->uid = $_POST['uid'];
 						$holiday->type = 13;
 						$holiday->daynum = $daynum;
-						$holiday->status = 1;
+						$holiday->status = 3;
 						$holiday->addtime = time();
 						$holiday->approvetime = 1;
 						$holiday->description = $_POST['description'];
@@ -638,7 +669,11 @@ class HolidayController extends DooController {
 	}
 
 	public function holidayVacation(){
-
+		$checkadmin = $this->checkisadmin();
+		if(!$checkadmin){
+			exit('非假期管理员无法访问此页面');
+		}
+		$data['cansee'] = 1;
 		//获取办事处列表
 		Doo::loadModel('staff');
 		Doo::loadModel('holidaystaff');
@@ -704,6 +739,7 @@ class HolidayController extends DooController {
 		$data ['memu'] = 'holiday';
 		$data ['holidaymenu'] = 'vacation';
 		$data ['staff'] = $this->staff;
+		$data['noindexjs'] = 'noindexjs';
 		$this->render ( "/holiday-vacation", $data );
 	}
 
@@ -713,8 +749,25 @@ class HolidayController extends DooController {
 			$hstaff = new HStaff();
 			$hstaffmsg = $hstaff->getOne(array('where' => 'uid='.$_POST['uid'], 'asArray' => TRUE));
 			$hstaff->uid = $_POST['uid'];
-			$hstaff->$_POST['typeholiday'] = $hstaffmsg[$_POST['typeholiday']]+$_POST['addnum'];
+			switch($_POST['typeholiday']){
+				case 'yearnum':
+					$hstaff->yearnum = $hstaffmsg['yearnum']+$_POST['addnum'];
+					break;
+				case 'hunjianum':
+					$hstaff->hunjianum = $hstaffmsg['hunjianum']+$_POST['addnum'];
+					break;
+				case 'chanjianum':
+					$hstaff->chanjianum = $hstaffmsg['chanjianum']+$_POST['addnum'];
+					break;
+				case 'sangjianum':
+					$hstaff->sangjianum = $hstaffmsg['sangjianum']+$_POST['addnum'];
+					break;
+				case 'gongjianum':
+					$hstaff->gongjianum = $hstaffmsg['gongjianum']+$_POST['addnum'];
+					break;
+			}
 			$hstaff->update();
+
 			return '/holidayvacation';
 		}else{
 			exit('增加出错');
@@ -795,6 +848,17 @@ class HolidayController extends DooController {
 		}
 	}
 
+	private function checkisadmin(){
+		Doo::loadModel('holidayadmin');
+		$admin = new HAdmin();
+		$adminmsg = $admin->getOne(array('where' => 'uid='.$this->staff[0]['sid'], 'asArray' => TRUE));
+		if(!empty($adminmsg)){
+			return TRUE;
+		}else{
+			return FALSE;
+		}
+	}
+
 }
 
 ?>

protected/model/holidayadmin.php

@@ -0,0 +1,18 @@
+<?php
+
+Doo::loadCore ( 'db/DooModel' );
+
+class HAdmin extends DooModel {
+	
+	public $id;
+	public $uid;
+	public $username;
+
+	public $_table = 'holiday_admin';
+	public $_primarykey = 'id';
+	public $_fields = array ('id', 'uid', 'username');
+	
+
+}
+
+?>

protected/model/holidayapproval.php

@@ -8,13 +8,15 @@ class HApproval extends DooModel {
 	public $hid;
 	public $aid;
 	public $aname;
+	public $apinyinname;
 	public $status;
 	public $approvetime;
 	public $description;
+	public $nextaid;
 
 	public $_table = 'holiday_approval';
 	public $_primarykey = 'id';
-	public $_fields = array ('id', 'hid', 'aid', 'aname', 'status', 'approvetime', 'description');
+	public $_fields = array ('id', 'hid', 'aid', 'apinyinname', 'aname', 'status', 'approvetime', 'description', 'nextaid');
 	
 
 }

protected/view/admin/admin_holidayGroup.html

@@ -22,6 +22,7 @@
 					<ul class="navTabs">
 						<li class="active"><a href="/holidaygroup">审批组</a></li>
 						<li><a href="/hcsgroup">抄送人</a></li>
+						<li><a href="/holidayadmin">假期管理</a></li>
 					</ul>
 				</div>
 					<legend>添加审批组</legend>
@@ -40,7 +41,7 @@
 									</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}}
+										<input type="checkbox" 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>
@@ -48,6 +49,7 @@
 							<div class="control-group">
 								<label class="control-label">已选审批人</label>
 								<div class="controls colRed" id="approverlist"></div>
+								<input type="hidden" name="staff" id="approverstaff" value="">
 							</div>
 							<div class="control-group">
 								<div class="controls">
@@ -108,7 +110,7 @@
 			alert('请输入组名');
 			return false;
 		}
-		if(!$('input[name="staff[]"]').is(":checked")){
+		if(!$('input').is(":checked")){
 			alert('请选择成员');
 			return false;
 		}
@@ -123,21 +125,26 @@
 			if($(e.target).is('label')){
 				return;
 			}
-			if($(this).children('input[name="staff[]"]').is(":checked")){
+			if($(this).children('input').is(":checked")){
 				if($('#approverlist').text() != ''){
-					$('#approverlist').append(' > '+$(this).children('input[name="staff[]"]').attr('data'));
+					$('#approverlist').append(' > '+$(this).children('input').attr('data'));
+					$('#approverstaff').val($('#approverstaff').val()+','+$(this).children('input').val());
 				}else{
-					$('#approverlist').append($(this).children('input[name="staff[]"]').attr('data'));
+					$('#approverlist').append($(this).children('input').attr('data'));
+					$('#approverstaff').val($(this).children('input').val());
 				}
 			}else{
 				var arr = $('#approverlist').text().split(' > ');
+				var arr2 = $('#approverstaff').val().split(',');
 				for(var i = 0; i<arr.length; i++){
-					if(arr[i] == $(this).children('input[name="staff[]"]').attr('data')) {
+					if(arr[i] == $(this).children('input').attr('data')) {
 						arr.splice(i, 1);
+						arr2.splice(i, 1);
 						break;
 					}
 				}
 				$('#approverlist').text(arr.join(' > '));
+				$('#approverstaff').val(arr2.join(','));
 			}
 		})
 	})

protected/view/admin/admin_holidayGroup_cc.html

@@ -22,6 +22,7 @@
 					<ul class="navTabs">
 						<li><a href="/holidaygroup">审批组</a></li>
 						<li class="active"><a href="/hcsgroup">抄送人</a></li>
+						<li><a href="/holidayadmin">假期管理</a></li>
 					</ul>
 				</div>
 				<legend>添加抄送人</legend>

protected/view/admin/admin_holidayuser.html

@@ -0,0 +1,110 @@
+<!-- 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><a href="/holidaygroup">审批组</a></li>
+					<li><a href="/hcsgroup">抄送人</a></li>
+					<li class="active"><a href="/holidayadmin">假期管理</a></li>
+				</ul>
+			</div>
+			<div class="control-group">
+				<label class="control-label">假期管理</label>
+				<div class="controls">
+					<p class="cGroup">
+						<!-- if isset({{adminList}}) && !empty({{adminList}}) -->
+						<!-- loop adminList -->
+						<span class="tagGroup">{{adminList' value.username}}<a href="#del" data-toggle="modal" role="button" title="删除" class="icon-" onclick='setdeladmin("{{adminList' value.id}}")'>k</a></span>
+						<!-- endloop -->
+						<!-- endif -->
+					</p>
+					<a href="#pikUser" data-toggle="modal">添加管理人</a>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<!--选择用户-->
+<div class="modal hide fade" id="pikUser">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h3>选择管理人</h3>
+			</div>
+			<form method="post" action="/addholidayadmin" name="group" onsubmit="return checkadmingroup();">
+			<div class="modal-body">
+				<style>.controls > .checkbox{margin-left: 10px}</style>
+				<div class="controls">
+					<!-- loop staffList -->
+					<label class="checkbox inline">
+						<input type="checkbox" name="staff[]" value="{{staffList' value.sid}}:{{staffList' value.username}}"> {{staffList' value.username}}
+					</label>
+					<!-- endloop -->
+				</div>
+			</div>
+			<div class="modal-footer">
+				<div class="fR">
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">取消</a>
+					<button type="submit" class="button">确定添加</button>
+				</div>
+			</div>
+			</form>
+		</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>
+			<form method="post" action="/delholidayadmin">
+				<input type="hidden" name="cidstaff" id="deladmin" value="">
+				<div class="modal-footer">
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+					<button class="button" type="submit">确定</button>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+<!--弹出-->
+
+<script type="text/javascript">autoFlashHeight();</script>
+<script>
+	function checkadmingroup(){
+		if(!$('input').is(":checked")){
+			alert('请选择管理人');
+			return false;
+		}
+	}
+
+	function setdeladmin(id){
+		$('#deladmin').val(id);
+	}
+</script>
+</body>

protected/view/header.html

@@ -9,5 +9,5 @@
 	<script src="<?= WEB_SITE_GLOBAL ?>js/jquery-1.7.2.min.js"></script>
 	<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.infinitescroll.min.js"></script> 
 	<script src="<?= WEB_SITE_GLOBAL ?>js/global.js"></script>
-	<script src="<?= WEB_SITE_GLOBAL ?>js/index.js"></script>
+	<!-- if !isset({{noindexjs}}) --><script src="<?= WEB_SITE_GLOBAL ?>js/index.js?20170316"></script><!-- endif -->
 </head>

protected/view/holiday-allList.html

@@ -1,4 +1,26 @@
 <!-- include 'header' -->
+<style>
+	nav a{
+		padding: 5px 10px;
+		font-size: 12px;
+		line-height: 1.5px;
+		text-decoration:none;
+		color: #8E0950;
+		background-color: #ffffff;
+		border: 1px solid #dddddd;
+		margin-left: -1px;
+	}
+	nav a.current {
+		background: #8E0950;
+		color: #fff;
+		cursor: default;
+	}
+
+	nav a:hover{
+		border-color:#8E0950;
+		z-index: 1
+	}
+</style>
 <body>
 	<div class="mainLayout">
 		<div class="mainMenu">
@@ -36,7 +58,7 @@
 										<td>{{holidaylist' value.typename}}</td>
 										<td>{{holidaylist' value.daymsg}}</td>
 										<td>{{holidaylist' value.daynum}}</td>
-										<!-- if {{holidaylist' value.status}} == 1 --><td class="colGreen">审批通过</td><!-- elseif {{holidaylist' value.status}} == 2 --><td class="colRed">审批不通过</td><!-- else --><th>未审批</th><!-- endif -->
+										<!-- if {{holidaylist' value.status}} == 1 --><td class="colGreen">审批通过</td><!-- elseif {{holidaylist' value.status}} == 2 --><td class="colRed">审批不通过</td><!-- elseif {{holidaylist' value.status}} == 3 --><td>管理员操作</td><!-- else --><td>未审批</td><!-- endif -->
 										<td>{{holidaylist' value.approvetime}}</td>
 									</tr>
 									<!-- endloop -->

protected/view/holiday-borad.html

@@ -45,7 +45,7 @@
 										<td>{{holidaylist' value.typename}}</td>
 										<td>{{holidaylist' value.daymsg}}</td>
 										<td>{{holidaylist' value.daynum}}</td>
-										<!-- if {{holidaylist' value.status}} == 1 --><td class="colGreen">审批通过</td><!-- elseif {{holidaylist' value.status}} == 2 --><td class="colRed">审批不通过</td><!-- else --><th>未审批</th><!-- endif -->
+										<!-- if {{holidaylist' value.status}} == 1 --><td class="colGreen">审批通过</td><!-- elseif {{holidaylist' value.status}} == 2 --><td class="colRed">审批不通过</td><!-- elseif {{holidaylist' value.status}} == 3 --><td>管理员操作</td><!-- else --><td>未审批</td><!-- endif -->
 										<td>{{holidaylist' value.approvetime}}</td>
 									</tr>
 									<!-- endloop -->

protected/view/holiday_menu.html

@@ -0,0 +1,10 @@
+<li class="holidayTitle">假期管理</li>
+<li><a href="/holidayborad" <!-- if {{holidaymenu}} == 'borad' -->class="selected"<!-- endif -->>公布板</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>-->
+<!-- if isset({{cansee}}) && {{cansee}} == 1 -->
+<li class="topLine"><a href="/holidayclose" <!-- if {{holidaymenu}} == 'close' -->class="selected"<!-- endif -->>请假结算</a></li>
+<li><a href="/holidayovertime" <!-- if {{holidaymenu}} == 'overtime' -->class="selected"<!-- endif -->>加班管理</a></li>
+<li><a href="/holidayvacation" <!-- if {{holidaymenu}} == 'vacation' -->class="selected"<!-- endif -->>休假管理</a></li>
+<!-- endif -->

protected/view/login.html

@@ -1,5 +1,5 @@
 <!-- include 'header' -->
-<script src="http://qdgl.ynglzj.com/yn2/api/synlogin/cp123456"></script>
+<!--<script src="http://qdgl.ynglzj.com/yn2/api/synlogin/cp123456"></script>-->
 <body class="loginBg">
 	<div class="loginIndex">
 		<div class="loginPanel {{login}}">