Преглед на файлове

假期管理首次提交

Chente преди 9 години
родител
ревизия
2bcf7e0993
променени са 12 файла, в които са добавени 765 реда и са изтрити 36 реда
  1. 33 10
      css/global.css
  2. BIN
      css/loginbg.jpg
  3. 115 0
      holiday-allList.html
  4. 106 0
      holiday-borad.html
  5. 75 0
      holiday-close.html
  6. 74 0
      holiday-close2.html
  7. 107 0
      holiday-myList.html
  8. 108 0
      holiday-overtime.html
  9. 108 0
      holiday-vacation.html
  10. 2 2
      saea-reportList-history.html
  11. 19 14
      saea-reportList-pay.html
  12. 18 10
      saea-reportList-report.html

+ 33 - 10
css/global.css

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

BIN
css/loginbg.jpg


+ 115 - 0
holiday-allList.html

@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表>
+	<link rel="shortcut icon" href="images/favicon.ico">
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/global.css>
+  <link rel=stylesheet href=css/fixedheadertable.css>
+	<script src=js/jquery-1.7.1.min.js></script>
+	<script src=js/global.js></script>
+  <script src=js/jquery.fixedheadertable.js></script>
+</head>
+<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="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon-">Z</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理"><a href="#" class="icon- selected">X</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="holidayTitle">假期管理</li>
+						<li><a href="holiday-borad.html" class="selected">公布板</a></li>
+						<li><a href="holiday-myList.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>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<legend><div class="fL"></div>所有请假</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+							<li><a href="#" class="now">所有</a><a href="#">事假</a><a href="#">病假</a><a href="#">补休</a><a href="#">调休</a><a href="#">年假</a><a href="#">加/值班</a><a href="#">其他</a></li>
+	  					<li><select><option>2016年</option><option>2017年</option></select></li>
+	  			</ul>
+	  		</div>
+	  		<div class="saeaList">
+	  			<div class="entry">
+						<table class="table table-bordered table-condensed">
+									<tbody>
+									<tr><th class="taC">类型</th><th class="taC">开始日期</th><th class="taC">结束日期</th><th class="taC" width="90">合计天数</th><th class="taC">状态</th><th class="taC">审批时间</th></tr>
+									<tr>
+										<td>病假</td>
+										<td>2017年1月1日</td>
+										<td>2017年1月1日</td>
+										<td>1</td>
+										<td class="colGreen">审批通过</td>
+										<td>2016-03-03 11:30:03</td>
+									</tr>
+									<tr>
+										<td>事假</td>
+										<td>2017年1月1日</td>
+										<td>2017年1月1日</td>
+										<td>1</td>
+										<td class="colRed">审批不通过</td>
+										<td>2016-03-03 11:30:03</td>
+									</tr>
+									<tr>
+										<td>年假</td>
+										<td>2017年1月1日</td>
+										<td>2017年1月3日</td>
+										<td>3</td>
+										<td class="colGreen">审批通过</td>
+										<td>2016-03-03 11:30:03</td>
+									</tr>
+									</tbody>
+								</table>
+								<ul class="pagination fR">
+											<li><a href="#" title="上一页">&lt;</a></li>
+											<li class="active"><a href="#">1</a></li>
+											<li><a href="#">2</a></li>
+											<li><a href="#">3</a></li>
+											<li><a href="#">4</a></li>
+											<li><a href="#">5</a></li>
+											<li class="point"><span>...</span></li>
+											<li><a href="#" title="下一页">&gt;</a></li>
+								</ul>
+								<ul class="pagination fR">
+											<li><a href="#" title="上一页">&lt;</a></li>
+											<li><a href="#">1</a></li>
+											<li class="point"><span>...</span></li>
+											<li><a href="#">3</a></li>
+											<li><a href="#">4</a></li>
+											<li class="active"><a href="#">5</a></li>
+											<li><a href="#">6</a></li>
+											<li><a href="#">7</a></li>
+											<li class="point"><span>...</span></li>
+											<li><a href="#" title="下一页">&gt;</a></li>
+								</ul>
+	  			</div>
+			</div>
+		</div>
+	</div>
+
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

