outaozhen 6 лет назад
Родитель
Сommit
d6b4e8823e
3 измененных файлов с 53 добавлено и 2 удалено
  1. 2 1
      login.html
  2. 5 1
      staff-employee.html
  3. 46 0
      staff-home.html

+ 2 - 1
login.html

@@ -100,7 +100,8 @@
 							<th class="taC" width="150">毕业时间</th><td><input type="date"></td>
 							<th class="taC" width="150">毕业时间</th><td><input type="date"></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
-							<th class="taC" width="150">最高学历</th><td colspan="3"><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><option>中专</option><option>大专</option><option>本科</option><option>硕士</option></select></td>
+							<th class="taC" width="150">政治面貌</th><td><select><option>群众</option><option>团员</option><option>党员</option></select></td>
 						</tr>
 						</tr>
 					</table>
 					</table>
 					<table class="table table-bordered table-condensed">
 					<table class="table table-bordered table-condensed">

+ 5 - 1
staff-employee.html

@@ -143,7 +143,7 @@
 							<tbody>
 							<tbody>
 							<tr class="thead"><th width="80">工号</th><th>姓名</th><th>手机</th><th>QQ</th><th>办事处/部门</th><th>岗位</th><th>聘用状态</th><th>入职时间</th><th>操作</th></tr>
 							<tr class="thead"><th width="80">工号</th><th>姓名</th><th>手机</th><th>QQ</th><th>办事处/部门</th><th>岗位</th><th>聘用状态</th><th>入职时间</th><th>操作</th></tr>
 							<tr><td>Z0001</td><td><a href="#detail" data-toggle="modal">张三(点我)</a>&nbsp;&nbsp;<span class="colRed">该员工的身份证快到期!</span></td><td>12345678901</td><td>12345678</td><td>总部</td><td>测试</td><td>正式</td><td>2017-05-30</td><td><a href="#do-promotion" data-toggle="modal">晋升</a>&nbsp;<a href="#do-dismiss" data-toggle="modal">离职</a></td></tr>
 							<tr><td>Z0001</td><td><a href="#detail" data-toggle="modal">张三(点我)</a>&nbsp;&nbsp;<span class="colRed">该员工的身份证快到期!</span></td><td>12345678901</td><td>12345678</td><td>总部</td><td>测试</td><td>正式</td><td>2017-05-30</td><td><a href="#do-promotion" data-toggle="modal">晋升</a>&nbsp;<a href="#do-dismiss" data-toggle="modal">离职</a></td></tr>
-							<tr><td>Z0002</td><td><a href="#">王五</a></td><td>12345678901</td><td>12345678</td><td>总部/研究中心</td><td>测试</td><td>试用</td><td>2017-05-30</td><td><a href="#do-hire" data-toggle="modal">转正式</a>&nbsp;<a href="#">离职</a></td></tr>
+							<tr><td>Z0002</td><td><a href="#">王五&nbsp;&nbsp;<span class="colRed">该劳动合同备案快到期!</span></a></td><td>12345678901</td><td>12345678</td><td>总部/研究中心</td><td>测试</td><td>试用</td><td>2017-05-30</td><td><a href="#do-hire" data-toggle="modal">转正式</a>&nbsp;<a href="#">离职</a></td></tr>
 							<tr><td>C001</td><td><a href="#">李四</a></td><td>12345678901</td><td>12345678</td><td>总部</td><td>测试</td><td>实习</td><td>2017-05-30</td><td><a href="#do-probation" data-toggle="modal">转试用</a>&nbsp;<a href="#">离职</a></td></tr>
 							<tr><td>C001</td><td><a href="#">李四</a></td><td>12345678901</td><td>12345678</td><td>总部</td><td>测试</td><td>实习</td><td>2017-05-30</td><td><a href="#do-probation" data-toggle="modal">转试用</a>&nbsp;<a href="#">离职</a></td></tr>
 							<tr><td>C001</td><td><a href="#">李四</a></td><td>12345678901</td><td></td><td>总部</td><td>测试</td><td>实习</td><td>2017-05-30</td><td>待入职</td></tr>
 							<tr><td>C001</td><td><a href="#">李四</a></td><td>12345678901</td><td></td><td>总部</td><td>测试</td><td>实习</td><td>2017-05-30</td><td>待入职</td></tr>
 							<tr><td>C001</td><td><a href="#">李四</a></td><td>12345678901</td><td></td><td>总部</td><td>测试</td><td>实习</td><td>2017-05-30</td><td>待离职</td></tr>
 							<tr><td>C001</td><td><a href="#">李四</a></td><td>12345678901</td><td></td><td>总部</td><td>测试</td><td>实习</td><td>2017-05-30</td><td>待离职</td></tr>
@@ -205,6 +205,10 @@
 							<th class="taC" width="150">手机</th><td><input type="text" value="1234567890"></td>
 							<th class="taC" width="150">手机</th><td><input type="text" value="1234567890"></td>
 						</tr>
 						</tr>
 						<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="date"></td>
