假期-人工录入请假信息添加选择时间段

protected/controller/HolidayController.php

@@ -527,12 +527,14 @@ class HolidayController extends DooController {
 			Doo::loadModel('holiday');
 			$holiday = new Holiday();
 			if(in_array($_POST['type'],array(1,2,3))){
+				$daytype = isset($_POST['daytype']) && is_numeric($_POST['daytype']) ? $_POST['daytype'] : 1;
+				$adddaynum = $daytype != 1 ? 0.5 : 1.0;
 				$day = $_POST['day'];
-				$dayjson = array('holiday' => [$day.'_1']);
+				$dayjson = array('holiday' => [$day.'_'.$daytype]);
 				$holiday->uid = $_POST['uid'];
 				$holiday->type = $_POST['type'];
 				$holiday->dayjson = json_encode($dayjson);
-				$holiday->daynum = 1.0;
+				$holiday->daynum = $adddaynum;
 				$holiday->status = 3;
 				$holiday->addtime = time();
 				$holiday->approvetime = time();
@@ -545,7 +547,7 @@ class HolidayController extends DooController {
 				$hday->uid = $_POST['uid'];
 				$hday->type = $_POST['type'];
 				$hday->daytime = $day;
-				$hday->daymsg = 1.0;
+				$hday->daymsg = $adddaynum;
 				$hday->insert();
 				if(isset($_POST['close2'])){
 					return '/holidayclose2';

protected/view/holiday-close.html

@@ -110,6 +110,16 @@
 							<th class="taC" width="100"><span class="colRed">*</span><span id="holidaytype">事假</span>日期</th><td>
 							<input type="date" name="day" id="holidayday"></td>
 						</tr>
+						<tr id="tr_day">
+							<th class="taC" width="100"><span class="colRed">*</span>时间</th>
+							<td>
+								<select name="daytype">
+									<option value="1">全天（1天）</option>
+									<option value="2">上午（0.5天）</option>
+									<option value="3">下午（0.5天）</option>
+								</select>
+							</td>
+						</tr>
 						<tr>
 							<th class="taC" width="100">备注</th><td><textarea class="span4" name="description" placeholder="选填"></textarea></td>
 						</tr>

protected/view/holiday-close2.html

@@ -107,6 +107,16 @@
 							<th class="taC" width="100"><span class="colRed">*</span><span id="holidaytype">事假</span>天数</th><td>
 							<input type="date" name="day" id="holidayday" disabled="true"></td>
 						</tr>
+						<tr id="tr_day" class="changetr" style="display: none">
+							<th class="taC" width="100"><span class="colRed">*</span>时间</th>
+							<td>
+								<select name="daytype">
+									<option value="1">全天（1天）</option>
+									<option value="2">上午（0.5天）</option>
+									<option value="3">下午（0.5天）</option>
+								</select>
+							</td>
+						</tr>
 						<tr id="tr_14" class="changetr">
 							<th class="taC" width="100"><span class="colRed">*</span>上班天数</th>
 							<td>
@@ -147,9 +157,12 @@
 		$('#selecttype').change(function(){
 			$('.changetr').hide();
 			$('.changetr input').attr('disabled',true);
+			$('.changetr select').attr('disabled',true);
 			if($(this).val() != 14){
 				$('#tr_all').show();
 				$('#tr_all input').removeAttr('disabled');
+				$('#tr_day').show();
+				$('#tr_day select').removeAttr('disabled');
 				$('#holidaytype').text($(this).find("option:selected").text());
 			}else{
 				$('#tr_14').show();