+ 106 - 0
holiday-borad.html

@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表>
+	<link rel="shortcut icon" href="images/favicon.ico">
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/global.css>
+  <link rel=stylesheet href=css/fixedheadertable.css>
+	<script src=js/jquery-1.7.1.min.js></script>
+	<script src=js/global.js></script>
+  <script src=js/jquery.fixedheadertable.js></script>
+</head>
+<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="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon-">Z</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理"><a href="#" class="icon- selected">X</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="holidayTitle">假期管理</li>
+						<li><a href="holiday-borad.html" class="selected">公布板</a></li>
+						<li><a href="holiday-myList.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>
+					</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">2017年2月8日~2017年3月8日</th></tr>
+									<tr><th class="taC" width="120">事假</th><td>0</td><th class="taC" width="120">加班</th><td>0</td><th class="taC" width="120">年假(可用)</th><td>0</td></tr>
+									<tr><th class="taC">病假</th><td>0</td><th class="taC">值班</th><td>0</td><th class="taC">存假(可用)</th><td>0</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><div class="fR"><a href="holiday-allList.html">查看更多</a></div>最近请假</legend>
+								<table class="table table-bordered table-condensed">
+									<tbody>
+									<tr><th class="taC">类型</th><th class="taC">开始日期</th><th class="taC">结束日期</th><th class="taC" width="90">合计天数</th><th class="taC">状态</th><th class="taC">审批时间</th></tr>
+									<tr>
+										<td>病假</td>
+										<td>2017年1月1日</td>
+										<td>2017年1月1日</td>
+										<td>1</td>
+										<td class="colGreen">审批通过</td>
+										<td>2016-03-03 11:30:03</td>
+									</tr>
+									<tr>
+										<td>事假</td>
+										<td>2017年1月1日</td>
+										<td>2017年1月1日</td>
+										<td>1</td>
+										<td class="colRed">审批不通过</td>
+										<td>2016-03-03 11:30:03</td>
+									</tr>
+									<tr>
+										<td>年假</td>
+										<td>2017年1月1日</td>
+										<td>2017年1月3日</td>
+										<td>3</td>
+										<td class="colGreen">审批通过</td>
+										<td>2016-03-03 11:30:03</td>
+									</tr>
+									</tbody>
+								</table>
+								<blockquote><p class="colGray">暂时没有请假申请 </p></blockquote>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

+ 75 - 0
holiday-close.html

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表>
+	<link rel="shortcut icon" href="images/favicon.ico">
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/global.css>
+  <link rel=stylesheet href=css/fixedheadertable.css>
+	<script src=js/jquery-1.7.1.min.js></script>
+	<script src=js/global.js></script>
+  <script src=js/jquery.fixedheadertable.js></script>
+</head>
+<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="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon-">Z</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理"><a href="#" class="icon- selected">X</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="holidayTitle">假期管理</li>
+						<li><a href="holiday-borad.html">公布板</a></li>
+						<li><a href="holiday-myList.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" class="selected">请假结算</a></li>
+						<li><a href="holiday-overtime.html">加班管理</a></li>
+						<li><a href="holiday-vacation.html">休假管理</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<legend><div class="fL"></div>请假结算</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+	  					<li><a href="holiday-close.html" class="now">正式员工</a><a href="holiday-close2.html">实习生</a></li>
+	  					<li><select><option>2016年12月8日~2017年1月8日</option><option>2017年1月8日~2017年2月8日</option></select></li>
+	  			</ul>
+	  		</div>
+	  		<div class="saeaList">
+	  			<div class="entry">
+	  				<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+								<tr><th class="taC" width="50"></th><th class="taC">员工</th><th class="taC">事假</th><th class="taC">病假</th><th class="taC">旷工</th></tr>
+								<tr><th rowspan="6">总部</th><th>陈特</th><td class="taC"></td><td class="taC">1</td><td class="taC"></td></tr>
+								<tr><th>王丰</th><td class="taC">2</td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>蔡频</th><td class="taC">1</td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>任杰</th><td class="taC">2</td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>欧桃珍</th><td class="taC">3</td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>赖国然</th><td class="taC">1</td><td class="taC"></td><td class="taC"></td></tr>
+							</tobdy>
+	  				</table>
+	  			</div>
+			</div>
+		</div>
+	</div>
+
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

