行程单页面修改

css/global.css

@@ -4027,20 +4027,17 @@ td div.dlLev3{
   font-size: 16px;
 }
 .itineraryCon ul li .pointLine{
-  margin:8px 0;
+  margin:10px 0;
   padding-left: 15px;
   background:url(down_arrow.png) no-repeat 0 bottom;
 }
-.priceList{
+.priceList,.timeList{
   margin-bottom: 10px;
 }
-.timeList{
-  padding: 5px 0 0 23px;
-}
 .itineraryCon ul li:last-child .pointLine{
   background:url(down_arrow2.png) no-repeat 0 bottom;
 }
-.priceTitle,.routeTitle{
+.priceTitle,.timeTitle,.routeTitle{
   display: inline-block;
   padding: 3px 8px;
   background: #999;

saea-receipt-add2.html

@@ -53,131 +53,7 @@
 			  					<table class="table table-bordered table-condensed table-hover">
 			  					<tbody>
 			  						<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="timeList">
-					  									<span class="timeTitle"><i class="contactsMark icon-">Q</i></span>
-					  									<span class="time">2020-05-12</span>
-					  								</div>
-						  							<div class="pointLine">
-						  								<div class="priceList">
-						  									<span class="priceTitle">费用</span>
-						  									<span class="price colGreen">￥100</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="timeList">
-					  									<span class="timeTitle"><i class="contactsMark icon-">Q</i></span>
-					  									<span class="time">2020-05-13</span>
-					  								</div>
-						  							<div class="pointLine">
-						  								<div class="priceList">
-						  									<span class="priceTitle">费用</span>
-						  									<span class="price colGreen">￥75</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="timeList">
-					  									<span class="timeTitle"><i class="contactsMark icon-">Q</i></span>
-					  									<span class="time">2020-05-1</span>
-					  								</div>
-						  							<div class="pointLine">
-						  								<div class="priceList">
-						  									<span class="priceTitle">费用</span>
-						  									<span class="price colGreen">￥100</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 珠海-广州<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 珠海-广州<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>
 			  						<tr><th class="taR">合计</th><td class="colGreen taR">￥100.00</td></tr>
@@ -187,8 +63,8 @@
 			  						<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>往来交通费<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">￥275.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="taC"><a href="#route-add" class="button" data-toggle="modal">添加行程费用单</a></th></tr>
 			  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 			  						<tr><th>往来交通费</th><td  width="200" class="taR">￥150.00</td></tr>
@@ -256,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>
@@ -270,12 +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-report-3.html

@@ -219,16 +219,15 @@
 			  									<div class="itineraryList">
 			  										<div class="fR"><a href="">编辑</a></div>
 						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
-						  							<div class="timeList">
-					  									<span class="timeTitle"><i class="contactsMark icon-">Q</i></span>
-					  									<span class="time">2020-05-12</span>
-					  								</div>
 						  							<div class="pointLine">
 						  								<div class="priceList">
-						  									<span class="priceTitle">费用</span>
+						  									<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">
@@ -251,15 +250,15 @@
 			  									<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="timeList">
-					  									<span class="timeTitle"><i class="contactsMark icon-">Q</i></span>
-					  									<span class="time">2020-05-13</span>
-					  								</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">
@@ -277,15 +276,15 @@
 			  									<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="timeList">
-					  									<span class="timeTitle"><i class="contactsMark icon-">Q</i></span>
-					  									<span class="time">2020-05-14</span>
-					  								</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">
@@ -309,7 +308,7 @@
 						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
 						  							<!-- <div class="pointLine">
 						  								<div class="priceList">
-						  									<span class="priceTitle">费用</span>
+						  									<span class="priceTitle">金额</span>
 						  									<span class="price colGreen">￥70</span>
 						  								</div>
 						  								<div class="timeList">