Merge branch 'master' of http://192.168.1.41:3000/S.H.I.E.L.D./CLD1.3

css/global.css

@@ -4010,4 +4010,47 @@ td div.dlLev3{
 .activate:hover,.activate:active{
   background: #ff8130;
   color:#fff;
+}
+
+
+
+.itineraryCon{
+  margin:20px 10px;
+}
+.itineraryTitle{
+  margin-top: 30px;
+  background: #084F8E;
+  color: #fff;
+  padding: 5px 10px;
+}
+.addressName{
+  font-size: 16px;
+}
+.itineraryCon ul li .pointLine{
+  margin:10px 0;
+  padding-left: 15px;
+  background:url(down_arrow.png) no-repeat 0 bottom;
+}
+.priceList,.timeList{
+  margin-bottom: 10px;
+}
+.itineraryCon ul li:last-child .pointLine{
+  background:url(down_arrow2.png) no-repeat 0 bottom;
+}
+.priceTitle,.timeTitle,.routeTitle{
+  display: inline-block;
+  padding: 3px 8px;
+  background: #999;
+  color: #fff;
+  margin-right: 5px;
+}
+.price,.time,.route{
+  font-weight: bold;
+}
+.route{
+  margin-left: 5px;
+}
+.route p{
+  width: 570px;
+  margin-bottom: 5px;
 }

invoice-batch-detail.html

@@ -56,7 +56,9 @@
 			</div>
 			<div class="adminContent autoHeight">
 				<legend>
-				2018XX培训班</legend>
+				2018XX培训班
+				<a href="#edit-invoice-name" data-toggle="modal">编辑</a>
+			</legend>
 				<div class="demandCate">
 					<ul class="cateList">
 						<li>
@@ -79,11 +81,11 @@
 							</div>
 						</li>
 						<li>
-							<a href="#confirm-erro" data-toggle="modal">批量设置邮寄物品</a>
-							<a href="#confirm" data-toggle="modal">批量提交审批</a>
-							<a href="#del" data-toggle="modal">批量移除</a>
-							<a href="#confirm-phone" data-toggle="modal">批量设置收件人手机</a>
-							<a href="#confirm-email" data-toggle="modal">批量设置收件人邮箱</a>
+							<a href="#confirm-erro" data-toggle="modal">设置邮寄物品</a>
+							<a href="#confirm" data-toggle="modal">提交审批</a>
+							<a href="#del" data-toggle="modal">移除</a>
+							<a href="#confirm-phone" data-toggle="modal">设置收件人手机</a>
+							<a href="#confirm-email" data-toggle="modal">设置收件人邮箱</a>
 							<a href="#tips" data-toggle="modal">批量操作提示</a>
 						</li>
 						<li>
@@ -299,6 +301,49 @@
 </div>
 </div>
 
+<!-- 设置编辑培训班 -->
+<div class="modal hide fade" id="edit-invoice-name">
+  <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><input type="text" placeholder="必填" value="2018XX培训班"></td>
+    			</tr>
+    			<tr>
+    				<th class="taC" width="150">开班时间</th><td><input type="text" placeholder="必填" value="2018-03-15"></td>
+    			</tr>
+    		</tbody>
+    	</table>
+    	<table class="table table-bordered table-condensed">
+    		<tbody>
+    			<tr>
+    				<th class="taC" colspan="2">培训班结算信息</th>
+    			</tr>
+    			<tr>
+    				<th class="taC" width="150">培训班名称</th><td><input type="text" placeholder="必填" value="2018XX培训班" disabled></td>
+    			</tr>
+    			<tr>
+    				<th class="taC" width="150">开班时间</th><td><input type="text" placeholder="必填" value="2018-03-15"  disabled></td>
+    			</tr>
+    			<tr>
+    				<th class="taC" width="150">缴费参加人数</th><td><input type="text" placeholder="必填" value="5"  disabled></td>
+    			</tr>
+    		</tbody>
+    	</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="confirm-phone">
   <div class="modal-dialog">

invoice-batch.html

@@ -55,14 +55,14 @@
 			<div class="adminContent autoHeight">
 				<div class="saea-borad">
 					<div class="borad-menu">
-						<a data-toggle="modal" href="#add-batch" class="invoice">创建培训班</a>
+						<a data-toggle="modal" href="#add-batch" class="invoice">创建培训班发票</a>
 					</div>
 					<div class="borad-news">
 						<div class="saeaList">
 							<div class="clearfix">
 								<table class="table table-bordered table-condensed">
 									<tbody>
-									<tr><th class="taC">累计培训班</th><td>4</td><th class="taC">累计完成</th><td>3</td></tr>
+									<tr><th class="taC">累计培训班发票</th><td>4</td><th class="taC">累计完成</th><td>3</td></tr>
 									<tr><th class="taC">累计开票金额</th><td>￥838,273.00</td><th class="taC">累计入账金额</th><td>￥838,273.00</td></tr>
 									<tr><th class="taC">累计未入账发票</th><td colspan="3">￥209,484,765.00</td></tr>
 									</tbody>
@@ -421,7 +421,7 @@
 	<div class="modal-dialog">
 		<div class="modal-content">
 		<div class="modal-header">
-		<h3>创建培训班</h3>
+		<h3>创建培训班发票</h3>
 		</div>
 		<div class="modal-body saeaList">
 			<table class="table table-bordered table-condensed">

login.html

@@ -100,7 +100,8 @@
 							<th class="taC" width="150">毕业时间</th><td><input type="date"></td>
 						</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>
 					</table>
 					<table class="table table-bordered table-condensed">

saea-income.html

@@ -141,7 +141,7 @@
 			</div>
 <!--弹出（日收支）-->
 <div class="modal hide fade" id="inputincome">
-		<div class="modal-dialog ">
+		<div class="modal-dialog modal-lg">
 			<div class="modal-content">
 				<div class="modal-header">
 					<h3>录入日常收支</h3>
@@ -149,6 +149,173 @@
 				<div class="modal-body saeaList">
 					<table class="table table-bordered table-condensed">
 						<tbody>
+							<tr>
+								<th class="taC">选择类型</th>
+								<td>
+									<select>
+										<option>请选择</option>
+										<option>收入</option>
+										<option>支出</option>
+										<option selected>理财</option>
+										<option>银行互转</option>
+									</select>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+							<tr>
+								<th class="taC" colspan="2">理财信息填写</th>
+							</tr>
+							<tr>
+								<td width="50%">
+									<table class="table table-bordered table-condensed">
+										<tbody>
+											<tr>
+												<th class="taC" colspan="2">支出信息</th>
+											</tr>
+											<tr>
+												<th class="taC">支出银行</th>
+												<td>
+													<select>
+														<option>请选择</option>
+														<option>广发理财</option>
+														<option>工行理财</option>
+													</select>
+													<p>可提取余额：￥0</p>							
+													<p>
+														<label class="radio inline"><input type="radio">公司固定</label>
+														<label class="radio inline"><input type="radio">公司活期</label>
+														<label class="radio inline"><input type="radio">个人（GR）</label>
+													</p>
+												</td>
+											</tr>
+										</tbody>
+									</table>
+								</td>
+								<td width="50%">
+									<table class="table table-bordered table-condensed">
+										<tbody>
+											<tr>
+												<th class="taC" colspan="2">收入信息</th>
+											</tr>
+											<tr>
+												<th class="taC">收款金额</th>
+												<td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+											</tr>
+											<tr>
+												<th class="taC">收款信息</th>
+												<td><input type="text"></td>
+											</tr>
+											<tr>
+												<th class="taC">收款银行</th>
+												<td>
+													<select>
+														<option value="纵横广发">纵横广发</option>
+														<option value="个人广发">个人广发</option>
+														<option value="华润银行">（广发）纵横知道</option>
+														<option value="纵横工行">纵横工行</option>
+													</select>
+												</td>
+											</tr>
+											<tr>
+												<th class="taC">银行到款时间</th>
+												<td><input type="date"></td>
+											</tr>
+											<tr>
+												<th class="taC">备注</th>
+												<td><textarea class="form-control" name="remarks" rows="3"></textarea></td>
+											</tr>
+										</tbody>
+									</table>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+							<tr>
+								<th class="taC">选择类型</th>
+								<td>
+									<select>
+										<option>请选择</option>
+										<option>收入</option>
+										<option>支出</option>
+										<option>理财</option>
+										<option selected>银行互转</option>
+									</select>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+							<tr>
+								<th class="taC" colspan="2">银行转帐信息填写</th>
+							</tr>
+							<tr>
+								<td width="50%">
+									<table class="table table-bordered table-condensed">
+										<tbody>
+											<tr>
+												<th class="taC" colspan="2">支出信息</th>
+											</tr>
+											<tr>
+												<th class="taC">支出银行</th>
+												<td>
+													<select>
+														<option>请选择</option>
+														<option>广发存款</option>
+														<option>工行存款</option>
+													</select>
+													<p>可提取余额：￥0</p>
+												</td>
+											</tr>
+										</tbody>
+									</table>
+								</td>
+								<td width="50%">
+									<table class="table table-bordered table-condensed">
+										<tbody>
+											<tr>
+												<th class="taC" colspan="2">收入信息</th>
+											</tr>
+											<tr>
+												<th class="taC">收款金额</th>
+												<td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+											</tr>
+											<tr>
+												<th class="taC">收款信息</th>
+												<td><input type="text"></td>
+											</tr>
+											<tr>
+												<th class="taC">收款银行</th>
+												<td>
+													<select>
+														<option value="纵横广发">纵横广发</option>
+														<option value="个人广发">个人广发</option>
+														<option value="华润银行">（广发）纵横知道</option>
+														<option value="纵横工行">纵横工行</option>
+													</select>
+												</td>
+											</tr>
+											<tr>
+												<th class="taC">银行到款时间</th>
+												<td><input type="date"></td>
+											</tr>
+											<tr>
+												<th class="taC">备注</th>
+												<td><textarea class="form-control" name="remarks" rows="3"></textarea></td>
+											</tr>
+										</tbody>
+									</table>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+						<tbody>
 						<tr>
 							<th class="taC">选择收支</th>
 							<td>
@@ -247,6 +414,7 @@
 								<option>请选择</option>
 								<option>银行手续费</option>
 								<option>总部电话费</option>
+								<option>工资</option>
 								<option>缴税</option>
 								<option>广发理财</option>
 								<option>工行理财</option>

saea-myList-detail.html

@@ -457,10 +457,102 @@
 								<br>
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
-									<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
-									<tr><th>往来交通费</th><td  width="140" class="taR">￥2020.00</td></tr>
-									<tr><th>市内交通费</th><td class="taR">￥50.00</td></tr>
-									<tr><th>出差补助</th><td class="taR">￥90.00</td></tr>
+									<tr><th colspan="2" class="taC">总行程单</th></tr>
+									<tr><td colspan="2"><div class="itinerary">
+			  						<div class="itineraryCon">
+			  							<ul>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥75</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>出差住宿费</b>
+							  										<p class="colGray">#住一晚</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-14 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
+						  						</div>
+			  								</li>
+			  							</ul>
+			  						</div></td></tr>
 									<tr><th class="taR">合计</th><td class="colGreen taR">￥2160.00</td></tr>
 									<tr><th colspan="2" class="taC">其他</th></tr>
 									<tr><th class="taR">合计</th><td class="colGreen taR">￥0.00</td></tr>
@@ -621,10 +713,106 @@
 								<br>
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
-									<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
+										<tr><th colspan="2" class="taC">总行程单</th></tr>
+									<tr><td colspan="2"><div class="itinerary">
+			  						<div class="itineraryCon">
+			  							<ul>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥75</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>出差住宿费</b>
+							  										<p class="colGray">#住一晚</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-14 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
+						  						</div>
+			  								</li>
+			  							</ul>
+			  						</div></td></tr>
+									<!-- <tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 									<tr><th>往来交通费</th><td  width="140" class="taR">￥2020.00</td></tr>
 									<tr><th>市内交通费</th><td class="taR">￥50.00</td></tr>
-									<tr><th>出差补助</th><td class="taR">￥90.00</td></tr>
+									<tr><th>出差补助</th><td class="taR">￥90.00</td></tr> -->
 									<tr><th class="taR">合计</th><td class="colGreen taR">￥2160.00</td></tr>
 									<tr><th colspan="2" class="taC">其他</th></tr>
 									<tr><th class="taR">合计</th><td class="colGreen taR">￥0.00</td></tr>
@@ -1045,15 +1233,108 @@
 								<br>
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
-									<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
+									<!-- <tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 									<tr><th>往来交通费</th><td  width="140" class="taR">￥2020.00</td></tr>
 									<tr><th>市内交通费</th><td class="taR">￥50.00</td></tr>
 									<tr><th>出差补助</th><td class="taR">￥90.00</td></tr>
-									<tr><th colspan="2" class="taC">其他</th></tr>
-									<tr><th>公关费</th><td  width="140" class="taR">￥600.00</td></tr>
+									<tr><th colspan="2" class="taC">其他</th></tr> -->
+									<tr><th colspan="2" class="taC">总行程单</th></tr>
+									<tr><td colspan="2"><div class="itinerary">
+			  						<div class="itineraryCon">
+			  							<ul>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥75</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>出差住宿费</b>
+							  										<p class="colGray">#住一晚</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-14 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
+						  						</div>
+			  								</li>
+			  							</ul>
+			  						</div></td></tr>
 									<tr><th class="taR">合计</th><td class="colGreen taR">￥0.00</td></tr>
-									<tr><th colspan="2" class="taC">公关费绑定发票</th></tr>
-									<tr><th><a href="#">#F201909187362</a></th><td  width="140" class="taR">￥600.00</td></tr>
 									<tr><th colspan="2" class="taC">金额调整</th></tr>
 									<tr><th class="taR">合计</th><td class="colOrange taR">-￥0.00</td></tr>
 									<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>

saea-myList-detail2.html

@@ -91,6 +91,9 @@
 									<th class="taC"><span class="colRed" title="必填">*</span>所在办事处</th><td>广东办</td>
 								</tr>
 								<tr>
+									<th class="taC">审批状态</th><td colspan="3">审批中</td>
+								</tr>
+								<tr>
 									<th colspan="4" class="taC">汇款信息</th>
 								</tr>
 								<tr>
@@ -114,50 +117,50 @@
 			  			<legend>汇总表</legend>
 			  			<table class="table table-condensed table-hover table-bordered">
 								<tr>
-									<th class="taC" rowspan="2">汇总项目</th><th class="taC" colspan="2">收入按开票金额计算</th><th class="taC" colspan="2">收入按入账金额计算</th>
+									<th class="taC" rowspan="2">汇总项目</th><th class="taC" colspan="2">收入按开票金额计算</th><th class="taC" colspan="2">收入按入账金额计算</th><th class="taC" colspan="2" style="background: #ccc;">收入按入账金额计算<span class="colRed">（新）</span></th>
 								<tr>
-									<th class="taC">金额</th><th class="taC">占比</th><th class="taC">金额</th><th class="taC">占比</th>
+									<th class="taC">金额</th><th class="taC">占比</th><th class="taC">金额</th><th class="taC">占比</th><th class="taC">金额</th><th class="taC">占比</th>
 								</tr>
 								<tr>
-									<th>收入</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+									<th>收入</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+									<th>支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>利润</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
+									<th>利润</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="5" class="taC colGray">收入-支出=利润</td>
+									<td colspan="7" class="taC colGray">收入-支出=利润</td>
 								</tr>
 								<tr>
-									<th>公司利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+									<th>公司利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>办事处利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+									<th>办事处利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>公司收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+									<th>公司收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="5" class="taC colGray">收入×40%=办事处利润&nbsp;&nbsp;&nbsp;收入×60%=公司利润</td>
+									<td colspan="7" class="taC colGray">收入×40%=办事处利润&nbsp;&nbsp;&nbsp;收入×60%=公司利润</td>
 								</tr>
 								<tr>
 									<th>备用金（借款）</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>办事处收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+									<th>办事处收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>办事处实际支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+									<th>办事处实际支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>付总部款</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
+									<th>付总部款</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="5" class="taC colGray">备用金+办事处收款-办事处实际支出=付总部款</td>
+									<td colspan="7" class="taC colGray">备用金+办事处收款-办事处实际支出=付总部款</td>
 								</tr>
-								<tr><td colspan="5">学员：36 人（缴费36 免费0）&nbsp;&nbsp;&nbsp;讲师：36 人</td></tr>
+								<tr><td colspan="7">学员：36 人（缴费36 免费0）&nbsp;&nbsp;&nbsp;讲师：36 人</td></tr>
 						</table>
 			  			<table class="table table-bordered table-condensed table-hover">
 							<tbody>
@@ -227,6 +230,7 @@
                                     <th class="taC" width="90">包含发票</th>
                                     <th class="taC">开票金额合计</th>
                                     <th class="taC">入账金额合计</th>
+                                    <th class="taC" style="background: #ccc;">入账金额合计<span class="colRed">（新）</span></th>
                                     <th class="taC" width="90">入账完成度</th>
                                 </tr>
                                 <tr>
@@ -237,6 +241,7 @@
                                     <td>45</td>
                                     <td>￥234,981.00</td>
                                     <td>￥34,734.00</td>
+                                    <td>￥34,734.00</td>
                                     <td>14%</td>
                                 </tr>
                             </tbody>

saea-receipt-add2.html

@@ -132,6 +132,73 @@
 				  					<p>2 出差补助30元/天，不需提供发票，只需在报销单上填写清楚；</p>
 				  					<p>3 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处。</p>
 			  					</div>
+			  					<div class="itinerary">
+			  						<h2 class="itineraryTitle">总行程单</h2>
+			  						<div class="itineraryCon">
+			  							<ul>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥70</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-12 ~ 2020-05-13</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥70</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥70</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-14 ~ 2020-05-14</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
+						  							<!-- <div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥70</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-15 ~ 2020-05-15</span>
+						  								</div>
+						  							</div> -->
+						  						</div>
+			  								</li>
+			  							</ul>
+			  						</div>
+			  					</div>
 			  				</div>
 			  			</div>
 					</div>
@@ -146,6 +213,15 @@
                     <h3>添加行程费用单</h3>
                 </div>
                 <div class="modal-body saeaList">
+<<<<<<< HEAD
+                	<!-- <table class="table table-bordered table-condensed">
+						<tr><th class="taC" colspan="4">行程详情</th></tr>
+						<tr><th>地点</th><td><select><option>省份</option></select><select><option>市区</option></select></td></tr>
+						<tr><th>时间</th><td><input type="date"></td></tr>
+						<tr><td colspan="4" class="colGray">如果是停留，出发地和到达地填写住宿地。（如：广东省珠海市-广东省珠海市）</td></tr>
+					</table> -->
+=======
+>>>>>>> parent of ff8424b... 行程单修改
 					<table class="table table-bordered table-condensed">
 						<tr><th class="taC" colspan="4">出发-到达</th></tr>
 						<tr><th>出发地</th><td><select><option>省份</option></select><select><option>市区</option></select></td><th>到达地</th><td><select><option>省份</option></select><select><option>市区</option></select></td></tr>

saea-reportList-pay-detail.html

@@ -234,10 +234,106 @@
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
 									<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><td colspan="2"><div class="itinerary">
+			  						<div class="itineraryCon">
+			  							<ul>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥75</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>出差住宿费</b>
+							  										<p class="colGray">#住一晚</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-14 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
+						  						</div>
+			  								</li>
+			  							</ul>
+			  						</div></td></tr>
+									<!-- <tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 									<tr><th>往来交通费<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td  width="140" class="taR">￥2020.00</td></tr>
 									<tr><th>市内交通费<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td class="taR">￥50.00</td></tr>
-									<tr><th>出差补助</th><td class="taR">￥90.00</td></tr>
+									<tr><th>出差补助</th><td class="taR">￥90.00</td></tr> -->
 									<tr><th class="taR">合计</th><td class="colGreen taR">￥2160.00</td></tr>
 									<tr><th colspan="2" class="taC">其他</th></tr>
 									<tr><th class="taR">合计</th><td class="colGreen taR">￥0.00</td></tr>
@@ -488,7 +584,103 @@
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
 									<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><td colspan="2"><div class="itinerary">
+			  						<div class="itineraryCon">
+			  							<ul>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥75</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>出差住宿费</b>
+							  										<p class="colGray">#住一晚</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-14 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
+						  						</div>
+			  								</li>
+			  							</ul>
+			  						</div></td></tr>
+									<!-- <tr><th colspan="2" class="taC">行程详细</th></tr>
 			  						<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> 2020-01-03 珠海-广州<div class="fR"><a href="">编辑</a>&nbsp;<a href="" class="colRed">移除</a></div></th></tr>
 			  						<tr><th>往来交通费<p class="colGray">#高铁</p></th><td width="200" class="taR">￥75.00</td></tr>
 			  						<tr><th>市内交通费<p class="colGray">#出租车</p></th><td width="200" class="taR">￥25.00</td></tr>
@@ -504,7 +696,7 @@
 									<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 									<tr><th>往来交通费<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td  width="140" class="taR">￥2020.00</td></tr>
 									<tr><th>市内交通费<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td class="taR">￥50.00</td></tr>
-									<tr><th>出差住宿费</th><td class="taR">￥90.00</td></tr>
+									<tr><th>出差住宿费</th><td class="taR">￥90.00</td></tr> -->
 									<tr><th class="taR">合计</th><td class="colGreen taR">￥2160.00</td></tr>
 									<tr><th colspan="2" class="taC">费用金额调整</th></tr>
 									<tr><th>赵淑燕：市内交通费只给报销40元</th><td class="taR">-￥10.00</td></tr>

saea-reportList-report-3.html

@@ -211,19 +211,142 @@
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
 									<tr class="warning"><td class="taR"><b>（#G1402130405003）本次费用合计</b></td><td class="taR"><b style="font-size:24px">￥2050.00</b><br>贰仟零伍拾元整</td></tr>
-									<tr><th colspan="2" class="taC">行程详细</th></tr>
-			  						<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> 2020-01-03 珠海-广州<div class="fR"><a href="">编辑</a>&nbsp;<a href="" class="colRed">移除</a></div></th></tr>
+									<tr><th colspan="2" class="taC">总行程单</th></tr>
+									<tr><td colspan="2"><div class="itinerary">
+			  						<div class="itineraryCon">
+			  							<ul>
+			  								<li>
+			  									<div class="itineraryList">
+			  										<div class="fR"><a href="">编辑</a></div>
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+			  										<div class="fR"><a href="">编辑</a>&nbsp;<a href="" class="colRed">移除</a></div>
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥75</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-13 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>出差住宿费</b>
+							  										<p class="colGray">#住一晚</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+			  										<div class="fR"><a href="">编辑</a>&nbsp;<a href="" class="colRed">移除</a></div>
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">费用</span>
+						  									<span class="price colGreen">￥100</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-14 ~ 2020-05-14</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
+						  							<!-- <div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥70</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-15 ~ 2020-05-15</span>
+						  								</div>
+						  								<div class="routeList clearfix">
+						  									<span class="routeTitle fL">详情</span>
+						  									<span class="route fL">
+						  										<p class="routeW">
+						  											<b class="fR">￥75.00</b>
+						  											<b>往来交通费</b>
+							  										<p class="colGray">#高铁</p>
+						  										</p>
+						  										<p class="routeW">
+						  											<b class="fR">￥25.00</b>
+						  											<b>市内交通费</b>
+							  										<p class="colGray">#出租车</p>
+						  										</p>
+						  									</span>
+						  								</div>
+						  							</div> -->
+						  						</div>
+			  								</li>
+			  							</ul>
+			  						</div></td></tr>
+			  						<!-- <tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> 2020-01-03 珠海-广州</th></tr>
 			  						<tr><th>往来交通费<p class="colGray">#高铁</p></th><td width="200" class="taR">￥75.00</td></tr>
 			  						<tr><th>市内交通费<p class="colGray">#出租车</p></th><td width="200" class="taR">￥25.00</td></tr>
 			  						<tr><th class="taR">合计</th><td class="colGreen taR">￥100.00</td></tr>
-			  						<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> 2020-01-03～2020-01-04 广州-广州<div class="fR"><a href="">编辑</a>&nbsp;<a href="" class="colRed">移除</a></div></th></tr>
+			  						<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> 2020-01-03～2020-01-04 广州-广州</th></tr>
 			  						<tr><th>出差住宿费<p class="colGray">#住一晚</p></th><td width="200" class="taR">￥235.00</td></tr>
 			  						<tr><th>出差补助费<p class="colGray">#2天</p></th><td width="200" class="taR">￥60.00</td></tr>
 			  						<tr><th class="taR">合计</th><td class="colGreen taR">￥295.00</td></tr>
-			  						<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> 2020-01-05 广州-珠海<div class="fR"><a href="">编辑</a>&nbsp;<a href="" class="colRed">移除</a></div></th></tr>
+			  						<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> 2020-01-05 广州-珠海</th></tr>
 			  						<tr><th>往来交通费<p class="colGray">#高铁</p></th><td width="200" class="taR">￥75.00</td></tr>
 			  						<tr><th>市内交通费<p class="colGray">#出租车</p></th><td width="200" class="taR">￥25.00</td></tr>
-			  						<tr><th class="taR">合计</th><td class="colGreen taR">￥100.00</td></tr>
+			  						<tr><th class="taR">合计</th><td class="colGreen taR">￥100.00</td></tr> -->
 									<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 									<tr><th>往来交通费<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td  width="140" class="taR">￥2020.00</td></tr>
 									<tr><th>市内交通费<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td class="taR">￥50.00</td></tr>

staff-employee.html

@@ -143,7 +143,7 @@
 							<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>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></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>
 						</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">微信</th><td><input type="text" value="12345678"></td>
 						</tr>

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="#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="#do-dismiss" data-toggle="modal">确认离职</a></td></tr>
 									</tbody>
 								</table>
 							</div>
@@ -153,6 +154,10 @@
 								<th class="taC" width="150">婚姻状况</th><td><select><option>已婚</option><option>未婚</option></select></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="date"></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>
@@ -228,6 +233,43 @@
 				</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-dialog modal-xlg">
@@ -271,6 +313,10 @@
 								<th class="taC" width="150">婚姻状况</th><td>未婚</td>
 							</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>香洲区XX路XX小区XX号</td>
 							</tr>