+ 74 - 0
holiday-close2.html

@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表>
+	<link rel="shortcut icon" href="images/favicon.ico">
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/global.css>
+  <link rel=stylesheet href=css/fixedheadertable.css>
+	<script src=js/jquery-1.7.1.min.js></script>
+	<script src=js/global.js></script>
+  <script src=js/jquery.fixedheadertable.js></script>
+</head>
+<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="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon-">Z</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理"><a href="#" class="icon- selected">X</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="holidayTitle">假期管理</li>
+						<li><a href="holiday-borad.html">公布板</a></li>
+						<li><a href="holiday-myList.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" class="selected">请假结算</a></li>
+						<li><a href="holiday-overtime.html">加班管理</a></li>
+						<li><a href="holiday-overtime.html">休假管理</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<legend><div class="fL"></div>请假结算</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+	  					<li><a href="holiday-close.html">正式员工</a><a href="holiday-close2.html" class="now">实习生</a></li>
+							<li><select><option>2016年12月8日~2017年1月8日</option><option>2017年1月8日~2017年2月8日</option></select></li>
+	  			</ul>
+	  		</div>
+	  		<div class="saeaList">
+	  			<div class="entry">
+	  				<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+								<tr><th class="taC" width="50"></th><th class="taC">实习生</th><th class="taC">上班</th><th class="taC">事假</th><th class="taC">旷工</th></tr>
+								<tr><th rowspan="1">总部</th><th>杨彩莲</th><td class="taC">19</td><td class="taC">1</td><td class="taC"></td></tr>
+								<tr><th rowspan="4">广东办</th><th>杨朱颖</th><td class="taC">19</td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>黄俊杰</th><td class="taC">19</td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>陈其宇</th><td class="taC">19</td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>赖超锋</th><td class="taC">19</td><td class="taC"></td><td class="taC"></td></tr>
+							</tobdy>
+	  				</table>
+	  			</div>
+			</div>
+		</div>
+	</div>
+
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

Файловите разлики са ограничени, защото са твърде много
+ 107 - 0
holiday-myList.html


Файловите разлики са ограничени, защото са твърде много
+ 108 - 0
holiday-overtime.html


+ 108 - 0
holiday-vacation.html

@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表>
+	<link rel="shortcut icon" href="images/favicon.ico">
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/global.css>
+  <link rel=stylesheet href=css/fixedheadertable.css>
+	<script src=js/jquery-1.7.1.min.js></script>
+	<script src=js/global.js></script>
+  <script src=js/jquery.fixedheadertable.js></script>
+</head>
+<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="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon-">Z</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理"><a href="#" class="icon- selected">X</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="holidayTitle">假期管理</li>
+						<li><a href="holiday-borad.html">公布板</a></li>
+						<li><a href="holiday-myList.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" class="selected">休假管理</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<legend><div class="fR"></div>休假管理</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+						<li><select><option>所有办事处</option></select> <select><option>总部</option></select></li>
+						<li><select><option>2016年12月8日~2017年1月8日</option><option>2017年1月8日~2017年2月8日</option></select></li>
+	  			</ul>
+	  		</div>
+	  		<div class="saeaList">
+	  			<div class="entry">
+	  				<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+								<tr><th class="taC" width="50"></th><th class="taC">员工</th><th class="taC">年假周期</th><th class="taC">年假<sub>(可用)</sub></th><th class="taC">婚假<sub>(可用)</th><th class="taC">产假<sub>(可用)</th><th class="taC">存假<sub>(可用)</th><th class="taC">丧假<sub>(可用)</th><th class="taC">工伤假<sub>(可用)</th></tr>
+								<tr><th rowspan="6">总部</th><th>陈特</th><td class="taC">2016-01-01~2017-01-01</td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>王丰</th><td class="taC">2016-01-01~2017-01-01</td><td class="taC"></td><td class="taC">4</td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>蔡频</th><td class="taC">2016-01-01~2017-01-01</td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>任杰</th><td class="taC">2016-01-01~2017-01-01</td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>欧桃珍</th><td class="taC">2016-01-01~2017-01-01</td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td></tr>
+								<tr><th>赖国然</th><td class="taC">2016-01-01~2017-01-01</td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td><td class="taC"></td></tr>
+							</tobdy>
+	  				</table>
+	  			</div>
+			</div>
+		</div>
+	</div>
+	<!--弹出-->
+<div class="modal hide fade" id="addOvertime">
+	<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></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>
+						</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>

