人资增加侧栏组织选择，开票增加批量开票的个人和培训班选择

admin-myinfo.html

@@ -64,7 +64,7 @@
 						</tr>
 						<tr>
 							<th class="taC" width="150"><b class="colRed">* </b>入职日期</th><td><input type="date" disabled></td>
-							<th class="taC" width="150"><b class="colRed">* </b>手机</th><td><input type="text" value="1234567890"></td>
+							<th class="taC" width="150"><b class="colRed">* </b>手机</th><td><input type="text" value="1234567890"><a class="button btn-green  btn-block btn-binding" href="#binding" data-toggle="modal">绑定</a><!-- <a class="button btn-green  btn-block btn-binding" href="#binding" data-toggle="modal">更换</a> --></td>
 						</tr>
 						<tr>
 							<th class="taC"><b class="colRed">* </b>QQ</th><td><input type="text" value="12345678"></td>
@@ -212,7 +212,7 @@
 							<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>
+							<th class="taC" width="150">联行号</th><td colspan="3" class="tipFather"><input type="text">&nbsp;<span class="tipGray">?</span><div class="tipContent tipConactive"><p>1.如不是公司广发，务必填上银行联行号</p><p>2.如不清楚银行联行号请咨询报销查款专用 QQ：2870766094</p></div></td>
 						</tr>
 					</table>
 					<table class="table table-bordered table-condensed">
@@ -269,6 +269,32 @@
 			</div>
 		</div>
 	</div>
+	<!--弹出绑定-->
+	<div class="modal hide fade" id="binding">
+		<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="150">你需要绑定的手机号</th><td width="260"><input type="text" value="1234567890"></td>
+							</tr>
+							<th class="taC" width="150">填写验证码</th><td width="260"><input type="text" placeholder="验证码是6位数字"><a class="button btn-green  btn-block btn-binding" style="width: 100px;" href="#">获取验证码</a></td>
+							</tr>
+						</tbody>
+					</table>
+					<!-- <p class="alert alert-">发送验证码到“1234567890”，请查收！</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="globalNotice-staff">
 		<div class="entry clearfix">

css/global.css

