3.29 显示假期管理

protected/controller/HolidayController.php

@@ -697,7 +697,7 @@ class HolidayController extends DooController {
 					$cidstafflist = $staff->getStaffByCid($v['cid']);
 					foreach($cidstafflist as $ck => $cv){
 						$hstaffmsg = $hstaff->getOne(array('where' => 'uid='.$cv['sid'], 'asArray' => TRUE));
-						$cidstafflist[$ck]['yearnum'] = $hstaffmsg['yearnum'] != 0.0 ? floatval($hstaffmsg['yearnum']) : '';
+						$cidstafflist[$ck]['yearnum'] = $cv['nature'] == 1 ? ($hstaffmsg['yearnum'] != 0.0 ? floatval($hstaffmsg['yearnum']) : '') : '';
 						$cidstafflist[$ck]['addnum'] = $hstaffmsg['addnum'] != 0.0 ? floatval($hstaffmsg['addnum']) : '';
 						$cidstafflist[$ck]['hunjianum'] = $hstaffmsg['hunjianum'] != 0.0 ? floatval($hstaffmsg['hunjianum']) : '';
 						$cidstafflist[$ck]['chanjianum'] = $hstaffmsg['chanjianum'] != 0.0 ? floatval($hstaffmsg['chanjianum']) : '';
@@ -717,7 +717,7 @@ class HolidayController extends DooController {
 				$cidstafflist = $staff->getStaffByCid($v['cid']);
 				foreach($cidstafflist as $ck => $cv){
 					$hstaffmsg = $hstaff->getOne(array('where' => 'uid='.$cv['sid'], 'asArray' => TRUE));
-					$cidstafflist[$ck]['yearnum'] = $hstaffmsg['yearnum'] != 0.0 ? floatval($hstaffmsg['yearnum']) : '';
+					$cidstafflist[$ck]['yearnum'] = $cv['nature'] == 1 ? ($hstaffmsg['yearnum'] != 0.0 ? floatval($hstaffmsg['yearnum']) : '') : '';
 					$cidstafflist[$ck]['addnum'] = $hstaffmsg['addnum'] != 0.0 ? floatval($hstaffmsg['addnum']) : '';
 					$cidstafflist[$ck]['hunjianum'] = $hstaffmsg['hunjianum'] != 0.0 ? floatval($hstaffmsg['hunjianum']) : '';
 					$cidstafflist[$ck]['chanjianum'] = $hstaffmsg['chanjianum'] != 0.0 ? floatval($hstaffmsg['chanjianum']) : '';
@@ -858,7 +858,8 @@ class HolidayController extends DooController {
 		$date = date('d', strtotime($hiredate));
 		$monthday = intval($month).'月'.intval($date).'日';
 		$year = date('Y',time());
-		if(date('Y',(strtotime($hiredate)+(86400*365*$hadyear))) < $year){
+		//每隔4年加一天
+		if(date('Y',(strtotime($hiredate)+(86400*365*$hadyear)+intval($hadyear/4)*86400)) < $year){
 			$lastyear = intval($year)-1;
 			return intval($lastyear).'年'.$monthday.'~'.intval($year).'年'.$monthday;
 		}else{

protected/view/admin/menuReceipt.html

@@ -9,7 +9,7 @@
 <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 style="display:none" data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
+<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>