+ 2 - 2
saea-reportList-history.html

@@ -38,8 +38,8 @@
 						<li><a href="saea-borad.html">公布板</a></li>
 						<li><a href="saea-borad.html">公布板</a></li>
 						<li><a href="saea-myList.html">我的费用</a></li>
 						<li><a href="saea-myList.html">我的费用</a></li>
 						<li><a href="saea-slist-1.html">费用汇总</a></li>
 						<li><a href="saea-slist-1.html">费用汇总</a></li>
-						<li class="topLine"><a href="saea-reportList.html" class="selected">费用审批</a></li>
-						<li><a href="saea-reportList-pay.html">费用执行</a></li>
+						<li class="topLine"><a href="saea-reportList.html">费用审批</a></li>
+						<li><a href="saea-reportList-pay.html" class="selected">费用执行</a></li>
 						<li><a href="saea-dlist-category-year.html">公司汇总</a></li>
 						<li><a href="saea-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 					</ul>
 				</div>
 				</div>

+ 19 - 14
saea-reportList-pay.html

@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
-<html lang=zh-cn> 
+<html lang=zh-cn>
 <head>
 <head>
-	<meta charset=utf-8> 
-	<title>CLD.System</title> 
-	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表> 
-	<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> 
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表>
+	<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>
 	<script src=js/global.js></script>
 </head>
 </head>
 <body>
 <body>
@@ -107,7 +107,7 @@
 								</ul>
 								</ul>
 							</div>
 							</div>
 							<div class="reportButton">
 							<div class="reportButton">
-								<a href="" class="buttonDone buttonBlock">执行完成</a>
+								<button href="" class="buttonDone buttonBlock">执行完成</button>
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
@@ -237,7 +237,7 @@
 							<table class="table table-bordered table-condensed table-hover">
 							<table class="table table-bordered table-condensed table-hover">
 								<tbody>
 								<tbody>
 								<tr><td colspan="2" >费用审批完成:2016-01-01</td></tr>
 								<tr><td colspan="2" >费用审批完成:2016-01-01</td></tr>
-								<tr><th colspan="2" class="taC">借款费用</th></tr>
+								<tr><th colspan="2" class="taC">备用金费用</th></tr>
 								<tr><th>办公费用</th><td  width="140" class="taR">¥3000.00</td></tr>
 								<tr><th>办公费用</th><td  width="140" class="taR">¥3000.00</td></tr>
 								<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 								<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 								<tr><th style="text-align:center" colspan="2">广东办</th></tr>
 								<tr><th style="text-align:center" colspan="2">广东办</th></tr>
