holiiday更新3.13

global/css/global.css

@@ -424,6 +424,8 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span
 .modal-body {
   position: relative;
   padding: 15px;
+  max-height: 400px;
+  overflow-y: auto;
 }
 .modal-footer {
   padding: 15px;
@@ -1746,7 +1748,6 @@ a.new-ribbon:before{
 .loginPanel {
   height: 345px;
   width: 296px;
-  color:#fff;
   position: absolute;
   right:20%;
   top:20%
@@ -1757,7 +1758,7 @@ a.new-ribbon:before{
 }
 .loginPanel .warpLogin {
   padding: 20px 0 0 23px;
-  border:1px solid #D1D6CF
+  background:#fff
 }
 .loginPanel h2 {
   font-size: 18px;
@@ -1772,13 +1773,18 @@ a.new-ribbon:before{
   letter-spacing: 1px;
   padding: 1px 1px 1px 6px;
   width: 241px;
-  background:#E2E2E2;
-  color:#8E0950
+  background:#f6f6f6;
+  color:#333
+}
+.loginPanel input.text:focus{
+  background:#fff;
+  color:#8E0950;
 }
 .loginPanel .formLink{
   color:#999;
   text-align:center;
-  background:#D1D6CF
+  background:#f6f6f6;
+  padding:5px 0
 }
 .subMenu{
   background:url(headerbg.png) repeat;
@@ -1821,6 +1827,13 @@ a.new-ribbon:before{
   padding:5px 10px 5px 0;
   text-align:right
 }
+.subMenu li.holidayTitle{
+  color: #fff;
+  background:#FBC02D;
+  margin:0 0 5px 0;
+  padding:5px 10px 5px 0;
+  text-align:right
+}
 .subMenu li a {
   color:#BABABA;
   display: inline-block;
@@ -1889,6 +1902,12 @@ a.new-ribbon:before{
 .borad-menu a.invoice:hover{
   background:#ae6160
 }
+.borad-menu a.holiday{
+  background:#FBC02D
+}
+.borad-menu a.holiday:hover{
+  background:#FDD835
+}
 .borad-news {
   width:960px;
   margin:0 auto
@@ -2254,20 +2273,24 @@ table .taC{
   bottom: 0;
   right:0;
 }
-.seCensor .reportButton a{
+.seCensor .reportButton button{
+  border:none;
+  cursor:pointer;
+}
+.seCensor .reportButton a,.seCensor .reportButton button{
   width:50%;
   float:left;
   text-align:center;
   padding:10px 0;
   color:#fff;
 }
-.reportButton a.buttonDone{
+.reportButton a.buttonDone,.reportButton button.buttonDone{
   background:#7ea85c;
 }
-.reportButton a.buttonDone:hover{
+.reportButton a.buttonDone:hover,.reportButton button.buttonDone:hover{
   background:#4f8e08
 }
-.reportButton a.buttonDone:active{
+.reportButton a.buttonDone:active,.reportButton button.buttonDone:active{
   background:#2a4f00
 }
 .reportButton a.buttonUndone{
@@ -2288,7 +2311,7 @@ table .taC{
 .reportButton a.buttonBack:active{
   background:#e57c01;
 }
-.reportButton a.buttonBlock{
+.reportButton a.buttonBlock,.reportButton button.buttonBlock{
   width: 100%
 }
 .globalNotice{
@@ -3707,3 +3730,24 @@ td div.dlLev3{
 .invoButton a.buttonUndone:active{
   background:#790000;
 }
+
+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
+}

protected/config/routes.conf.php

@@ -361,8 +361,20 @@ $route['*']['/invoicePrintDo'] = array('InvoiceController', 'invoicePrintDo');
 $route['*']['/invoicePost'] = array('InvoiceController', 'invoicePost');
 //假期管理
 $route['*']['/myList'] = array('HolidayController', 'myList');
+$route['*']['/myList/:yearnum'] = array('HolidayController', 'myList');
 $route['*']['/holidaygroup'] = array('AdminController', 'holidayGroup');
 $route['*']['/addholidayapprover'] = array('AdminController', 'addHolidayApprover');
+$route['*']['/delholidaygroup'] = array('AdminController', 'delHolidayGroup');
 $route['*']['/hcsgroup'] = array('AdminController', 'holidayCSGroup');
+$route['*']['/getstaffcategory'] = array('AdminController', 'getStaffCategory');
 $route['*']['/addhcsgroup'] = array('AdminController', 'addHolidayCS');
+$route['*']['/delhcsgroup'] = array('AdminController', 'delHolidayCS');
+
+$route['*']['/holidayborad'] = array('HolidayController', 'holidayBorad');
+$route['*']['/holidayallList'] = array('HolidayController', 'allList');
+$route['*']['/holidayallList/type/:type'] = array('HolidayController', 'allList');
+$route['*']['/holidayallList/page/:pindex'] = array('HolidayController', 'allList');
+$route['*']['/holidayallList/type/:type/page/:pindex'] = array('HolidayController', 'allList');
+
+
 ?>

protected/controller/AdminController.php

@@ -231,9 +231,10 @@ function adduser(){
 
 			$holidaystaff = new HStaff();
 			$holidaystaff->uid = $id;
-			$holidaystaff->yearnum = $nature == 1 ? (time() > strtotime("+ 1 year", strtotime($hiredate)) ? 5 : 0) : 0;
 			$holidaystaff->insert();
 
+			$staffmsg = $staff->getUserById($id);
+			$this->updateAnnualLeave($staffmsg[0]);
 
 			for ($i=1;$i<=7;$i++){
 
@@ -1260,7 +1261,7 @@ function excelTime($date, $time = false)
 		$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));
+		$acmanlist=$acman->find(array('where' => 'type=0', 'desc' => 'id','asArray'=>true));
 
 		$data['acmanlist'] = $acmanlist;
 		$data['staff']=$this->staff;
@@ -1282,22 +1283,181 @@ function excelTime($date, $time = false)
 			array_push($name,$msg[1]);
 			array_push($pinyinname,$msg[2]);
 		}
-		var_dump($idname);
-		var_dump($name);
-		var_dump($pinyinname);
-		exit;
+
 		Doo::loadModel("holidayacman");
 		$acman=new HACMan();
 		$acman->typename = $_POST['title'];
-		var_dump($_POST);
-		exit;
+		$acman->idname = implode(',', $idname);
+		$acman->name = implode(' ', $name);
+		$acman->pinyinname = implode('|', $pinyinname);
+		$acman->type = 0;
+		$result = $acman->insert();
+		if($result){
+			$acman2=new HACMan();
+			$acman2->type = $result;
+			$acman2->insert();
+
+			Doo::loadModel('holidaystaff');
+			foreach($idname as $ik => $iv){
+				$hstaff = new HStaff();
+				$hstaff->uid = $iv;
+				$hstaff->isadmin = 1;
+				$hstaff->update();
+			}
+		}
+		return '/holidaygroup';
+	}
+
+	public function delHolidayGroup(){
+		if(!isset($_POST['approvalid']) || empty($_POST['approvalid']) || !is_numeric($_POST['approvalid'])){
+			exit('审批组id出错');
+		}
+		Doo::loadModel('holidayacman');
+		$acman = new HACMan();
+		$acman->id = $_POST['approvalid'];
+		$acman->delete();
+
+		$acman2 = new HACMan();
+		$acman2->type = $_POST['approvalid'];
+		$acman2->delete();
+
+		return '/holidaygroup';
 	}
 
 	public function holidayCSGroup(){
+		Doo::loadModel('staff');
+		Doo::loadModel('holidayacman');
+		$acman = new HACMan();
+		$staff = new staff();
+
+		$approverlist = $acman->find(array('where' => 'type=0', 'desc' => 'id', 'asArray' => TRUE));
+		if(!empty($approverlist)){
+			foreach($approverlist as $k => $v){
+				$csman = $acman->getOne(array('where' => 'type='.$v['id'], 'asArray' => TRUE));
+				if(!empty($csman['name'])){
+					$idname = explode(',',$csman['idname']);
+					$name = explode(' ',$csman['name']);
+					$pinyinname = explode('|',$csman['pinyinname']);
+					$csmsg = array();
+					foreach($idname as $ik => $iv){
+						$csmsg[$ik]['csidname'] = $iv;
+						$csmsg[$ik]['csname'] = $name[$ik];
+						$csmsg[$ik]['cspinyinname'] = $pinyinname[$ik];
+					}
+					$approverlist[$k]['csmsg'] = $csmsg;
+				}
+			}
+			$data['approverlist'] = $approverlist;
+		}
+
+		//获取总部人员列表
+		$zongbu = $staff->getStaffByCid(12);
+		$data['zongbu'] = $zongbu;
+
+		//获取办事处列表
+		Doo::loadModel('L_category');
+		$L_category = new L_category();
+		$data['category']=$L_category->getCategory();
+
+
 		$data['memu'] = 'holiday';
 		$this->render( "/admin/admin_holidayGroup_cc", $data );
 	}
 
+	public function getStaffCategory(){
+		if(isset($_POST['cid']) && is_numeric($_POST['cid'])){
+			Doo::loadModel('staff');
+			$staff = new staff();
+			$stafflist = $staff->getStaffByCid($_POST['cid']);
+			exit(json_encode(array('code' => 200, 'stafflist' => $stafflist)));
+		}
+		exit(json_encode(array('code' => 400)));
+	}
+
+	public function addHolidayCS(){
+		if(!isset($_POST['approvalid']) || empty($_POST['approvalid']) || !is_numeric($_POST['approvalid'])){
+			exit('审批组出错');
+		}
+		if(!isset($_POST['cidstaff']) || empty($_POST['cidstaff'])){
+			exit('抄送人出错');
+		}
+		$cidstaff = explode(':',$_POST['cidstaff']);
+
+		Doo::loadModel('holidayacman');
+		$acman = new HACMan();
+		$csmsg = $acman->getOne(array('where' => 'type='.$_POST['approvalid'], 'asArray' => TRUE));
+		$csidmsg = !empty($csmsg['idname']) ? $csmsg['idname'].','.$cidstaff[0] : $cidstaff[0];
+		$csnamemsg = !empty($csmsg['name']) ? $csmsg['name'].' '.$cidstaff[1] : $cidstaff[1];
+		$cspinyinnamemsg = !empty($csmsg['pinyinname']) ? $csmsg['pinyinname'].'|'.$cidstaff[2] : $cidstaff[2];
+
+		$acman->id = $csmsg['id'];
+		$acman->idname = $csidmsg;
+		$acman->name = $csnamemsg;
+		$acman->pinyinname = $cspinyinnamemsg;
+		$acman->update();
+
+		return '/hcsgroup';
+	}
+
+	public function delHolidayCS(){
+		if(!isset($_POST['approvalid']) || empty($_POST['approvalid']) || !is_numeric($_POST['approvalid'])){
+			exit('审批id出错');
+		}
+		if(!isset($_POST['cidstaff']) || empty($_POST['cidstaff'])){
+			exit('抄送信息出错');
+		}
+		$cidstaff = explode(':',$_POST['cidstaff']);
+
+		Doo::loadModel('holidayacman');
+		$acman = new HACMan();
+		$csmsg = $acman->getOne(array('where' => 'type='.$_POST['approvalid'], 'asArray' => TRUE));
+		if(!empty($csmsg['idname'])){
+			$idnamearr = explode(',', $csmsg['idname']);
+			foreach($idnamearr as $ik => $iv){
+				if($iv == $cidstaff[0]){
+					unset($idnamearr[$ik]);
+					break;
+				}
+			}
+			$csidmsg = implode(',',$idnamearr);
+		}
+		if(!empty($csmsg['name'])){
+			$namearr = explode(' ', $csmsg['name']);
+			foreach($namearr as $nk => $nv){
+				if($nv == $cidstaff[1]){
+					unset($namearr[$nk]);
+					break;
+				}
+			}
+			$csnamemsg = implode(' ',$namearr);
+		}
+		if(!empty($csmsg['pinyinname'])){
+			$pinyinnamearr = explode('|', $csmsg['pinyinname']);
+			foreach($pinyinnamearr as $pk => $pv){
+				if($pv == $cidstaff[2]){
+					unset($pinyinnamearr[$pk]);
+					break;
+				}
+			}
+			$cspinyinnamemsg = implode('|',$pinyinnamearr);
+		}
+
+		$acman->id = $csmsg['id'];
+		if(isset($csidmsg)){
+			$acman->idname = $csidmsg;
+		}
+		if(isset($csnamemsg)){
+			$acman->name = $csnamemsg;
+		}
+		if(isset($cspinyinnamemsg)){
+			$acman->pinyinname = $cspinyinnamemsg;
+		}
+		$acman->update();
+
+		return '/hcsgroup';
+	}
+
+
 	//检查年假是否过期并更新年假
 	private function updateAnnualLeave($staff){
 		Doo::loadModel('holidaystaff');

protected/controller/HolidayController.php

@@ -7,8 +7,6 @@
 class HolidayController extends DooController {
 
 	public $staff;
-	public static $NEW = 0;
-	public static $NEW2 = 0;
 
 	function __construct() {
 		if(isset($_COOKIE["staff"])){
@@ -16,11 +14,7 @@ class HolidayController extends DooController {
 				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 "/";
 			}
 		}
@@ -36,35 +30,201 @@ class HolidayController extends DooController {
 	}
 
 	public function myList(){
+		Doo::loadModel('holidayday');
+		$hday = new HDay();
+		$thisyear = date('Y',1572624000);
+		$num = intval($thisyear)-2017;
+		$html = '';
+		for($i = $num; $i >= 0; $i--){
+			$html .= '<option value="'.(2017+$i).'">'.(2017+$i).'</option>';
+		}
+		$data['option'] = $html;
+		$yeartime = isset($this->params['yearnum']) && is_numeric($this->params['yearnum']) ? $this->getYearMonthTime($this->params['yearnum']) : $this->getYearMonthTime($thisyear);
+		$holidaymsg = array('shijia'=> array(), 'bingjia' => array(), 'jiaban' => array(), 'zhiban' => array(), 'buxiu' => array(), 'tiaoxiu' => array());
+		foreach(array(1,2,4,5,10,11) as $k => $v){
+			
+		}
+
 		$data ['memu'] = 'holiday';
 		$data ['holidaymenu'] = 'mylist';
 		$data ['staff'] = $this->staff;
 		$this->render ( "/holiday-myList", $data );
 	}
 
-	private function getReceiptCount(){
+	public function holidayBorad(){
+		Doo::loadModel('holiday');
+		Doo::loadModel('holidayday');
+		Doo::loadModel('holidaystaff');
+		Doo::loadModel('holidaytype');
+		$lastmonthstart = strtotime(date("Y-m-01",strtotime("last month")));
+		$lastmonthend = strtotime(date('Y-m-01',time()))-1;
+		$data['countmonth'] = date("Y年m月",strtotime("last month"));
+
+		$holiday = new Holiday();
+		$hday  = new HDay();
+		$hstaff = new HStaff();
+		$type = new HType();
+
+		$holidaycount =array();
+		foreach(array(1,2,4,5) as $k => $v){
+			$typeholiday = $hday->find(array('where' => 'type='.$v.' and uid='.$this->staff[0]['sid'].' and UNIX_TIMESTAMP(daytime) between '.$lastmonthstart.' and '.$lastmonthend,'asArray' => TRUE));
+			$holidaycount[$k] = 0;
+			if(!empty($typeholiday)){
+				foreach($typeholiday as $tk => $tv){
+					$holidaycount[$k] += floatval($tv['daymsg']);
+				}
+			}
+		}
 
-		$status=2;
-		$year=date('Y');
+		$hstaffmsg = $hstaff->getOne(array('where' => 'uid='.$this->staff[0]['sid'], 'asArray' => TRUE));
+		$holidaycount[4] = floatval($hstaffmsg['yearnum']);
+		$holidaycount[5] = floatval($hstaffmsg['addnum']);
+
+		$data['holidaycount'] = $holidaycount;
+
+		$holidaymsg = $holiday->find(array('where' => 'uid='.$this->staff[0]['sid'], 'limit' => 3, 'desc' => 'id', 'asArray' => TRUE));
+		if(!empty($holidaymsg)){
+			foreach($holidaymsg as $k => $v){
+				$holidaymsg[$k]['typename'] = $type->getTypeNamebyid($v['type']);
+				$holidaymsg[$k]['daynum'] = floatval($v['daynum']);
+				$holidaymsg[$k]['approvetime'] = !empty($v['approvetime']) ? date('Y-m-d H:i:s',$v['approvetime']) : '';
+				$msg = '';
+				if(in_array($v['type'],array(1,2,3,4,5,10,11,12))){
+					$dayjson = json_decode($v['dayjson']);
+					if($v['type'] != 11){
+						$holidaydays = $this->geyDayMsg($dayjson->holiday);
+						foreach($holidaydays as $hk => $hv){
+							$msg .= $hv['daytime'].' '.$hv['daymsg'].',';
+						}
+						$msg = substr($msg,0,strlen($msg)-1);
+					}else{
+						$msg .= '休假时间：';
+						$holidaydays = $this->geyDayMsg($dayjson->holiday);
+						foreach($holidaydays as $hk => $hv){
+							$msg .= $hv['daytime'].' '.$hv['daymsg'].',';
+						}
+						$msg = substr($msg,0,strlen($msg)-1);
+						$msg .= '
+加班时间：';
+						$overtimedays = $this->geyDayMsg($dayjson->overtime);
+						foreach($overtimedays as $ok => $ov){
+							$msg .= $ov['daytime'].' '.$ov['daymsg'].',';
+						}
+						$msg = substr($msg,0,strlen($msg)-1);
+					}
+				}else{
+					$msg .= $v['starttime']. ' 至 '.$v['endtime'];
+				}
+				$holidaymsg[$k]['daymsg'] = $msg;
+			}
+			$data['holidaylist'] = $holidaymsg;
+		}
 
-		Doo::loadModel('receipt');
-		$receipt=new receipt();
+		$data ['memu'] = 'holiday';
+		$data ['holidaymenu'] = 'borad';
+		$data ['staff'] = $this->staff;
+		$this->render ( "/holiday-borad", $data );
+	}
 
-		$dateCondition=" and Year(date) =".$year;
+	public function allList(){
+		Doo::loadModel('holiday');
+		Doo::loadModel('holidaytype');
+		$holiday = new Holiday();
+		$type = new HType();
+		if(isset($this->params['type'])){
+			if($this->params['type'] == 4 ){//加班、值班
+				$sql = ' and (type=4 or type=5)';
+			}elseif($this->params['type'] == 6){//其他长假
+				$sql = ' and type in(6,7,8,9)';
+			}else{
+				$sql = ' and type='.$this->params['type'];
+			}
+			$pagemsg = '/type/'.$this->params['type'];
+			$data['thistype'] = $this->params['type'];
+		}else{
+			$sql = '';
+			$pagemsg = '';
+			$data['thistype'] = '';
+		}
 
-		$approvalCondition=' and nowStaff like "%'.$this->staff[0]['sid'].'%" ';
-		$receiptList=$receipt->find(array('where'=>' status='.$status.$dateCondition.$approvalCondition,'desc'=>'rid','asArray'=>true));
+		Doo::loadHelper('DooPager');
+		$totalArchive = $holiday->count(array('where' => 'uid='.$this->staff[0]['sid'].$sql, 'asArray' => TRUE));
+		$pager = new DooPager(Doo::conf()->APP_URL . "holidayallList".$pagemsg."/page", $totalArchive, 10, 10);
+		if (isset($this->params['pindex']))
+			$pager->paginate(intval($this->params['pindex']));
+		else
+			$pager->paginate(1);
+		if ($pager->limit != ' -10,10')
+			$holidaymsg = $holiday->find(array('where' => 'uid='.$this->staff[0]['sid'].$sql, 'limit' => $pager->limit, 'desc' => 'id', 'asArray' => TRUE));
+		if(isset($holidaymsg) && !empty($holidaymsg)){
+			foreach($holidaymsg as $k => $v){
+				$holidaymsg[$k]['typename'] = $type->getTypeNamebyid($v['type']);
+				$holidaymsg[$k]['daynum'] = floatval($v['daynum']);
+				$holidaymsg[$k]['approvetime'] = !empty($v['approvetime']) ? date('Y-m-d H:i:s',$v['approvetime']) : '';
+				$msg = '';
+				if(in_array($v['type'],array(1,2,3,4,5,10,11,12))){
+					$dayjson = json_decode($v['dayjson']);
+					if($v['type'] != 11){
+						$holidaydays = $this->geyDayMsg($dayjson->holiday);
+						foreach($holidaydays as $hk => $hv){
+							$msg .= $hv['daytime'].' '.$hv['daymsg'].',';
+						}
+						$msg = substr($msg,0,strlen($msg)-1);
+					}else{
+						$msg .= '休假时间：';
+						$holidaydays = $this->geyDayMsg($dayjson->holiday);
+						foreach($holidaydays as $hk => $hv){
+							$msg .= $hv['daytime'].' '.$hv['daymsg'].',';
+						}
+						$msg = substr($msg,0,strlen($msg)-1);
+						$msg .= '<br>加班时间：';
+						$overtimedays = $this->geyDayMsg($dayjson->overtime);
+						foreach($overtimedays as $ok => $ov){
+							$msg .= $ov['daytime'].' '.$ov['daymsg'].',';
+						}
+						$msg = substr($msg,0,strlen($msg)-1);
+					}
+				}else{
+					$msg .= $v['starttime']. ' 至 '.$v['endtime'];
+				}
+				$holidaymsg[$k]['daymsg'] = $msg;
+			}
+			$data['holidaylist'] = $holidaymsg;
+		}
+		$data['pager'] = $pager->output;
+		$data ['memu'] = 'holiday';
+		$data ['holidaymenu'] = 'borad';
+		$data ['staff'] = $this->staff;
+		$this->render ( "/holiday-allList", $data );
+	}
 
-		return count($receiptList);
+	private function geyDayMsg($dayjson){
+		$holidayday = array();
+		foreach($dayjson as $dk => $dv){
+			$oneday = explode('_',$dv);
+			if($oneday[1] != 0){
+				$holidayday[$dk]['daytime'] = $oneday[0];
+				$holidayday[$dk]['daymsg'] = $oneday[1] == 1 ? '' : ($oneday[1] == 2 ? '上午' : '下午');
+			}
+		}
+		return $holidayday;
 	}
 
-	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);
+	//获取本年的每个月的时间戳
+	private function getYearMonthTime($thisyear){
+		$monthdata = array();
+		for($i = 0; $i < 12; $i++){
+			$j = $i+1;
+			$j = $j < 10 ? '0'.$j : $j;
+			$nowmonth = $thisyear.'-'.$j.'-01';
+			$monthdata[$i]['starttime'] = strtotime($nowmonth);
+			$monthdata[$i]['endtime'] = strtotime("+1 months", strtotime($nowmonth))-1;
+		}
+
+		return $monthdata;
 	}
+
 }
 
 ?>

protected/view/admin/admin_holidayGroup.html

@@ -69,7 +69,7 @@
                 <tr>
                   <td>{{acmanlist' value.typename}}</td>
                   <td>{{acmanlist' value.name}}</td>
-                  <td><a href="#del" data-toggle="modal">删除审批组</a></td>
+                  <td><a href="#del" data-toggle="modal" onclick='delapprovalid("{{acmanlist' value.id}}")'>删除审批组</a></td>
                 </tr>
 			  <!-- endloop -->
 			  <!-- endif -->
@@ -90,10 +90,13 @@
     <div class="modal-body">
     	<p>删除后，正在使用该审批组的费用审批将不受影响，可继续审批。</p>
     </div>
+		<form method="post" action="/delholidaygroup">
+			<input type="hidden" id="delapporval" name="approvalid" value="">
 	<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>
+	    <button class="button" type="submit">确定</button>
 	</div>
+		</form>
 </div>
 </div>
 </div>
@@ -110,6 +113,11 @@
 			return false;
 		}
 	}
+
+	function delapprovalid(id){
+		$('#delapporval').val(id);
+	}
+
 	$(function(){
 		$('.controls label').live('click',function(e){
 			if($(e.target).is('label')){

protected/view/admin/admin_holidayGroup_cc.html

@@ -1,22 +1,11 @@
-<!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>
+<!-- include 'header' -->
 <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>
+					<!-- include 'menu' -->
 				</ul>
 			</div>
 		</div>
@@ -24,50 +13,46 @@
 			<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>
+						<!-- include 'admin_menu' -->
 					</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>
+						<li><a href="/holidaygroup">审批组</a></li>
+						<li class="active"><a href="/hcsgroup">抄送人</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>
+				<legend>添加抄送人</legend>
+				<table class="table table-striped">
+					<thead>
+					<tr>
+						<th>组描述</th>
+						<th>成员</th>
+						<th>抄送人</th>
+						<th>审批组操作</th>
+					</tr>
+					</thead>
+					<tbody>
+					<!-- if isset({{approverlist}}) && !empty({{approverlist}}) -->
+					<!-- loop approverlist -->
+					<tr>
+						<td>{{approverlist' value.typename}}</td>
+						<td>{{approverlist' value.name}}</td>
+						<td>
+							<!-- if isset({{approverlist' value.csmsg}}) && !empty({{approverlist' value.csmsg}}) -->
+							<!-- loop approverlist' value.csmsg -->
+							{{approverlsit' csmsg' value.csname}}<a href="#del" onclick='delapproval("{{approverlist' value.id}}","{{approverlsit' csmsg' value.csidname}}:{{approverlsit' csmsg' value.csname}}:{{approverlsit' csmsg' value.cspinyinname}}")' data-toggle="modal" role="button" title="删除" class="icon-">k</a> &nbsp;
+							<!-- endloop -->
+							<!-- endif -->
+						</td>
+						<td><a href="#add" data-toggle="modal" onclick="setapproval('{{approverlist' value.id}}')">添加抄送人</a></td>
+					</tr>
+					<!-- endloop -->
+					<!-- endif -->
+					</tbody>
+				</table>
 			</div>
 		</div>
 	</div>
@@ -79,27 +64,29 @@
     <div class="modal-header">
     <h3>添加抄送人</h3>
     </div>
+		<form method="post" action="/addhcsgroup">
+			<input type="hidden" name="approvalid" id="approvalid" value="">
     <div class="modal-body">
     	<div class="control-group">
     		<div class="controls">
-			    <select style="width:190px">
-			    	<option>总部</option>
-			    	<option>广东办</option>
+			    <select style="width:190px" id="category">
+					<!-- loop category -->
+			    	<option value="{{category' value.cid}}" <!-- if {{category' value.cid}} == 12 -->selected<!-- endif -->>{{category' value.title}}</option>
+					<!-- endloop -->
 			    </select>
-			    <select style="width:190px">
-			    	<option>陈帅</option>
-			    	<option>陈帅</option>
-			    	<option>陈帅</option>
-			    	<option>陈帅</option>
-			    	<option>陈帅</option>
+			    <select style="width:190px" id="cidstaff" name="cidstaff">
+					<!-- loop zongbu -->
+			    	<option value="{{zongbu' value.sid}}:{{zongbu' value.username}}:{{zongbu' value.wxid}}">{{zongbu' value.username}}</option>
+			    	<!-- endloop -->
 			    </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>
+	    <button class="button" type="submit">确定</button>
 	</div>
+		</form>
 </div>
 </div>
 </div>
@@ -115,13 +102,49 @@
     <div class="modal-body">
     	<p>删除后，正在使用该审批组的假期审批将不受影响，可继续接收抄送通知。</p>
     </div>
+		<form method="post" action="/delhcsgroup">
+			<input type="hidden" name="approvalid" id="approvalid2" value="">
+			<input type="hidden" name="cidstaff" id="delcsstaff" value="">
 	<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>
+	    <button class="button" type="submit">确定</button>
 	</div>
+		</form>
 </div>
 </div>
 </div>
 <!--弹出-->
 <script type="text/javascript">autoFlashHeight();</script>
+<script>
+	$(function(){
+		$('#category').change(function(){
+			$.ajax({
+				type: 'post',
+				url: '/getstaffcategory',
+				data: {cid:$(this).val()},
+				dataType: 'json',
+				success: function(result){
+					if(result.code == 200){
+						$('#cidstaff').html('');
+						var html = '';
+						$.each(result.stafflist,function(k,v){
+							html +='<option value="'+v.sid+':'+v.username+':'+v.wxid+'">'+v.username+'</option>';
+						})
+						$('#cidstaff').html(html);
+					}
+				}
+			})
+		})
+	});
+
+	function setapproval(id){
+		$('#approvalid').val(id);
+	}
+
+	function delapproval(id,csstaff){
+		$('#approvalid2').val(id);
+		$('#delcsstaff').val(csstaff);
+	}
+
+</script>
 </body>

protected/view/holiday-borad.html

@@ -0,0 +1,66 @@
+<!-- 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 'holiday_menu' -->
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<div class="saea-borad">
+					<div class="borad-menu">
+						<a href="invoice-addn.html" class="holiday">请假申请</a>
+					</div>
+					<div class="borad-news">
+						<div class="saeaList">
+							<div class="clearfix">
+								<table class="table table-bordered table-condensed">
+									<tbody>
+									<tr><th class="taC" colspan="6">{{countmonth}}</th></tr>
+									<tr><th class="taC" width="120">事假</th><td>{{holidaycount.0}}</td><th class="taC" width="120">加班</th><td>{{holidaycount.2}}</td><th class="taC" width="120">年假（可用）</th><td>{{holidaycount.4}}</td></tr>
+									<tr><th class="taC">病假</th><td>{{holidaycount.1}}</td><th class="taC">值班</th><td>{{holidaycount.3}}</td><th class="taC">存假（可用）</th><td>{{holidaycount.5}}</td></tr>
+									<tr><th class="taC">旷工</th><td>0</td><th class="taC"> </th><td> </td><th class="taC"> </th><td> </td></tr>
+									</tbody>
+								</table>
+							</div>
+							<div class="clearfix">
+								<legend><!-- if isset({{holidaylist}}) --><div class="fR"><a href="/holidayallList">查看更多</a></div><!-- endif -->最近请假</legend>
+								<!-- if isset({{holidaylist}}) -->
+								<table class="table table-bordered table-condensed">
+									<tbody>
+									<tr><th class="taC">类型</th><th class="taC">申请日期</th><th class="taC" width="90">合计天数</th><th class="taC">状态</th><th class="taC">审批时间</th></tr>
+									<!-- loop holidaylist -->
+									<tr>
+										<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 -->
+										<td>{{holidaylist' value.approvetime}}</td>
+									</tr>
+									<!-- endloop -->
+									</tbody>
+								</table>
+								<!-- else -->
+								<blockquote><p class="colGray">暂时没有请假申请 </p></blockquote>
+								<!-- endif -->
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

protected/view/holiday-myList.html

@@ -5,7 +5,7 @@
 		<div class="menuItem">
 			<a href="#" class="mLogo">CLD</a>
 			<ul>
-				<!-- include 'menuHoliday' -->
+				<!-- include 'menu' -->
 			</ul>
 		</div>
 	</div>
@@ -21,7 +21,7 @@
 			<legend><div class="fL"></div>我的假期</legend>
 			<div class="demandCate">
 				<ul class="cateList">
-					<li><select><option>2016年</option><option>2017年</option></select></li>
+					<li><select>{{option}}</select></li>
 				</ul>
 			</div>
 			<div class="saeaList">

protected/view/holiday_menu.html

@@ -1,8 +1,8 @@
 <li class="holidayTitle">假期管理</li>
-<li><a href="holiday-borad.html">公布板</a></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>
+<!--<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/menuHoliday.html

@@ -1,4 +1,4 @@
-<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="信息中心" 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>
@@ -6,14 +6,12 @@
 <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" class="topLine <!-- if  getGlobals('NEW2') !=0 ||  getGlobals('NEW') !=0 --> news <!-- endif --> " data-toggle="ctooltip" data-original-title="费用管理" ><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="假期管理">
+<li style="display:none" 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" >
+<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>
-<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>
+<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>