Home Explore Help
Sign In
caipin
/
cld
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

添加加值班登记天数选择

likeku 7 years ago
parent
da25d9862a
commit
92529aa393
3 changed files with 46 additions and 7 deletions
Split View Show Diff Stats
  1. 7 5
      protected/controller/HolidayController.php
  2. 22 2
      protected/view/holiday-allList2.html
  3. 17 0
      protected/view/holiday-overtime.html

+ 7 - 5
protected/controller/HolidayController.php
View File 

@@ -708,17 +708,19 @@ class HolidayController extends DooController {
 
 			$holiday = new Holiday();
 
 			$hstaff = new HStaff();
 
 			$hstaffmsg = $hstaff->getOne(array('where' => 'uid='.$_POST['uid'], 'asArray' => TRUE));
 
-			if($_POST['type'] == 4 || $_POST['type'] == 5){
 
+			if(($_POST['type'] == 4 || $_POST['type'] == 5) && isset($_POST['daytype']) && is_numeric($_POST['daytype'])){
 
 				$day = $_POST['day'];
 
 				$hstaff->uid = $_POST['uid'];
 
-				$hstaff->addnum = floatval($hstaffmsg['addnum'])+1;
 
+				$daytype = $_POST['daytype'];
 
+				$adddaynum = $daytype != 1 ? 0.5 : 1.0;
 
+				$hstaff->addnum = floatval($hstaffmsg['addnum'])+$adddaynum;
 
 				$result = $hstaff->update();
 
 				if($result){
 
-					$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();
 
@@ -731,7 +733,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();
 
 
 					return '/holidayovertime';

+ 22 - 2
protected/view/holiday-allList2.html
View File 

@@ -3,9 +3,18 @@
 
 <script src="<?= WEB_SITE_GLOBAL ?>js/datepicker.min.js"></script>
 
 <script src="<?= WEB_SITE_GLOBAL ?>js/datepicker.zh.js"></script>
 
 <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 {
 
-		border-color: #8E0950;
 
-		background-color: #8E0950;
 
+		background: #8E0950;
 
 		color: #fff;
 
 		cursor: default;
 
 	}
 
@@ -14,6 +23,17 @@
 
 		border-color:#8E0950;
 
 		z-index: 1
 
 	}
 
+	/*nav a.current {*/
 
+		/*border-color: #8E0950;*/
 
+		/*background-color: #8E0950;*/
 
+		/*color: #fff;*/
 
+		/*cursor: default;*/
 
+	/*}*/
 
+
 
+	/*nav a:hover{*/
 
+		/*border-color:#8E0950;*/
 
+		/*z-index: 1*/
 
+	/*}*/
 
 </style>
 
 <body>
 
 <div class="mainLayout">

+ 17 - 0
protected/view/holiday-overtime.html
View File 

@@ -124,6 +124,16 @@
 
 				<tr id="tr_13" class="changetr" style="display: none">
 
 					<th class="taC" width="100"><span class="colRed">*</span>提现天数</th><td><input id="tixian" name="tixian" placeholder="请输入提现天数" type="number" step="0.5" disabled="true"></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>
 
@@ -193,6 +203,13 @@
 
 			$('.changetr input').attr('disabled',true);
 
 			$('#tr_'+$(this).val()).show();
 
 			$('#tr_'+$(this).val()+' input').removeAttr('disabled');
 
+			if($(this).val() == 13){
 
+				$('#tr_day').hide();
 
+				$('#tr_day').find('select').attr('disabled',true);
 
+			}else{
 
+				$('#tr_day').show();
 
+				$('#tr_day').find('select').removeAttr('disabled');
 
+			}
 
 		})
 
 	});