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

css/global.css

@@ -4156,4 +4156,30 @@ td div.dlLev3{
 }
 .hidden{
   display: none !important;
+}
+.saeasideMnav{
+  padding: 20px 20px 0 20px;
+  border-right: 1px solid #ddd;
+  background: #fff;
+}
+.saeaScreen{
+  margin: 0 0 20px 0;
+}
+.saeaScreen span{
+  display: inline-block;
+  padding:5px;
+  background: #ccc;
+}
+.popupTip{
+  position: absolute;
+  top: 0px;
+  z-index: 9999;
+  width: 960px;
+  text-align: center;
+}
+.popupTipText{
+  background: #f70000;
+  color: #fff;
+  padding: 5px 10px;
+  border-radius:0 0 5px 5px;
 }

saea-all-reportList.html

@@ -46,168 +46,186 @@
 					</ul>
 				</div>
 			</div>
-			<div class="adminContent autoHeight" style="height: 821px;">
-				<legend><div class="fR"></div>所有费用列表</legend>
-				<div class="demandCate">
-					<ul class="cateList">
-	  					<li><input type="month" style="width:120px"></li>
-	  					<li><select><option>办事处</option></select> <select><option>员工</option></select></li>
-	  					<li><select><option>费用类型</option><option>培训班</option><option>报销单</option><option>对公汇款</option><option>借款</option></select></li>
-						<li><div class="search">
+			<div class="adminContent adminContentS autoHeight">
+				<div class="librarySide">
+					<div class="saeasideMnav autoHeight">
+						<div class="search">
 							<div class="input-append">
-								<input class="span3" placeholder="单号搜索" type="text">
-								<button class="btn btn-small" type="button">搜索</button>
+								<input class="" placeholder="搜索" type="text" style="width: 130px !important;border-radius: 4px;">
+								<!-- <button class="btn btn-small" type="button">搜索</button> -->
 							</div>
