Merge branch 'master' of http://192.168.1.12:3000/s.h.i.e.l.d./cld1.3

admin-myinfo.html

@@ -191,6 +191,7 @@
 							</td>
 						</tr>
 					</table>
+					<p style="width:850px;" class="alert alert-">所有证件均提供高清扫描件，不可提供照片形式图片。</p>
 					<div class="control-group">
 						<div class="controls">
 							<button type="submit" class="button">确认修改</button>
@@ -242,8 +243,15 @@
 					<h3>申请离职</h3>
 				</div>
 				<div class="modal-body saeaList">
-						<textarea style="width:560px" placeholder="简要填写离职原因"></textarea>
-						<p class="alert alert-">感谢您的付出与努力。</p>
+					<table class="table table-bordered table-condensed">
+						<tr>
+							<th class="taC" width="100">离职原因</th><td><textarea style="width:425px" placeholder="简要填写离职原因"></textarea></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100">离职日期</th><td><input type="date"></td>
+						</tr>
+					</table>
+					<p class="alert alert-">请联系纵横人资（QQ：1430119431）办理离职手续。</p>
 				</div>
 				<div class="modal-footer">
 					<a href="#" class="button">确定提交</a>

saea-bank.html

@@ -126,7 +126,13 @@
                                             <td>日常支出（银行手续费）</td>
                                             <td>￥2000.00</td>
                                             <td>2018-11-11</td>
-                                            <td><a href="#saea-detail4" data-toggle="modal">#J2019873649（点我）</a></td>
+                                            <td><a href="#saea-detail4" data-toggle="modal">#N2019873649（点我）</a></td>
+                                        </tr>
+                                        <tr>
+                                            <td>日常支出（工行理财）</td>
+                                            <td>￥2000.00</td>
+                                            <td>2018-11-11</td>
+                                            <td><a href="#">#N2019873649</a></td>
                                         </tr>
                                     </tbody>
                                 </table>
@@ -147,7 +153,7 @@
                                             <td>发票收款</td>
                                             <td>￥3000.00</td>
                                             <td>2018-11-11</td>
-                                            <td><a href="#saea-detail5" data-toggle="modal">#N2019873649</a></td>
+                                            <td><a href="#saea-detail5" data-toggle="modal">#N2019873649（点我）</a></td>
                                         </tr>
                                         <tr>
                                             <td>日常收入（利息收入）</td>
@@ -155,6 +161,12 @@
                                             <td>2018-11-11</td>
                                             <td><a href="#">#N2019873649</a></td>
                                         </tr>
+                                        <tr>
+                                            <td>日常收入（工行理财）</td>
+                                            <td>￥2000.00</td>
+                                            <td>2018-11-11</td>
+                                            <td><a href="#">#N2019873649</a></td>
+                                        </tr>
                                     </tbody>
                                 </table>
                             </div>

saea-income.html

@@ -159,7 +159,8 @@
 								<option>借款收回</option>
 								<option>退汇</option>
 								<option>其他</option>
-								<option>理财本金</option>
+								<option>广发理财</option>
+								<option>工行理财</option>
 								<option>保证金</option>
 							</select>
 							<p>
@@ -225,7 +226,8 @@
 								<option>银行手续费</option>
 								<option>总部电话费</option>
 								<option>缴税</option>
-								<option>理财G</option>
+								<option>广发理财</option>
+								<option>工行理财</option>
 								<option>保证金</option>
 							</select>
 							<!--缴税 二级-->

staff-employee.html

@@ -286,7 +286,7 @@
 					</div>
 					<div class="fL staff-detail-side">
 						<!--入职试用 & 离职后再入职试用-->
-						<div class="infoFlowList">
+						<!-- <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>
@@ -295,7 +295,17 @@
 							 <li class="item colGray">总部-温秀娟</li>
 							 <li class="item">员工 入职试用</li>
 						 </ul>
-						</div>
+						</div> -->
+						<div class="infoFlowList">
+							 <div class="dateTitle">
+								 <em class="month"><span class="num">8</span><span class="text">-01</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>
@@ -307,6 +317,16 @@
 						 </ul>
 						</div>
 						<div class="infoFlowList">
+							 <div class="dateTitle">
+								 <em class="month"><span class="num">8</span><span class="text">-01</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>
@@ -326,6 +346,16 @@
 							 <li class="item">员工 实习转试用</li>
 						 </ul>
 					 	</div>
+					 	<div class="infoFlowList">
+							 <div class="dateTitle">
+								 <em class="month"><span class="num">8</span><span class="text">-01</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">8</span><span class="text">-01</span></em>
@@ -520,6 +550,9 @@
 						<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>
@@ -650,6 +683,7 @@
 					<h3>设置通讯录 权限</h3>
 				</div>
 				<div class="modal-body saeaList">
+					<label class="checkbox inline"><input type="checkbox"> 全选</label>
 					<label class="checkbox inline"><input type="checkbox"> 广东省</label>
 					<label class="checkbox inline"><input type="checkbox"> 广西自治区</label>
 					<label class="checkbox inline"><input type="checkbox"> 湖南省</label>

staff-set-approval.html

@@ -62,6 +62,7 @@
 					  <li class="active"><a href="#">入职审批</a></li>
 					  <li><a href="#">离职审批</a></li>
 					  <li><a href="#">转正审批</a></li>
+					  <li><a href="#">再入职审批</a></li>
 					  <li><a href="#">晋升审批</a></li>
 					</ul>
 				</div>