人资管理首页完善弹出框和个人信息页增加相应的时间

admin-user.html

@@ -83,8 +83,8 @@
                   <th>手机</th>
                   <th>APP登录</th>
                   <th>入职时间</th>
-                  <th>实习时间</th>
                   <th>转正时间</th>
+                  <th>离职时间</th>
                   <th>单点登录</th>
                   <th>操作</th>
                 </tr>
@@ -99,7 +99,7 @@
                   <td>2014-11-20 12:32</td>
                   <td>2015-01-20 12:32</td>
                   <td>2015-04-20 12:32</td>
-                  <td>2014-11-20</td>
+                  <td>2016-11-20</td>
                   <td><span class="colGreen">建筑造价（正常）</span></td>
                   <td><a href="admin-user-edit.html">编辑</a>/<a href="#">删除</a></td>
                 </tr>
@@ -112,7 +112,7 @@
                   <td>2014-11-20 12:32</td>
                   <td>2015-01-20 12:32</td>
                   <td>2015-04-20 12:32</td>
-                  <td>2014-11-20</td>
+                  <td>2016-11-20</td>
                   <td><span class="colGreen">建筑造价（正常）</span></td>
                   <td><a href="#">编辑</a>/<a href="#">删除</a></td>
                 </tr>
@@ -125,7 +125,7 @@
                   <td>2014-11-20 12:32</td>
                   <td>2015-01-20 12:32</td>
                   <td>2015-04-20 12:32</td>
-                  <td>2014-11-20</td>
+                  <td>2016-11-20</td>
                   <td><span class="colRed">建筑造价（禁止）</span></td>
                   <td><a href="#">编辑</a>/<a href="#">删除</a></td>
                 </tr>

staff-home.html

@@ -86,6 +86,125 @@
 			</div>
 		</div>
 	</div>
+
+	<!--弹出（员工详情）-->
+	<div class="modal hide fade" id="detail">
+		<div class="modal-dialog modal-xlg">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>员工详情</h3>
+				</div>
+				<div class="modal-body saeaList" style="overflow:hidden;margin:0">
+					<div class="fL staff-detail-con">
+						<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th class="taC" width="150">工号</th><td width="210">Z0001</td>
+							<th class="taC" width="150">姓名</th><td><input type="text" value="张三"></td>
+						</tr>
+						<tr>
+							<th class="taC" width="150">办事处/部门</th><td><select><option>总部</option><option>总部-研究中心</option><option>广东办</option></select></td>
+							<th class="taC" width="150">岗位</th><td><input type="text" value="程序员"></td>
+						</tr>
+						<tr>
+							<th class="taC" width="150">入职日期</th><td><input type="date"></td>
+							<th class="taC" width="150">手机</th><td><input type="text" value="1234567890"></td>
+						</tr>
+						<tr>
+							<th class="taC">QQ</th><td><input type="text" value="12345678"></td>
+							<th class="taC">微信</th><td><input type="text" value="12345678"></td>
+						</tr>
+						<tr>
+							<th class="taC">电话</th><td><input type="text" value="12345678"></td>
+							<th class="taC">邮箱</th><td><input type="text" value="12345678"></td>
+						</tr>
+						</tbody>
+					</table>
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th class="taC" width="150">性别</th><td width="210"><label class="radio inline"><input type="radio">男</label> <label class="radio inline"><input type="radio">女</label></td>
+								<th class="taC" width="150">出生日期</th><td><input type="date"></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">最高学历</th><td><select><option>初中</option><option>高中</option><option>中专</option><option>大专</option><option>本科</option><option>硕士</option></select></td>
+								<th class="taC" width="150">婚姻状况</th><td><select><option>已婚</option><option>未婚</option></select></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">身份证</th><td><input type="text" value="440476528372638192"></td>
+								<th class="taC" width="150">身份证扫描件</th><td><a href="#" target="_blank">正面（国徽）</a><a href="#" target="_blank">反面（照片）</a></td>
+							</tr>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th class="taC" width="150">毕业证书</th><td width="210"><a href="#" target="_blank">毕业证书</a></td>
+								<th class="taC" width="150">学位证书</th><td><a href="#" target="_blank">学位证书</a></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">职称</th><td colspan="3"><a href="#" target="_blank">证书1</a> <a href="#" target="#">证书2</a></td>
+							</tr>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th class="taC" width="150">现居住地</th><td colspan="3"><input type="text" style="width:500px"></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">籍贯</th><td width="210"><input type="text"></td>
+								<th class="taC" width="150">紧急联系人</th><td><input type="text"></td>
+							</tr>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th class="taC" width="150">汇款人户名</th><td width="210"><input type="text"></td>
+								<th class="taC" width="150">汇款银行</th><td><select><option>其他</option><option>公司广发</option></select></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">汇款开户银行名称</th><td width="210"><input type="text"></td>
+								<th class="taC" width="150">汇款帐号</th><td><input type="text"></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">联行号</th><td colspan="3"><input type="text"></td>
+							</tr>
+						</table>
+					</div>
+					<div class="fL staff-detail-side">
+						<!-- <div class="infoFlowList">
+						 <div class="dateTitle">
+							 <em class="month"><span class="num">12</span><span class="text">-03</span></em>
+							 <span class="year">2013</span>
+						 </div>
+						 <ul class="flowList">
+							 <li class="item colGray">总部-何银龄</li>
+							 <li class="item">审批通过</li>
+						 </ul>
+						</div> -->
+						<div class="infoFlowList">
+						 <div class="dateTitle">
+							 <em class="month"><span class="num">12</span><span class="text">-03</span></em>
+							 <span class="year">2013</span>
+						 </div>
+						 <ul class="flowList">
+							 <li class="item colGray">总部-张三</li>
+							 <li class="item">申请入职</li>
+						 </ul>
+						</div>
+						<div class="infoFlowList">
+						 <div class="dateTitle">
+							 <em class="month"><span class="num">12</span><span class="text">-02</span></em>
+							 <span class="year">2013</span>
+						 </div>
+						 <ul class="flowList">
+							 <li class="item colGray">总部-温秀娟</li>
+							 <li class="item">添加员工</li>
+						 </ul>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button">确定</a>
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
+	</div>
 	<!--弹出（审批员工入职）-->
 	<div class="modal hide fade" id="approval1">
 		<div class="modal-dialog modal-xlg">