+						</tr>
+						<tr>
 							<th class="taC">QQ</th><td><input type="text" value="12345678"></td>
 							<th class="taC">QQ</th><td><input type="text" value="12345678"></td>
 							<th class="taC">微信</th><td><input type="text" value="12345678"></td>
 							<th class="taC">微信</th><td><input type="text" value="12345678"></td>
 						</tr>
 						</tr>

+ 46 - 0
staff-home.html

@@ -81,6 +81,7 @@
 									<tr><td><a href="#">张三</a></td><td>总部</td><td>测试</td><td>申请离职</td><td width="120"><a class="button btn-block" href="#approval2" data-toggle="modal">离职审批</a></td></tr>
 									<tr><td><a href="#">张三</a></td><td>总部</td><td>测试</td><td>申请离职</td><td width="120"><a class="button btn-block" href="#approval2" data-toggle="modal">离职审批</a></td></tr>
 									<tr><td><a href="#">张三</a></td><td>总部</td><td>测试</td><td>晋升申请</td><td width="120"><a class="button btn-block" href="#approval3" data-toggle="modal">晋升审批</a></td></tr>
 									<tr><td><a href="#">张三</a></td><td>总部</td><td>测试</td><td>晋升申请</td><td width="120"><a class="button btn-block" href="#approval3" data-toggle="modal">晋升审批</a></td></tr>
 									<tr><td><a href="#">张三</a></td><td>总部</td><td>测试</td><td>转正申请</td><td width="120"><a class="button btn-block" href="#approval4" data-toggle="modal">转正审批</a></td></tr>
 									<tr><td><a href="#">张三</a></td><td>总部</td><td>测试</td><td>转正申请</td><td width="120"><a class="button btn-block" href="#approval4" data-toggle="modal">转正审批</a></td></tr>
+									<tr><td><a href="#">张三</a></td><td>总部</td><td>测试</td><td>确认离职</td><td width="120"><a class="button btn-block" href="#do-dismiss" data-toggle="modal">确认离职</a></td></tr>
 									</tbody>
 									</tbody>
 								</table>
 								</table>
 							</div>
 							</div>
@@ -153,6 +154,10 @@
 								<th class="taC" width="150">婚姻状况</th><td><select><option>已婚</option><option>未婚</option></select></td>
 								<th class="taC" width="150">婚姻状况</th><td><select><option>已婚</option><option>未婚</option></select></td>
 							</tr>
 							</tr>
 							<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="date"></td>
+							</tr>
+							<tr>
 								<th class="taC" width="150">身份证</th><td><input type="text" value="440476528372638192"></td>
 								<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>
 								<th class="taC" width="150">身份证扫描件</th><td><a href="#" target="_blank">正面(国徽)</a><a href="#" target="_blank">反面(照片)</a></td>
 							</tr>
 							</tr>
@@ -228,6 +233,43 @@
 				</div>
 				</div>
 			</div></div>
 			</div></div>
 	</div>
 	</div>
+	<!--弹出(员工离职)-->
+	<div class="modal hide fade" id="do-dismiss">
+		<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">
+						<tr>
+							<th class="taC" width="100">工号</th><td>Z0001</td>
+						</tr>
+						<tr>
+							<th class="taC" width="100">姓名</th><td>张三</td>
+						</tr>
+						<tr>
+							<th class="taC" width="100">办事处/部门</th><td>总部</td>
+						</tr>
+						<tr>
+							<th class="taC" width="100">岗位</th><td>文员</td>
+						</tr>
+						<tr>
+							<th class="taC" width="100">入职日期</th><td>2013-06-01 <span class="colGray">已入职 40天</span></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100">离职日期</th><td><input type="date"></td>
+						</tr>
+					</table>
+					<p class="alert alert-erro">确认该员工离职。</p>
+				</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 hide fade" id="approval1">
 		<div class="modal-dialog modal-xlg">
 		<div class="modal-dialog modal-xlg">
@@ -271,6 +313,10 @@
 								<th class="taC" width="150">婚姻状况</th><td>未婚</td>
 								<th class="taC" width="150">婚姻状况</th><td>未婚</td>
 							</tr>
 							</tr>
 							<tr>
 							<tr>
+								<th class="taC" width="150">政治面貌</th><td>群众</td>
+								<th class="taC" width="150">劳动合同备案有效期</th><td class="alert-warning"><input type="date"></td>
+							</tr>
+							<tr>
 								<th class="taC" width="150">籍贯</th><td>广东珠海</td>
 								<th class="taC" width="150">籍贯</th><td>广东珠海</td>
 								<th class="taC" width="150">户口所在地</th><td>香洲区XX路XX小区XX号</td>
 								<th class="taC" width="150">户口所在地</th><td>香洲区XX路XX小区XX号</td>
 							</tr>
 							</tr>