ソースを参照

增加 加班登记 结算登记

Chente 9 年 前
コミット
60979ada00
4 ファイル変更98 行追加13 行削除
  1. 40 2
      holiday-close.html
  2. 40 2
      holiday-close2.html
  3. 10 2
      holiday-overtime.html
  4. 8 7
      holiday-vacation.html

+ 40 - 2
holiday-close.html

@@ -46,7 +46,7 @@
 				</div>
 			</div>
 			<div class="adminContent autoHeight" style="height: 821px;">
-				<legend><div class="fL"></div>请假结算</legend>
+				<legend><div class="fR"><a class="button" href="#addClose" data-toggle="modal">结算登记</a></div>请假结算</legend>
 				<div class="demandCate">
 					<ul class="cateList">
 	  					<li><a href="holiday-close.html" class="now">正式员工</a><a href="holiday-close2.html">实习生</a></li>
@@ -70,6 +70,44 @@
 			</div>
 		</div>
 	</div>
-
+	<!--弹出-->
+<div class="modal hide fade" id="addClose">
+	<div class="modal-dialog ">
+		<div class="modal-content">
+	    <div class="modal-header">
+	    	<h3>休假登记</h3>
+	    </div>
+	    <div class="modal-body saeaList">
+				<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>员工</th><td>
+							<select><option>正式员工</option><option>实习生</option></select> <select><option>办事处</option></select> <select><option>员工</option></select></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>月</th><td>
+								<select><option>2016年12月8日~2017年1月8日</option></select></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>登记类型</th><td>
+							<select><option>上班</option><option>旷工</option><option>事假</option><option>病假</option></select></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>增加天数</th><td><input placeholder="请输入提现天数" type="number"></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100">备注</th><td><textarea class="span4" placeholder="选填"></textarea></td>
+						</tr>
+						</tbody>
+					</table>
+	    </div>
+			<div class="modal-footer">
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">取消</a>
+			   	<a href="#" class="button">确定</a>
+			</div>
+		</div>
+	</div>
+</div>
+    <!--弹出内容-->
 <script type="text/javascript">autoFlashHeight();</script>
 </body>

+ 40 - 2
holiday-close2.html

@@ -46,7 +46,7 @@
 				</div>
 			</div>
 			<div class="adminContent autoHeight" style="height: 821px;">
-				<legend><div class="fL"></div>请假结算</legend>
+				<legend><div class="fR"><a class="button" href="#addClose" data-toggle="modal">结算登记</a></div>请假结算</legend>
 				<div class="demandCate">
 					<ul class="cateList">
 	  					<li><a href="holiday-close.html">正式员工</a><a href="holiday-close2.html" class="now">实习生</a></li>
@@ -69,6 +69,44 @@
 			</div>
 		</div>
 	</div>
-
+	<!--弹出-->
+<div class="modal hide fade" id="addClose">
+	<div class="modal-dialog ">
+		<div class="modal-content">
+	    <div class="modal-header">
+	    	<h3>休假登记</h3>
+	    </div>
+	    <div class="modal-body saeaList">
+				<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>员工</th><td>
+							<select><option>正式员工</option><option>实习生</option></select> <select><option>办事处</option></select> <select><option>员工</option></select></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>月</th><td>
+								<select><option>2016年12月8日~2017年1月8日</option></select></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>登记类型</th><td>
+							<select><option>上班</option><option>旷工</option><option>事假</option><option>病假</option></select></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>增加天数</th><td><input placeholder="请输入提现天数" type="number"></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100">备注</th><td><textarea class="span4" placeholder="选填"></textarea></td>
+						</tr>
+						</tbody>
+					</table>
+	    </div>
+			<div class="modal-footer">
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">取消</a>
+			   	<a href="#" class="button">确定</a>
+			</div>
+		</div>
+	</div>
+</div>
+    <!--弹出内容-->
 <script type="text/javascript">autoFlashHeight();</script>
 </body>

+ 10 - 2
holiday-overtime.html

@@ -81,14 +81,22 @@
 				<table class="table table-bordered table-condensed">
 						<tbody>
 						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>员工</th><td>
+							<select><option>办事处</option></select> <select><option>员工</option></select></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>月</th><td>
+								<select><option>2016年12月8日~2017年1月8日</option></select></td>
+						</tr>
+						<tr>
 							<th class="taC" width="100"><span class="colRed">*</span>登记类型</th><td>
-							<select><option>值班登记</option><option>存假提现</option></select></td>
+							<select><option>值班登记</option><option>加班登记</option><option>存假提现</option></select></td>
 						</tr>
 						<tr>
 							<th class="taC" width="100"><span class="colRed">*</span>值班日期</th><td><input placeholder="请选择值班日期" type="date"></td>
 						</tr>
 						<tr>
-							<th class="taC" width="100"><span class="colRed">*</span>提现天数</th><td><input placeholder="请输入提现天数" type="text"></td>
+							<th class="taC" width="100"><span class="colRed">*</span>提现天数</th><td><input placeholder="请输入提现天数" type="number"></td>
 						</tr>
 						<tr>
 							<th class="taC" width="100">备注</th><td><textarea class="span4" placeholder="选填"></textarea></td>

+ 8 - 7
holiday-vacation.html

@@ -46,7 +46,7 @@
 				</div>
 			</div>
 			<div class="adminContent autoHeight" style="height: 821px;">
-				<legend><div class="fR"></div>休假管理</legend>
+				<legend><div class="fR"><a class="button" href="#addVacation" data-toggle="modal">休假登记</a></div>休假管理</legend>
 				<div class="demandCate">
 					<ul class="cateList">
 						<li><select><option>所有办事处</option></select> <select><option>总部</option></select></li>
@@ -71,24 +71,25 @@
 		</div>
 	</div>
 	<!--弹出-->
-<div class="modal hide fade" id="addOvertime">
+<div class="modal hide fade" id="addVacation">
 	<div class="modal-dialog ">
 		<div class="modal-content">
 	    <div class="modal-header">
-	    	<h3>加班登记</h3>
+	    	<h3>休假登记</h3>
 	    </div>
 	    <div class="modal-body saeaList">
 				<table class="table table-bordered table-condensed">
 						<tbody>
 						<tr>
-							<th class="taC" width="100"><span class="colRed">*</span>登记类型</th><td>
-							<select><option>值班登记</option><option>存假提现</option></select></td>
+							<th class="taC" width="100"><span class="colRed">*</span>员工</th><td>
+							<select><option>办事处</option></select> <select><option>员工</option></select></td>
 						</tr>
 						<tr>
-							<th class="taC" width="100"><span class="colRed">*</span>值班日期</th><td><input placeholder="请选择值班日期" type="date"></td>
+							<th class="taC" width="100"><span class="colRed">*</span>登记类型</th><td>
+							<select><option>年假</option><option>婚假</option><option>产假</option><option>丧假</option><option>工商假</option></select></td>
 						</tr>
 						<tr>
-							<th class="taC" width="100"><span class="colRed">*</span>提现天数</th><td><input placeholder="请输入提现天数" type="text"></td>
+							<th class="taC" width="100"><span class="colRed">*</span>增加天数</th><td><input placeholder="请输入提现天数" type="text"></td>
 						</tr>
 						<tr>
 							<th class="taC" width="100">备注</th><td><textarea class="span4" placeholder="选填"></textarea></td>