-						</div></li>
-						<li>报销总计：￥5470.00</li>
-	  					<li>同意支付：<span class="colGreen">￥2160.00</span></li>
-						<li>审批中：￥1150.00</li>
-	  			</ul>
-	  		</div>
-	  		<div class="saeaList">
-	  			<!--待审批列表-->
-	  			<div class="entry">
-	  				<table class="table table-bordered table-condensed">
-	  					<thead><tr><th width="54" class="taC">上报人</th><th width="80" class="taC">费用类型</th><th width="100" class="taC">费用总金额</th><th width="100" class="taC">费用结算</th><th width="120" class="taC">费用所在办事处</th><th width="120" class="taC">费用单号</th><th class="taC">费用说明</th><th width="100" class="taC">状态</th><th width="100" class="taC">操作</th></tr></thead>
-	  					<tbody>
-	  						<tr>
-	  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
-								<td>培训班结算</td>
-	  							<td class="taR colOrange"><b>￥21212.00</b></td>
-	  							<td class="taR"></td>
-	  							<td>广东办</td>
-	  							<td>#B201405286811<p class="colGray">2015-2-21</p></td>
-	  							<td>说明说明说明说明</td>
-								<td>审批中</td>
-	  							<td><a href="saea-reportList-report2.html">详情</a></td>
-	  						</tr>
-	  						<tr>
-	  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
-								<td>报销单</td>
-	  							<td class="taR colOrange"><b>￥1212.00</b></td>
-	  							<td class="taR"></td>
-	  							<td>广东办</td>
-	  							<td>#B201405286811<p class="colGray">2015-2-21</p></td>
-	  							<td>说明说明说明说明</td>
-								<td>审批中</td>
-	  							<td><a href="saea-reportList-detail.html">详情</a></td>
-	  						</tr>
-	  						<tr>
-	  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
-								<td>报销单</td>
-	  							<td class="taR colOrange"><b>￥1212.00</b></td>
-	  							<td class="taR"></td>
-	  							<td>广东办</td>
-	  							<td>#B201405286811<p class="colGray">2015-2-21</p></td></td>
-	  							<td>说明说明说明说明</td>
-	  							<td>审批中</td>
-	  							<td><a href="saea-reportList-detail.html">详情</a></td>
-	  						</tr>
-	  						<tr>
-	  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
-								<td>报销单</td>
-	  							<td class="taR colOrange"><b>￥1212.00</b></td>
-	  							<td class="taR"></td>
-	  							<td>广东办</td>
-	  							<td>#B201405286811<p class="colGray">2015-2-21</p></td>
-	  							<td>说明说明说明说明</td>
-	  							<td>审批中</td>
-	  							<td><a href="saea-reportList-detail.html">详情</a></td>
-	  						</tr>
-							<tr>
-								<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
-								<td>对公汇款</td>
-								<td class="taR colOrange"><b>￥1212.00</b></td>
-								<td class="taR "><span class="colGreen">收入</span>￥110.00</td>
-								<td>广东办</td>
-								<td>#G201405286811<p class="colGray">2015-2-21</p></td></td>
-								<td>说明说明说明说明</td>
-								<td class="colBlue">执行中<p class="colGray">2015-2-23</p></td>
-								<td><a href="saea-reportList-detail.html">详情</a></td>
-							</tr>
-							<tr>
-								<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
-								<td>对公汇款</td>
-								<td class="taR colOrange"><b>￥1212.00</b></td>
-								<td class="taR "><span class="colGreen">收入</span>￥110.00</td>
-								<td>广东办</td>
-								<td>#G201405286811<p class="colGray">2015-2-21</p></td>
-								<td>说明说明说明说明</td>
-								<td class="colGreen">费用完成<p class="colGray">2015-2-23</p></td>
-								<td><a href="saea-reportList-detail.html">详情</a></td>
-							</tr>
-							<tr>
-								<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
-								<td>借款</td>
-								<td class="taR colOrange"><b>￥1212.00</b></td>
-								<td class="taR "><span class="colRed">支出</span>￥300.00</td>
-								<td>广东办</td>
-								<td>#J201405286811<p class="colGray">2015-2-21</p></td></td>
-								<td>说明说明说明说明</td>
-								<td class="colBlue">执行中<p class="colGray">2015-2-23</p></td>
-								<td><a href="saea-reportList-detail.html">详情</a></td>
-							</tr>
-							<tr>
-								<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
-								<td>借款（报销）</td>
-								<td class="taR colOrange"><b>￥2000.00</b><br><b class="colRed">￥1864.00</b></td>
-								<td class="taR "><span class="colRed">支出</span>￥300.00</td>
-								<td>广东办</td>
-								<td>#J201405286811<p class="colGray">2015-2-21</p></td>
-								<td>说明说明说明说明</td>
-								<td class="colGreen">费用完成<p class="colGray">2015-2-23</p></td>
-								<td><a href="saea-reportList-detail.html">详情</a></td>
-							</tr>
-							<tr>
-								<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
-								<td>借款（报销）</td>
-								<td class="taR colOrange"><b>￥2000.00</b><br><b class="colGreen">￥3641.00</b></td>
-								<td class="taR "><span class="colRed">支出</span>￥300.00</td>
-								<td>广东办</td>
-								<td>#J201405286811<p class="colGray">2015-2-21</p></td>
-								<td>说明说明说明说明</td>
-								<td class="colGreen">费用完成<p class="colGray">2015-2-23</p></td>
-								<td><a href="saea-reportList-detail.html">详情</a></td>
-							</tr>
-							<!--培训班-->
-							<tr>
-								<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
-								<td>借款<br><a href="saea-reportList-report2.html" target="_blank">培训班</a></td>
-								<td class="taR colOrange"><b>￥2000.00</b><br><b class="colRed">0.00</b></td>
-								<td class="taR "><span class="colRed">支出</span>￥300.00</td>
-								<td>广东办</td>
-								<td>#J201405286811<p class="colGray">2015-2-21</p></td>
-								<td>说明说明说明说明</td>
-								<td class="colGreen">费用完成<p class="colGray">2015-2-23</p></td>
-								<td><a href="saea-reportList-detail.html">详情</a></td>
-							</tr>
-	  					</tbody>
-	  				</table>
-
-						<ul class="pagination fR">
-			  					<li><a href="#" title="上一页">&lt;</a></li>
-			  					<li class="active"><a href="#">1</a></li>
-			  					<li><a href="#">2</a></li>
-			  					<li><a href="#">3</a></li>
-			  					<li><a href="#">4</a></li>
-			  					<li><a href="#">5</a></li>
-			  					<li class="point"><span>...</span></li>
-			  					<li><a href="#" title="下一页">&gt;</a></li>
-			  		</ul>
-						<ul class="pagination fR">
-			  					<li><a href="#" title="上一页">&lt;</a></li>
-			  					<li><a href="#">1</a></li>
-			  					<li class="point"><span>...</span></li>
-			  					<li><a href="#">3</a></li>
-			  					<li><a href="#">4</a></li>
-			  					<li class="active"><a href="#">5</a></li>
-			  					<li><a href="#">6</a></li>
-			  					<li><a href="#">7</a></li>
-			  					<li class="point"><span>...</span></li>
-			  					<li><a href="#" title="下一页">&gt;</a></li>
-			  		</ul>
-	  			</div>
-	  		</div>
+						</div>
+						<div><select style="width:120px"><option>年份</option><option>2020年</option></select></div>
+						<div><select style="width:120px"><option>月份</option><option>全年</option><option>1月</option><option>2月</option><option>3月</option><option>4月</option><option>5月</option><option>6月</option><option>7月</option><option>8月</option><option>9月</option><option>10月</option><option>11月</option><option>12月</option></select></div>
+						<div class="clearfix">
+							<select class="fL"><option>请选择所在办事处</option><option>广东办</option><option>总部</option></select>
+						</div>
+						<div class="clearfix">
+							<select class="fL"><option>请选择员工</option></select>
+						</div>
+						<div class="clearfix">
+							<select class="fL"><option>请选择费用类型</option><option>培训班</option><option>报销单</option><option>对公汇款</option><option>借款</option></select>
+						</div>
+						<a class="button stockdemandBtn">点击查询</a>
+					</div>
+				</div>
+				<div class="libraryContent">
+					<legend><div class="fR"></div>所有费用列表</legend>
+					<div class="demandCate">
+						<div class="saeaScreen">
+							<span>2020年 <a href="" class="icon-">k</a> </span>
+							<span>2月 <a href="" class="icon-">k</a> </span>
+							<span>广东办 <a href="" class="icon-">k</a> </span>
+							<span>刘飞 <a href="" class="icon-">k</a> </span>
+						</div>
+						<!-- <ul class="cateList">
+		  					<li><select><option>办事处</option></select> <select><option>员工</option></select></li>
+		  				</ul> -->
+		  			</div>
+					<div class="saeaList">
+			  			<!--待审批列表-->
+			  			<div class="entry">
+			  				<table class="table table-bordered table-condensed">
+			  					<thead><tr><th width="54" class="taC">上报人</th><th width="80" class="taC">费用类型</th><th width="100" class="taC">费用总金额</th><th width="100" class="taC">费用结算</th><th width="120" class="taC">费用所在办事处</th><th width="120" class="taC">费用单号</th><th class="taC">费用说明</th><th width="100" class="taC">状态</th><th width="100" class="taC">操作</th></tr></thead>
+			  					<tbody>
+			  						<tr>
+			  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+										<td>培训班结算</td>
+			  							<td class="taR colOrange"><b>￥21212.00</b></td>
+			  							<td class="taR"></td>
+			  							<td>广东办</td>
+			  							<td>#B201405286811<p class="colGray">2015-2-21</p></td>
+			  							<td>说明说明说明说明</td>
+										<td>审批中</td>
+			  							<td><a href="saea-reportList-report2.html">详情</a></td>
+			  						</tr>
+			  						<tr>
+			  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+										<td>报销单</td>
+			  							<td class="taR colOrange"><b>￥1212.00</b></td>
+			  							<td class="taR"></td>
+			  							<td>广东办</td>
+			  							<td>#B201405286811<p class="colGray">2015-2-21</p></td>
+			  							<td>说明说明说明说明</td>
+										<td>审批中</td>
+			  							<td><a href="saea-reportList-detail.html">详情</a></td>
+			  						</tr>
+			  						<tr>
+			  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+										<td>报销单</td>
+			  							<td class="taR colOrange"><b>￥1212.00</b></td>
+			  							<td class="taR"></td>
+			  							<td>广东办</td>
+			  							<td>#B201405286811<p class="colGray">2015-2-21</p></td></td>
+			  							<td>说明说明说明说明</td>
+			  							<td>审批中</td>
+			  							<td><a href="saea-reportList-detail.html">详情</a></td>
+			  						</tr>
+			  						<tr>
+			  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+										<td>报销单</td>
+			  							<td class="taR colOrange"><b>￥1212.00</b></td>
+			  							<td class="taR"></td>
+			  							<td>广东办</td>
+			  							<td>#B201405286811<p class="colGray">2015-2-21</p></td>
+			  							<td>说明说明说明说明</td>
+			  							<td>审批中</td>
+			  							<td><a href="saea-reportList-detail.html">详情</a></td>
+			  						</tr>
+									<tr>
+										<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+										<td>对公汇款</td>
+										<td class="taR colOrange"><b>￥1212.00</b></td>
+										<td class="taR "><span class="colGreen">收入</span>￥110.00</td>
+										<td>广东办</td>
+										<td>#G201405286811<p class="colGray">2015-2-21</p></td></td>
+										<td>说明说明说明说明</td>
+										<td class="colBlue">执行中<p class="colGray">2015-2-23</p></td>
+										<td><a href="saea-reportList-detail.html">详情</a></td>
+									</tr>
+									<tr>
+										<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+										<td>对公汇款</td>
+										<td class="taR colOrange"><b>￥1212.00</b></td>
+										<td class="taR "><span class="colGreen">收入</span>￥110.00</td>
+										<td>广东办</td>
+										<td>#G201405286811<p class="colGray">2015-2-21</p></td>
+										<td>说明说明说明说明</td>
+										<td class="colGreen">费用完成<p class="colGray">2015-2-23</p></td>
+										<td><a href="saea-reportList-detail.html">详情</a></td>
+									</tr>
+									<tr>
+										<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+										<td>借款</td>
+										<td class="taR colOrange"><b>￥1212.00</b></td>
+										<td class="taR "><span class="colRed">支出</span>￥300.00</td>
+										<td>广东办</td>
+										<td>#J201405286811<p class="colGray">2015-2-21</p></td></td>
+										<td>说明说明说明说明</td>
+										<td class="colBlue">执行中<p class="colGray">2015-2-23</p></td>
+										<td><a href="saea-reportList-detail.html">详情</a></td>
+									</tr>
+									<tr>
+										<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+										<td>借款（报销）</td>
+										<td class="taR colOrange"><b>￥2000.00</b><br><b class="colRed">￥1864.00</b></td>
+										<td class="taR "><span class="colRed">支出</span>￥300.00</td>
+										<td>广东办</td>
+										<td>#J201405286811<p class="colGray">2015-2-21</p></td>
+										<td>说明说明说明说明</td>
+										<td class="colGreen">费用完成<p class="colGray">2015-2-23</p></td>
+										<td><a href="saea-reportList-detail.html">详情</a></td>
+									</tr>
+									<tr>
+										<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+										<td>借款（报销）</td>
+										<td class="taR colOrange"><b>￥2000.00</b><br><b class="colGreen">￥3641.00</b></td>
+										<td class="taR "><span class="colRed">支出</span>￥300.00</td>
+										<td>广东办</td>
+										<td>#J201405286811<p class="colGray">2015-2-21</p></td>
+										<td>说明说明说明说明</td>
+										<td class="colGreen">费用完成<p class="colGray">2015-2-23</p></td>
+										<td><a href="saea-reportList-detail.html">详情</a></td>
+									</tr>
+									<!--培训班-->
+									<tr>
+										<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+										<td>借款<br><a href="saea-reportList-report2.html" target="_blank">培训班</a></td>
+										<td class="taR colOrange"><b>￥2000.00</b><br><b class="colRed">0.00</b></td>
+										<td class="taR "><span class="colRed">支出</span>￥300.00</td>
+										<td>广东办</td>
+										<td>#J201405286811<p class="colGray">2015-2-21</p></td>
+										<td>说明说明说明说明</td>
+										<td class="colGreen">费用完成<p class="colGray">2015-2-23</p></td>
+										<td><a href="saea-reportList-detail.html">详情</a></td>
+									</tr>
+			  					</tbody>
+			  				</table>
+								<ul class="pagination fL">
+					  					<li><a href="#" title="上一页">&lt;</a></li>
+					  					<li class="active"><a href="#">1</a></li>
+					  					<li><a href="#">2</a></li>
+					  					<li><a href="#">3</a></li>
+					  					<li><a href="#">4</a></li>
+					  					<li><a href="#">5</a></li>
+					  					<li class="point"><span>...</span></li>
+					  					<li><a href="#" title="下一页">&gt;</a></li>
+					  			</ul>
+								<ul class="pagination fL">
+					  					<li><a href="#" title="上一页">&lt;</a></li>
+					  					<li><a href="#">1</a></li>
+					  					<li class="point"><span>...</span></li>
+					  					<li><a href="#">3</a></li>
+					  					<li><a href="#">4</a></li>
+					  					<li class="active"><a href="#">5</a></li>
+					  					<li><a href="#">6</a></li>
+					  					<li><a href="#">7</a></li>
+					  					<li class="point"><span>...</span></li>
+					  					<li><a href="#" title="下一页">&gt;</a></li>
+					  		</ul>
+			  			</div>
+			  		</div>
+				</div>
 			</div>
 		</div>
 	</div>