@@ -270,12 +270,17 @@
 								<th class="taC" colspan="2">费用说明</th>
 								<th class="taC" colspan="2">费用说明</th>
 								<tr><td colspan="2">这是费用说明的内容</td></tr>
 								<tr><td colspan="2">这是费用说明的内容</td></tr>
 								<tr class="warning"><td class="taR"><b>(#J1402130405003)本次费用合计</b></td><td class="taR"><b style="font-size:24px">¥2050.00</b><br>贰仟零伍拾元整</td></tr>
 								<tr class="warning"><td class="taR"><b>(#J1402130405003)本次费用合计</b></td><td class="taR"><b style="font-size:24px">¥2050.00</b><br>贰仟零伍拾元整</td></tr>
-								<tr class="error"><td class="taR"><b>借款结余</b></td><td class="taR"><b style="font-size:24px">¥-950.00</b><br>玖佰零伍拾元整</td></tr>
-								<tr class="success"><td class="taR"><b>借款结余</b></td><td class="taR"><b style="font-size:24px">¥950.00</b><br>玖佰零伍拾元整</td></tr>
 								</tbody>
 								</tbody>
 							</table>
 							</table>
 							<br>
 							<br>
 							<table class="table table-bordered table-condensed table-hover">
 							<table class="table table-bordered table-condensed table-hover">
+								<tr><th colspan="3" class="taC">借款结余</th></tr>
+								<tr><td class="taR"><b>(#G1402130405003)申请借款</b></td><td class="taR"><b style="font-size:24px">¥3000.00</b><br>贰仟零伍拾元整</td></tr>
+								<tr><td class="taR"><b>(#J1402130405003)借款报销</b></td><td class="taR"><b style="font-size:24px">¥2050.00</b><br>玖佰零伍拾元整</td></tr>
+								<tr class="error"><td class="taR"><b>费用差额</b></td><td class="taR"><b style="font-size:24px">¥950.00</b><br>玖佰零伍拾元整</td></tr>
+							</table>
+							<br>
+							<table class="table table-bordered table-condensed table-hover">
 								<tbody>
 								<tbody>
 								<tr><th colspan="3" class="taC">汇款信息</th></tr>
 								<tr><th colspan="3" class="taC">汇款信息</th></tr>
 								<tr><td>刘飞</td><td>广发银行</td><td>8376 4739 5873 6252 731</td></tr>
 								<tr><td>刘飞</td><td>广发银行</td><td>8376 4739 5873 6252 731</td></tr>
@@ -321,5 +326,5 @@
 		</div>
 		</div>
 	</div>
 	</div>
 
 
-<script type="text/javascript">autoFlashHeight();</script>	
-</body>
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

+ 18 - 10
saea-reportList-report.html

@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
-<html lang=zh-cn> 
+<html lang=zh-cn>
 <head>
 <head>
-	<meta charset=utf-8> 
-	<title>CLD.System</title> 
-	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表> 
-	<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> 
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表>
+	<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>
 	<script src=js/global.js></script>
 </head>
 </head>
 <body>
 <body>
@@ -430,6 +430,14 @@
 							<tr class="warning"><td class="taR"><b>(#J1402130405003)本次费用合计</b></td><td class="taR"><b style="font-size:24px">¥2050.00</b><br>贰仟零伍拾元整</td></tr>
 							<tr class="warning"><td class="taR"><b>(#J1402130405003)本次费用合计</b></td><td class="taR"><b style="font-size:24px">¥2050.00</b><br>贰仟零伍拾元整</td></tr>
 							</tbody>
 							</tbody>
 						</table>
 						</table>
+						<br>
+						<table class="table table-bordered table-condensed table-hover">
+							<tr><th colspan="3" class="taC">备用金结余</th></tr>
+							<tr><td class="taR"><b>(#G1402130405003)申请借款</b></td><td class="taR"><b style="font-size:24px">¥3000.00</b><br>贰仟零伍拾元整</td></tr>
+							<tr><td class="taR"><b>(#J1402130405003)借款报销</b></td><td class="taR"><b style="font-size:24px">¥2050.00</b><br>玖佰零伍拾元整</td></tr>
+							<tr class="error"><td class="taR"><b>费用差额</b></td><td class="taR"><b style="font-size:24px">¥950.00</b><br>玖佰零伍拾元整</td></tr>
+						</table>
+						<br>
 					</div>
 					</div>
 					<div class="seCensor loan-censor">
 					<div class="seCensor loan-censor">
 						<div class="title">
 						<div class="title">
@@ -523,5 +531,5 @@
 			</div>
 			</div>
 		</div>
 		</div>
 	</div>
 	</div>
-<script type="text/javascript">autoFlashHeight();</script>	
-</body>
+<script type="text/javascript">autoFlashHeight();</script>
+</body>