@@ -3838,6 +3838,7 @@ td div.dlLev3{
   padding:10px 0;
 }
 .tipGray{
+  font-weight: bold;
   padding:0px 5px;
   cursor:pointer;
   background:#f00;
@@ -3871,4 +3872,10 @@ td div.dlLev3{
 .versionTabale tr th,.versionTabale tr td{
   padding:8px 15px;
   border-bottom: 1px solid #f1f1f1;
+}
+.btn-binding{
+  margin:0 0 0 5px;
+  width:60px;
+  height:26px;
+  line-height: 26px;
 }

invoice-approval-detail.html

@@ -59,6 +59,9 @@
 						</legend>
 						<table class="table table-bordered table-condensed">
 							<tbody>
+								<tr>
+								<th class="taC" width="150">开票信息</th><td colspan="3">2018XXXX培训班</td>
+							</tr>
 							<tr>
 								<th class="taC" width="150">开票流水号</th><td>#F20160316001</td>
 								<th class="taC" width="150">提交时间</th><td>2016-03-01 12:30:01</td>

invoice-batch.html

@@ -425,6 +425,7 @@
 		</div>
 		<div class="modal-body saeaList">
 			<table class="table table-bordered table-condensed">
+				<tr><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"></td></tr>
 				<tr><th class="taC" width="150">所在办事处</th><td><select><option>重庆办</option></select></td></tr>
 				<tr><th class="taC" width="150">开班时间</th><td><input type="date"></td></tr>

login.html

@@ -40,7 +40,7 @@
 					<input type="password" class="text">
 				</div>
 				<div class="formLine clearfix">
-					<a href="#welcome" data-toggle="modal" class="button">登录</a><span class="submitSus"></span>
+					<a href="#welcome" data-toggle="modal" class="button">登录</a>&nbsp;&nbsp;<a href="#forget" data-toggle="modal">忘记密码</a><span class="submitSus"></span>
 				</div>
 				</form>
 			</div>
@@ -129,4 +129,21 @@
 				</div>
 			</div></div>
 	</div>
+	<!--弹出（忘记密码）-->
+	<div class="modal hide fade" id="forget">
+		<div class="modal-dialog modal-lg">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>忘记密码</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<p class="alert alert-">发送验证码到“1234567890”，请查收！</p>
+					<p class="alert alert-">你没有绑定手机号！</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>
 </body>

staff-employee.html

@@ -55,98 +55,127 @@
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
-				<legend>员工列表</legend>
-				<div class="demandCate">
-					<ul class="cateList">
-						<li>
-							<select class="select">
-								<option>在职</option>
-								<option>离职</option>
-								<option>全部</option>
-							</select>
-						</li>
-						<li>
-							<select class="select">
-								<option>全部</option>
-								<option>正式</option>
-								<option>试用</option>
-								<option>实习</option>
-							</select>
-						</li>
-						<li>
-							<select class="select">
-								<option>所有岗位</option>
-								<option>开发员</option>
-								<option>销售助理</option>
-								<option>销售</option>
-							</select>
-						</li>
-						<li>
-							<select class="select">
-								<option>所有组织</option>
-								<option>总部</option>
-								<option>总部-研究中心</option>
-								<option>广东办</option>
-							</select>
-						</li>
-						<li>
-							<div class="search">
-								<div class="input-append">
-									<input class="span3" placeholder="姓名、工号" type="text" style="width:100px">
-									<button class="btn btn-small" type="button">搜索</button>
+				<div class="librarySide">
+					<div class="sideMnav">
+						<ul class="navLeve0 autoHeight">
+							<li class="title"><h3>组织列表</h3></li>
+							<li><span>所有组织</span>
+							<li><span>总部</span>
+							<li><span>总部-研究中心</span><!-- <span class="icon- fR">a</span> --></li>
+							<li><span>总部-总经办</span></li>
+							<li><span>总部-财务部</span></li>
+							<li><span>总部-研发部</span></li>
+							<li><span>总部-测试与技术支持部</span></li>
+							<li><span>总部-综合管理部</span></li>
+							<li><span>甘肃办</span></li>
+							<li><span>广东办</span></li>
+							<li><span>内蒙办</span></li>
+							<li><span>浙江办</span></li>
+							<li><span>安徽办</span></li>
+							<li><span>江西办</span></li>
+							<li><span>四川办</span></li>
+							<li><span>广西办</span></li>
+							<li><span>湖南办</span></li>
+							<li><span>山东办</span></li>
+							<li><span>重庆办</span></li>
+						</ul>
+					</div>
+				</div>
+				<div class="libraryContent adminContent autoHeight">
+					<legend>员工列表</legend>
+					<div class="demandCate">
+						<ul class="cateList">
+							<li>
+								<select class="select">
+									<option>在职</option>
+									<option>离职</option>
+									<option>全部</option>
+								</select>
+							</li>
+							<li>
+								<select class="select">
+									<option>全部</option>
+									<option>正式</option>
+									<option>试用</option>
+									<option>实习</option>
+								</select>
+							</li>
+							<li>
+								<select class="select">
+									<option>所有岗位</option>
+									<option>开发员</option>
+									<option>销售助理</option>
+									<option>销售</option>
+								</select>
+							</li>
+							<!-- <li>
+								<select class="select">
+									<option>所有组织</option>
+									<option>总部</option>
+									<option>总部-研究中心</option>
+									<option>广东办</option>
+								</select>
+							</li> -->
+							<li>
+								<div class="search">
+									<div class="input-append">
+										<input class="span3" placeholder="姓名、工号" type="text" style="width:100px">
+										<button class="btn btn-small" type="button">搜索</button>
+									</div>
 								</div>
-							</div>
-						</li>
-						<li>
-							本月：在职 89&nbsp;入职&nbsp;<a href="#">5</a>&nbsp;离职&nbsp;<a>4</a>
-						</li>
-						<li>
-							<label class="checkbox"><input type="checkbox"> 设置权限</label>
-						</li>
-						<li style="float:right">
-							<a href="#add-employee" data-toggle="modal" class="button">+员工</a>
-						</li>
-	  			</ul>
-	  		</div>
-				<div class="saeaList">
-					<table class="table table-hover">
-						<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><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>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>
-						</tbody>
-					</table>
-					<!--离职-->
-					<table class="table table-hover">
-						<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><th>操作</th></tr>
-						<tr><td>Z0001</td><td><a href="">张三</a></td><td>12345678901</td><td>12345678</td><td>总部</td><td>测试</td><td>正式</td><td>2017-05-30</td><td>2018-01-13</td><td><a href="#do-return" 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>2017-06-30</td><td><a href="#">再入职</a></td></tr>
-						</tbody>
-					</table>
-					<!--权限-->
-					<table class="table table-hover">
-						<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><th>通讯录权限</th></tr>
-						<tr><td>Z0001</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="#authority" data-toggle="modal">编辑(点我)</a></td><td>2 个省份 <a href="#province" 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="#">编辑</a></td><td>1 个省份 <a href="#">编辑</a></td></tr>
-						</tbody>
-					</table>
+							</li>
+							<li>
+								本月：在职 89&nbsp;入职&nbsp;<a href="#">5</a>&nbsp;离职&nbsp;<a>4</a>
+							</li>
+							<li>
+								<label class="checkbox"><input type="checkbox"> 设置权限</label>
+							</li>
+							<li style="float:right">
+								<a href="#add-organization" data-toggle="modal" class="button">+组织</a>
+								<a href="#add-employee" data-toggle="modal" class="button">+员工</a>
+							</li>
+		  			</ul>
+		  		</div>
+					<div class="saeaList">
+						<table class="table table-hover">
+							<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><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>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>
+							</tbody>
+						</table>
+						<!--离职-->
+						<table class="table table-hover">
+							<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><th>操作</th></tr>
+							<tr><td>Z0001</td><td><a href="">张三</a></td><td>12345678901</td><td>12345678</td><td>总部</td><td>测试</td><td>正式</td><td>2017-05-30</td><td>2018-01-13</td><td><a href="#do-return" 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>2017-06-30</td><td><a href="#">再入职</a></td></tr>
+							</tbody>
+						</table>
+						<!--权限-->
+						<table class="table table-hover">
+							<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><th>通讯录权限</th></tr>
+							<tr><td>Z0001</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="#authority" data-toggle="modal">编辑(点我)</a></td><td>2 个省份 <a href="#province" 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="#">编辑</a></td><td>1 个省份 <a href="#">编辑</a></td></tr>
+							</tbody>
+						</table>
+					</div>
+					<div class="demandPage">
+						<ul class="pagination fL">
+							<li><a href="#">&lt;</a></li>
+							<li><a href="#">1</a></li>
+							<li class="active"><a href="#">2</a></li>
+							<li><a href="#">3</a></li>
+							<li><a href="#">4</a></li>
+							<li><a href="#">5</a></li>
+							<li><a href="#">&gt;</a></li>
+						</ul>
+				  	</div>
 				</div>
-				<div class="demandPage">
-					<ul class="pagination fL">
-						<li><a href="#">&lt;</a></li>
-						<li><a href="#">1</a></li>
-						<li class="active"><a href="#">2</a></li>
-						<li><a href="#">3</a></li>
-						<li><a href="#">4</a></li>
-						<li><a href="#">5</a></li>
-						<li><a href="#">&gt;</a></li>
-					</ul>
-			  	</div>
 			</div>
 		</div>
 	</div>
@@ -201,7 +230,7 @@
 								<th class="taC" width="150">籍贯</th><td><input type="text"></td>
 							</tr>
 							<tr>
-								<th class="taC" width="150">户口所在地</th><td><input type="text""></td>
+								<th class="taC" width="150">户口所在地</th><td><input type="text"></td>
 								<th class="taC" width="150">户籍类型</th><td><select><option>城镇户口</option><option>农业户口</option></select></td>
 							</tr>
 							<tr>
@@ -324,6 +353,30 @@
 				</div>
 			</div></div>
 	</div>
+	<!--弹出（添加组织）-->
+	<div class="modal hide fade" id="add-organization">
+		<div class="modal-dialog modal-lg">
+			<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="150">组织名称</th><td width="260"><input value="" type="text"></td>
+						</tr>
+						<tr>
+							<th class="taC" width="150">地区</th><td width="260"><select><option value="1">北京市</option><option value="2">天津市</option><option value="3">河北省</option><option value="4">广东省</option></select></td>
+						</tr>
+					</table>
+				</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="add-employee">
 		<div class="modal-dialog modal-lg">