saea-bank-baobiao.html

@@ -82,21 +82,21 @@
                 <!--执行列表-->
                 <div class="entry">
                     <table class="table table-bordered table-condensed">
-                        <tr><th class="taC" rowspan="2">日期</th><th class="bgGreen" style="text-align:center;" colspan="7">收入</th><th class="bgRed" style="text-align:center;" colspan="5">支出</th><th class="taC" rowspan="2">余额</th></tr>
-                        <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><th class="taC">支出金额</th><th class="taC">合计</th></tr>
-                        <tr style="background: #fff3e5;"><td>月初金额</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td>8000661.36</td></tr>
-                        <tr><td>2020-6-1</td><td>杨克松/智选康惠，杨克松+陈惠华</td><td>其他</td><td></td><td></td><td>纵横广发</td><td>676.50</td><td></td><td>其他</td><td></td><td>纵横广发</td><td>29.40</td><td></td><td></td></tr>
-                        <tr><td>2020-6-1</td><td></td><td></td><td></td><td></td><td>纵横广发</td><td>4324.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                        <tr><td>2020-6-1</td><td></td><td></td><td></td><td></td><td>纵横广发</td><td>3000.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                        <tr><td>2020-6-1</td><td>支付宝（中国）网络技术有限公司</td><td>纵横知道</td><td></td><td></td><td>纵横广发</td><td>19.80</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                        <tr><td>2020-6-1</td><td>工行活期理财收益</td><td>其他</td><td></td><td></td><td>纵横工行</td><td>556.29</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                        <tr><th class="taC taR" colspan="7">今日总收入</th><th class="taC">8576.59</th><th class="taC taR" colspan="4">今日总支出</th><th class="taC">29.40</th><th class="taC">8009208.55</th></tr>
-                        <tr><td>2020-6-2</td><td>珠海纵横创新软件有限公司/工行活期理财赎回发工资</td><td>其他</td><td></td><td></td><td>纵横广发</td><td>800000.00</td><td></td><td>其他</td><td></td><td>纵横广发</td><td>4.00</td><td></td><td></td></tr>
-                        <tr><td>2020-6-2</td><td></td><td></td><td></td><td></td><td>纵横广发</td><td>9800.00</td><td></td><td>江西办</td><td></td><td>纵横广发</td><td>667.25</td><td></td><td></td></tr>
-                        <tr><td>2020-6-2</td><td></td><td><td></td><td></td></td><td></td><td></td><td></td><td>其他</td><td>赎回工行活期理财至余额存款</td><td>纵横工行</td><td>800000.00</td><td></td><td></td></tr>
-                        <tr><td>2020-6-2</td><td></td><td><td></td><td></td></td><td></td><td></td><td></td><td>其他</td><td></td><td>纵横工行</td><td>2000.00</td><td></td><td></td></tr>
-                        <tr><th class="taC taR" colspan="7">今日总收入</th><th class="taC">809800.00</th><th class="taC taR" colspan="4">今日总支出</th><th class="taC">802671.25</th><th class="taC">8016337.3</th></tr>
-                        <tr><th class="taC taR" colspan="7">总收入</th><th class="taC">818376.59</th><th class="taC taR" colspan="4">总支出</th><th class="taC">802700.65</th><th class="taC"></th></tr>
+                        <tr><th class="taC" rowspan="2">日期</th><th class="bgGreen" style="text-align:center;" colspan="8">收入</th><th class="bgRed" style="text-align:center;" colspan="7">支出</th><th class="taC" rowspan="2">余额</th></tr>
+                        <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><th class="taC">员工</th><th class="taC">支出内容</th><th class="taC">支出银行</th><th class="taC">支出金额</th><th class="taC">合计</th></tr>
+                        <tr style="background: #fff3e5;"><td>月初金额</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td><td></td></td><td>8000661.36</td></tr>
+                        <tr><td>2020-6-1</td><td>杨克松/智选康惠，杨克松+陈惠华</td><td>其他</td><td></td><td></td><td></td><td>纵横广发</td><td>676.50</td><td></td><td>其他</td><td></td><td></td><td></td><td>纵横广发</td><td>29.40</td><td></td><td></td></tr>
+                        <tr><td>2020-6-1</td><td></td><td></td><td></td><td></td><td></td><td>纵横广发</td><td>4324.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                        <tr><td>2020-6-1</td><td></td><td></td><td></td><td></td><td></td><td>纵横广发</td><td>3000.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                        <tr><td>2020-6-1</td><td>支付宝（中国）网络技术有限公司</td><td>纵横知道</td><td></td><td></td><td></td><td>纵横广发</td><td>19.80</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                        <tr><td>2020-6-1</td><td>工行活期理财收益</td><td>其他</td><td></td><td></td><td></td><td>纵横工行</td><td>556.29</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                        <tr><th class="taC taR" colspan="8">今日总收入</th><th class="taC">8576.59</th><th class="taC taR" colspan="6">今日总支出</th><th class="taC">29.40</th><th class="taC">8009208.55</th></tr>
+                        <tr><td>2020-6-2</td><td>珠海纵横创新软件有限公司/工行活期理财赎回发工资</td><td>其他</td><td></td><td><td></td><td></td></td><td>纵横广发</td><td>800000.00</td><td>其他</td><td></td><td></td><td></td><td>纵横广发</td><td>4.00</td><td></td><td></td></tr>
+                        <tr><td>2020-6-2</td><td></td><td></td><td></td><td></td><td></td><td>纵横广发</td><td>9800.00</td><td></td><td></td><td>江西办</td><td></td><td></td><td>纵横广发</td><td>667.25</td><td></td><td></td></tr>
+                        <tr><td>2020-6-2</td><td></td><td><td></td><td></td></td><td></td><td></td><td></td><td></td><td>其他</td><td></td><td></td><td>赎回工行活期理财至余额存款</td><td>纵横工行</td><td>800000.00</td><td></td><td></td></tr>
+                        <tr><td>2020-6-2</td><td></td><td><td></td><td></td></td><td></td><td></td><td></td><td></td><td>其他</td><td></td><td></td><td></td><td>纵横工行</td><td>2000.00</td><td></td><td></td></tr>
+                        <tr><th class="taC taR" colspan="7">今日总收入</th><th class="taC">809800.00</th><th class="taC taR" colspan="7">今日总支出</th><th class="taC">802671.25</th><th class="taC">8016337.3</th></tr>
+                        <tr><th class="taC taR" colspan="7">总收入</th><th class="taC">818376.59</th><th class="taC taR" colspan="7">总支出</th><th class="taC">802700.65</th><th class="taC"></th></tr>
                     </table>
                 </div>
             </div>