staff-set-approval.html

@@ -367,6 +367,10 @@
 				               <input type="checkbox" name="staff[]" value="69:李建霞:/global/avatar/avatar_69">李建霞			               </label>
 				               			               <label style="display:inline">
 				               <input type="checkbox" name="staff[]" value="71:杨孟雅:/global/avatar/avatar_71">杨孟雅			               </label>
+				               <label class="control-label">已选审批人</label>
+				               <div class="controls colRed">
+						    			陈帅 &gt; 谭玉堂 &gt; 会计（赵淑燕）
+				              </div>
 			            	</div>
 	    </div>
 			<div class="modal-footer">
@@ -384,14 +388,18 @@
 	    	<h3>设置入职抄送</h3>
 	    </div>
 	    <div class="modal-body saeaList">
-	    	<div class="modal-title">
-	    		<label style="display:inline">
-	    			<input type="radio" name="exampleRadios" value="" checked>所有人员
-	    		</label>
-	    		<label style="display:inline">
-	    			<input type="radio" name="exampleRadios" value="">办事处
-	    		</label>
-	    	</div>
+	    	<div class="modal-title">勾选办事处选中该办事处成员</div>
+	    	<div class="controls">
+				              			               <label style="display:inline">
+				               <input type="checkbox" name="staff[]" value="1:admin:/global/img/avtra" checked>总部			               </label>
+				               			               <label style="display:inline">
+				               <input type="checkbox" name="staff[]" value="2:陈帅:/global/avatar/avatar_2" checked>广东办			               </label>
+				               			               <label style="display:inline">
+				               <input type="checkbox" name="staff[]" value="3:范月光:/global/avatar/avatar_3">安徽办	               </label>
+				               			               <label style="display:inline">
+				               <input type="checkbox" name="staff[]" value="4:王涛:/global/avatar/avatar_4">甘肃办			               </label>
+			            	</div>
+			  <div class="modal-title">打勾为抄送对象</div>          	
 				<div class="controls">
 				              			               <label style="display:inline">
 				               <input type="checkbox" name="staff[]" value="1:admin:/global/img/avtra">admin			               </label>
@@ -510,35 +518,6 @@
 				               			               <label style="display:inline">
 				               <input type="checkbox" name="staff[]" value="71:杨孟雅:/global/avatar/avatar_71">杨孟雅			               </label>
 			            	</div>
-				<div class="modal-title">
-	    		<label style="display:inline">
-	    			<input type="radio" name="exampleRadios1" value="">所有人员
-	    		</label>
-	    		<label style="display:inline">
-	    			<input type="radio" name="exampleRadios1" value="" checked>所有办事处
-	    		</label>
-	    	</div>
-			  <div class="controls">
-				  <label style="display:inline">
-				    <input type="checkbox" name="staff[]" value="1:admin:/global/img/avtra" checked>总部			               
-				  </label>
-				  <label style="display:inline">
-				    <input type="checkbox" name="staff[]" value="2:陈帅:/global/avatar/avatar_2">广东办			
-				  </label>
-				  <label style="display:inline">
-				    <input type="checkbox" name="staff[]" value="3:范月光:/global/avatar/avatar_3">甘肃办	
-				  </label>
-			  </div>
-			  <div class="controls">
-				              			               <label style="display:inline">
-				               <input type="checkbox" name="staff[]" value="1:admin:/global/img/avtra" checked>admin			               </label>
-				               			               <label style="display:inline">
-				               <input type="checkbox" name="staff[]" value="2:陈帅:/global/avatar/avatar_2" checked>陈帅			               </label>
-				               			               <label style="display:inline">
-				               <input type="checkbox" name="staff[]" value="3:范月光:/global/avatar/avatar_3" checked>范月光			               </label>
-				               			               <label style="display:inline">
-				               <input type="checkbox" name="staff[]" value="4:王涛:/global/avatar/avatar_4" checked>王涛			               </label>
-			            	</div>
 	    </div>
 			<div class="modal-footer">
 				<a href="#" class="button">确定</a>