saea-myList-detail.html

@@ -414,7 +414,48 @@
 						<div class="entry loan-list">
 							<div class="seal"></div>
 							<div class="seTable">
-								<table class="table table-bordered table-condensed table-hover">
+								<!--借款&报销结算-->
+								<table class="table table-bordered table-condensed">
+									<tr class="warning"><td class="taR"><b>借款</b></td><td class="taR" width="140"><b style="font-size:24px">￥2050.00</b><br>贰仟零伍拾元整</td></tr>
+									<tr class="warning"><td class="taR"><b>本次报销金额</b></td><td class="taR"><b style="font-size:24px">￥2050.00</b><br>贰仟零伍拾元整</td></tr>
+									<tr class="success"><td class="taR"><span class="colGray">报销 - 借款 = </span><b>差额</b></td>
+										<td class="taR"><b style="font-size:24px">0.00</b><br>零元整</td>
+									</tr>
+								</table>
+								<!--借款默认收起-->
+								<p class="taC" style="margin-bottom: 20px" id="open">借款费用详情已收起 <a href="#open-jie" id="open-jie">展开</a></p>
+								<div style="display: none" id="jie-con">
+									<!--汇总-->
+									<table class="table table-bordered table-condensed table-hover">
+										<tbody>
+										<tr class="warning"><td class="taR"><b>（#J1402130405003）本次费用总计</b></td><td class="taR"><b style="font-size:24px">￥2050.00</b><br>贰仟零伍拾元整</td></tr>
+									</tbody>
+									<!--费用-->
+										<tr><th class="taC" colspan="2">费用说明</th></tr>
+										<tr><td colspan="2">这是费用说明的内容</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 class="taC" colspan="2">附件</th>
+										</tr><tr><td colspan="2"><a href="#" class="sFile" target="_blank">发票1.jpg</a><a href="#" class="sFile" target="_blank">QQ截图20150624170045.png</a><a href="#" class="sFile" target="_blank">Doc1.docx</a></td></tr>
+										<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+										<tr><th style="text-align:center" colspan="2">广东办</th></tr>
+										<tr><th colspan="2" class="taC">收款信息</th></tr>
+										<tr><th>收款人户名</th><td>刘飞</td></tr>
+										<tr><th>收款银行</th><td>其他</td></tr>
+										<tr><th>收款开户银行名称</th><td>建行西安长安路支行</td></tr>
+										<tr><th>收款帐号</th><td>61001720015050000695</td></tr>
+										<tr><th>联行号</th><td>301290000007</td></tr>
+									
+									<!--结算/流水-->
+										<tr><th colspan="2" class="taC">费用结算</th></tr><tr><th>结算结果<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th><td class="taR" width="200"><!-- <span class="colGreen">收入</span> --><span class="colRed">支出</span></td></tr>
+										<tr><th>收款金额</th><td class="taR" width="200">￥2050.00</td></tr>
+										</tbody>
+									</table>
+								</div>
+								<p class="taC" style="margin-bottom: 20px;display: none" id="close" ><a href="#close-jie" id="close-jie">收起借款费用详情</a></p>
+								<!-- <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>
@@ -428,7 +469,7 @@
 									<tr><td colspan="2"><a href="#" class="sFile" target="_blank">发票1.jpg</a><a href="#" class="sFile" target="_blank">QQ截图20150624170045.png</a><a href="#" class="sFile" target="_blank">Doc1.docx</a></td></tr>
 									<tr class="warning"><td class="taR"><b>（#G1402130405003）本次费用合计</b></td><td class="taR"><b style="font-size:24px">￥7011.22</b><br>柒仟零壹拾壹元贰角贰分</td></tr>
 									</tbody>
-								</table>
+								</table> -->
 								<!--费用详情（报销）-->
 								<br>
 								<table class="table table-bordered table-condensed table-hover">

saea-receipt-add4.html

@@ -50,6 +50,9 @@
 			</div>
 			<div class="adminContent autoHeight">
 		  		<div class="borad-news">
+		  			<div class="popupTip">
+			  			<span class="popupTipText">错误提示</span>
+			  		</div>
 		  			<div class="fixedSide" id="fixedSide">
 		  				<ul>
 		  					<li class="banshi active"><a href="#banshi">办事处</a></li>
@@ -442,7 +445,7 @@
 						<tr><th>出发/结束日期</th><td>
 									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
 							    data-multiple-dates-separator=" - "
-							    data-language="zh"></td></tr>
+							    data-language="zh">&nbsp;&nbsp;旅程合计：<b class="colRed">8</b>天</td></tr>
 						<tr><th><span class="">┌</span> 出发地</th><td><select><option>广东省</option></select><select><option>珠海市</option></select><a href="">+添加目的地</a></td></tr>
 						<tr><th><span class="">├</span> 目的地</th><td><select><option>广东省</option></select><select><option>广州市</option></select><a href="">+添加目的地</a> <a href="">-移除</a></td></tr>
 						<tr><th><span class="">├</span> 目的地</th><td><select><option>广东省</option></select><select><option>东莞市</option></select><a href="">+添加目的地</a> <a href="">-移除</a></td></tr>