财务管理中前端路径的更改

Signed-off-by: you.chen <you.chen@cloudcross.com>

src/main/java/com/cloudcross/ssp/model/mapper/finance.sql.xml

@@ -43,11 +43,12 @@
 	<select id="countByParams" parameterType="map" resultType="int">
 		select count(id) from t_advertiser
 		<where>
+		1 = 1
 			<if test="agentId != null">
-				agent_id = #{agentId}
+			and	agent_id = #{agentId}
 			</if>
 			<if test="advertiserId != null">
-				advertiser_id = #{advertiserId}
+			and	id = #{advertiserId}
 			</if>
 		</where>
 		

src/main/webapp/WEB-INF/pages/advertiser/main/ad/adv-balance/distribution.ftl → src/main/webapp/WEB-INF/pages/advertiser/main/finance/adv-balance/distribution.ftl

@@ -1,157 +1,157 @@
-<@override name="head">
-	<title>财务管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	
-	<script type="text/javascript" >
-	
-		$(function(){
-		
-			$('#dateRangePicker').dateRangePicker();
-			if($('#dateRangePicker').val() == ""){
-				$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-			}
-			
-			//广告主消费记录
-			$("#btn-advBalance").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/adv-balance/list";
-			});
-			
-			//资金管理
-			$("#btn-finance").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/finance-data/list";
-			});
-			
-			//批广告主分配记录
-			$("#btn-distribution").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/adv-balance/distribution";
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/adv-balance/exportAllocateReportExcel?selectedAdvertiserId="+$("#advertiserId").val()+"&dateRangePicker="+$("#dateRangePicker").val());
-		};
-		
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler" style="padding:20px 0px; margin:0px;">
-			<ul>
-				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/adv-balance/list">财务管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">广告主分配记录</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<form id="formPage" action="${ctx}/advertiser/main/ad/adv-balance/distribution" method="post">
-				<input type="hidden" id="role" value="${role}">
-				<input type="hidden" id="agentId" value="${userSession.agentId}">
-				<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-				<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
-			    <input id="page" name="page" type="hidden" value="${pager.page}"/>
-			  	<div id="buttons">
-			  		<div id="btn-advBalance" class="btn1">广告主消费记录</div>      
-			        <div id="btn-finance" class="btn1">资金管理</div>  
-			        <div id="btn-distribution" class="btn1">广告主分配记录</div> 
-			    </div>
-			    <div id="selectuls" style="clear:both;">
-			    	<span style="float:left;">广告主：</span>
-					<ul id="main_advertiserul" style="margin-right:20px;">
-						<li class="select_box" id="advertiserul_box">
-							<span id="advertiserul_span">${selectedAdvertiserName!}</span>
-							<ul class="son_ul" id="advertiser_son_ul"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedAdvertiserId" id="advertiserId" value="${advertiserId!}">
-					<input type="hidden" name="selectedAdvertiserName" id="advertiserName" value="${selectedAdvertiserName!}">
-					
-					<div class="controls-reset-1" style="float:left;margin-right:10px;">
-						<span id="u18" class="ax_droplist">查看周期： </span>
-						<span id="tex" ><i class="icon-calendar" style="background-image:none;position:absolute;margin:10px 0 0 5px;"></i>
-							<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}" style="padding-left:20px;margin:left:-5px;width:177px;"/>
-						</span>
-					</div>
-					<input id="sign" type="submit" value="查询">
-					<a class="caiwuExport" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-				</div>
-			    </div>
-				<table border="1" class="tablefig" id="tablefig">
-					<thead>
-						<tr>
-							<th style="width:5%;">
-								<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-							</th>
-							<th class="td1" style="width:15%;">时间</th>
-							<th class="td1" style="width:15%;">广告主</th>
-							<th class="td1" style="width:20%;">分配金额（元）</th>
-							<th class="td1" style="width:20%;">消耗信用额度（元）</th>
-							<th class="td1" style="width:20%;">可用信用额度（元）</th>
-						</tr>
-					</thead>
-					<tbody>
-					<#if advBalanceList ??>
-					<#list advBalanceList as advBalance>
-						<tr style="text-align:center;">
-							<td>
-								<label><input  autocomplete="off" type="checkbox" name="id" value="${advBalance.id!}"><span class="lbl"></span></label>
-							</td>
-							<td class="breakword">${advBalance.actTime?date}</td>
-                        	<td class="breakword">${advBalance.advertiserName!}</td>
-							<td class="breakword">${advBalance.allocate!}</td>
-							<td class="breakword">${advBalance.allocate!}</td>
-							<td class="breakword">${advBalance.balance!}</td>
-						</tr>
-					</#list>
-					</#if>
-				</tbody>
-				</table>
-								
-				<div id="pageDiv">
-		            <#include "/common/pagination/simple.ftl"/>
-		        </div>	
-			</form>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+	<title>财务管理</title>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
+	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
+	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	
+	<script type="text/javascript" >
+	
+		$(function(){
+		
+			$('#dateRangePicker').dateRangePicker();
+			if($('#dateRangePicker').val() == ""){
+				$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
+			}
+			
+			//广告主消费记录
+			$("#btn-advBalance").click(function(){
+				location.href = "${ctx}/advertiser/main/finance/adv-balance/list";
+			});
+			
+			//资金管理
+			$("#btn-finance").click(function(){
+				location.href = "${ctx}/advertiser/main/finance/finance-data/list";
+			});
+			
+			//批广告主分配记录
+			$("#btn-distribution").click(function(){
+				location.href = "${ctx}/advertiser/main/finance/adv-balance/distribution";
+			});
+			
+			//复选框按钮
+			$('#tablefig th input:checkbox').live("click", function() {
+				var that = this;
+				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
+					this.checked = that.checked;
+				});
+			});
+
+			// 分页中超链接跳转
+			$('#pagecontent .pagination ul li a[href]').click(function(){
+				var _page = $(this).attr('href').substr(1);
+				var _form = $('#formPage');
+				_form.find('input:hidden[name="page"]').val(_page);
+				_form.submit();
+				return false;
+			});
+			
+		});
+		
+		//导出execl
+		function exportExcel(){
+			$("#exportExcel").attr("href","${ctx}/advertiser/main/finance/adv-balance/exportAllocateReportExcel?selectedAdvertiserId="+$("#advertiserId").val()+"&dateRangePicker="+$("#dateRangePicker").val());
+		};
+		
+	</script>
+	
+</@override>
+
+<@override name="body">
+	<!-- PAGE CONTENT BEGINS HERE -->
+	<div id=content_bg>
+	<#include "/advertiser/main/public-head.ftl">
+    <div id= "pagecontent">
+		<div id="handler" style="padding:20px 0px; margin:0px;">
+			<ul>
+				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
+				<span class="divider1"><i class="icon-angle-right"></i></span></li>
+				<li class="size2"><a href="${ctx}/advertiser/main/ad/adv-balance/list">财务管理</a></li>
+				<span class="divider2"><i class="icon-angle-right"></i></span>
+				<li class="size3" id="handlerName">广告主分配记录</li>
+			</ul>  
+		</div>
+		<div id="content">
+			<form id="formPage" action="${ctx}/advertiser/main/finance/adv-balance/distribution" method="post">
+				<input type="hidden" id="role" value="${role}">
+				<input type="hidden" id="agentId" value="${userSession.agentId}">
+				<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
+				<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
+			    <input id="page" name="page" type="hidden" value="${pager.page}"/>
+			  	<div id="buttons">
+			  		<div id="btn-advBalance" class="btn1">广告主消费记录</div>      
+			        <div id="btn-finance" class="btn1">资金管理</div>  
+			        <div id="btn-distribution" class="btn1">广告主分配记录</div> 
+			    </div>
+			    <div id="selectuls" style="clear:both;">
+			    	<span style="float:left;">广告主：</span>
+					<ul id="main_advertiserul" style="margin-right:20px;">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedAdvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedAdvertiserId" id="advertiserId" value="${advertiserId!}">
+					<input type="hidden" name="selectedAdvertiserName" id="advertiserName" value="${selectedAdvertiserName!}">
+					
+					<div class="controls-reset-1" style="float:left;margin-right:10px;">
+						<span id="u18" class="ax_droplist">查看周期： </span>
+						<span id="tex" ><i class="icon-calendar" style="background-image:none;position:absolute;margin:10px 0 0 5px;"></i>
+							<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}" style="padding-left:20px;margin:left:-5px;width:177px;"/>
+						</span>
+					</div>
+					<input id="sign" type="submit" value="查询">
+					<a class="caiwuExport" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				</div>
+			    </div>
+				<table border="1" class="tablefig" id="tablefig">
+					<thead>
+						<tr>
+							<th style="width:5%;">
+								<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
+							</th>
+							<th class="td1" style="width:15%;">时间</th>
+							<th class="td1" style="width:15%;">广告主</th>
+							<th class="td1" style="width:20%;">分配金额（元）</th>
+							<th class="td1" style="width:20%;">消耗信用额度（元）</th>
+							<th class="td1" style="width:20%;">可用信用额度（元）</th>
+						</tr>
+					</thead>
+					<tbody>
+					<#if advBalanceList ??>
+					<#list advBalanceList as advBalance>
+						<tr style="text-align:center;">
+							<td>
+								<label><input  autocomplete="off" type="checkbox" name="id" value="${advBalance.id!}"><span class="lbl"></span></label>
+							</td>
+							<td class="breakword">${advBalance.actTime?date}</td>
+                        	<td class="breakword">${advBalance.advertiserName!}</td>
+							<td class="breakword">${advBalance.allocate!}</td>
+							<td class="breakword">${advBalance.allocate!}</td>
+							<td class="breakword">${advBalance.balance!}</td>
+						</tr>
+					</#list>
+					</#if>
+				</tbody>
+				</table>
+								
+				<div id="pageDiv">
+		            <#include "/common/pagination/simple.ftl"/>
+		        </div>	
+			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/adv-balance/list.ftl → src/main/webapp/WEB-INF/pages/advertiser/main/finance/adv-balance/list.ftl

@@ -1,196 +1,196 @@
-<@override name="head">
-	<title>财务管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
-	
-	
-	<script type="text/javascript" >
-		$(function(){
-		
-			$('#dateRangePicker').dateRangePicker();
-			if($('#dateRangePicker').val() == ""){
-				$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-			}
-			
-			//广告主消费记录
-			$("#btn-advBalance").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/adv-balance/list";
-			});
-			
-			//资金管理
-			$("#btn-finance").click(function(){
-				location.href = "${ctx}/advertiser/main/finance/finance-data/list";
-			});
-			
-			//批广告主分配记录
-			$("#btn-distribution").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/adv-balance/distribution";
-			});
-			
-			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-			
-			$("#type_son_ul").hide();
-			$("#typeul_span").on("click",function(){
-		 		$('#type_son_ul').show(); //ul显示
-		 	});
-		 	$("#typeId").val(0);
-			$('ul#type_son_ul li').live("click",function(){
-				$(this).parents('li').find('span').html($(this).html());
-				$("#typeId").val($(this).attr("typeValue"));
-				$("#typeName").val($(this).html());
-				$('#type_son_ul').hide(); //ul隐藏
-				if($(this).attr("typeValue") == "charge"){
-					$("#chargeTh").attr("style","display:block;line-height:80px;width:220px;");
-					$(".chargeTd").attr("style","display:block;line-height:60px;width:220px;");
-				}else{
-					$("#chargeTh").attr("style","display:none");
-					$(".chargeTd").attr("style","display:none");
-				}
-			});
-			$("ul#main_typeul #typeul_select_box").mouseleave(function(){
-		 		$('#type_son_ul').hide(); //ul隐藏
-		 	});
-
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').click(function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-			
-		});
-		
-		//导出execl
-		function exportExcel(){
-			$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/adv-balance/exportDataReportExcel?selectedAdvertiserId="+$("#advertiserId").val()+"&dateRangePicker="+$("#dateRangePicker").val()+"&type="+$("#typeId").val());
-		};
-	
-	</script>
-	
-</@override>
-
-<@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<div id=content_bg>
-	<#include "/advertiser/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler" style="padding:20px 0px; margin:0px;">
-			<ul>
-				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/advertiser/main/ad/adv-balance/list">财务管理</a></li>
-				<span class="divider2"><i class="icon-angle-right"></i></span>
-				<li class="size3" id="handlerName">广告主消费记录</li>
-			</ul>  
-		</div>
-		<div id="content">
-			<form id="formPage" action="${ctx}/advertiser/main/ad/adv-balance/list" method="post">
-				<input type="hidden" id="role" value="${role}">
-				<input type="hidden" id="agentId" value="${userSession.agentId}">
-				<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-				<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
-			    <input id="page" name="page" type="hidden" value="${pager.page}"/>
-			  	<div id="buttons">
-			  		<div id="btn-advBalance" class="btn1">广告主消费记录</div>      
-			        <div id="btn-finance" class="btn1">资金管理</div>  
-			        <div id="btn-distribution" class="btn1">广告主分配记录</div> 
-			    </div>
-			    <div id="selectuls" style="clear:both;">
-			    	<span style="float:left;">广告主：</span>
-					<ul id="main_advertiserul" style="margin-right:20px;">
-						<li class="select_box" id="advertiserul_box">
-							<span id="advertiserul_span">${selectedAdvertiserName!}</span>
-							<ul class="son_ul" id="advertiser_son_ul"></ul>
-						</li>
-					</ul>
-					<input type="hidden" name="selectedAdvertiserId" id="advertiserId" value="${advertiserId!}">
-					<input type="hidden" name="selectedAdvertiserName" id="advertiserName" value="${selectedAdvertiserName!}">
-					
-					<div class="controls-reset-1" style="float:left;margin-right:20px;">
-						<span id="u18" class="ax_droplist">查看周期： </span>
-						<span id="tex" ><i class="icon-calendar" style="background-image:none;position:absolute;margin:10px 0 0 5px;"></i>
-							<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}" style="padding-left:20px;margin:left:-5px;width:177px;"/>
-						</span>
-					</div>
-					<span style="float:left;">操作类型：</span>
-					<ul id="main_typeul">
-						<li class="select_box" id="typeul_select_box">
-							<span id="typeul_span">${typeName!}</span>
-							<ul class="son_ul" id="type_son_ul">
-								<li typeValue="0">请选择操作类型</li>
-								<li typeValue="charge">充值</li>
-								<li typeValue="consume">消费</li>
-								<li typeValue="allocate">分配</li>
-							</ul>
-						</li>
-					</ul>
-					<input type="hidden" name="type" id="typeId" value="${type!}">
-					<input type="hidden" name="typeName" id="typeName" value="${typeName!}">
-					
-					<input id="sign" type="submit" value="查询">
-					<a class="caiwuExport" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-				</div>
-			    </div>
-				<table border="1" class="tablefig" id="tablefig">
-					<thead>
-						<tr>
-							<th style="width:5%;">
-								<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-							</th>
-							<th class="td1" style="width:10%;">时间</th>
-							<th class="td1" style="width:20%;">广告主</th>
-							<th id="chargeTh" class="td1" style="display:none;">交易号</th>
-							<th class="td1" style="width:16%;">费用类型</th>
-							<th class="td1" style="width:22%;">金额（元）</th>
-							<th class="td1" style="width:16%;">余额（元）</th>
-						</tr>
-					</thead>
-					<tbody>
-					<#if advBalanceList ??>
-					<#list advBalanceList as advBalance>
-						<tr style="text-align:center;">
-							<td class="center">
-								<label><input  autocomplete="off" type="checkbox" name="id" value="${advBalance.id!}"><span class="lbl"></span></label>
-							</td>
-							<td class="breakword">${advBalance.actTime?date}</td>
-                        	<td class="breakword">${advBalance.advertiserName!}</td>
-							<td class="breakword chargeTd" style="display:none;">${advBalance.num!}</td>
-				        	<td class="breakword">${advBalance.type!}</td>
-							<td class="breakword">${advBalance.cash!}</td>
-							<td class="breakword">${advBalance.balance!}</td>
-						</tr>
-					</#list>
-					</#if>
-				</tbody>
-				</table>
-								
-				<div id="pageDiv"  style="margin: 10px 36px 0 0;">
-		            <#include "/common/pagination/simple.ftl"/>
-		        </div>	
-			</form>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
+<@override name="head">
+	<title>财务管理</title>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
+	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
+	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	
+	
+	<script type="text/javascript" >
+		$(function(){
+		
+			$('#dateRangePicker').dateRangePicker();
+			if($('#dateRangePicker').val() == ""){
+				$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
+			}
+			
+			//广告主消费记录
+			$("#btn-advBalance").click(function(){
+				location.href = "${ctx}/advertiser/main/finance/adv-balance/list";
+			});
+			
+			//资金管理
+			$("#btn-finance").click(function(){
+				location.href = "${ctx}/advertiser/main/finance/finance-data/list";
+			});
+			
+			//批广告主分配记录
+			$("#btn-distribution").click(function(){
+				location.href = "${ctx}/advertiser/main/finance/adv-balance/distribution";
+			});
+			
+			//复选框按钮
+			$('#tablefig th input:checkbox').live("click", function() {
+				var that = this;
+				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
+					this.checked = that.checked;
+				});
+			});
+			
+			$("#type_son_ul").hide();
+			$("#typeul_span").on("click",function(){
+		 		$('#type_son_ul').show(); //ul显示
+		 	});
+		 	$("#typeId").val(0);
+			$('ul#type_son_ul li').live("click",function(){
+				$(this).parents('li').find('span').html($(this).html());
+				$("#typeId").val($(this).attr("typeValue"));
+				$("#typeName").val($(this).html());
+				$('#type_son_ul').hide(); //ul隐藏
+				if($(this).attr("typeValue") == "charge"){
+					$("#chargeTh").attr("style","display:block;line-height:80px;width:220px;");
+					$(".chargeTd").attr("style","display:block;line-height:60px;width:220px;");
+				}else{
+					$("#chargeTh").attr("style","display:none");
+					$(".chargeTd").attr("style","display:none");
+				}
+			});
+			$("ul#main_typeul #typeul_select_box").mouseleave(function(){
+		 		$('#type_son_ul').hide(); //ul隐藏
+		 	});
+
+			// 分页中超链接跳转
+			$('#pagecontent .pagination ul li a[href]').click(function(){
+				var _page = $(this).attr('href').substr(1);
+				var _form = $('#formPage');
+				_form.find('input:hidden[name="page"]').val(_page);
+				_form.submit();
+				return false;
+			});
+			
+		});
+		
+		//导出execl
+		function exportExcel(){
+			$("#exportExcel").attr("href","${ctx}/advertiser/main/finance/adv-balance/exportDataReportExcel?selectedAdvertiserId="+$("#advertiserId").val()+"&dateRangePicker="+$("#dateRangePicker").val()+"&type="+$("#typeId").val());
+		};
+	
+	</script>
+	
+</@override>
+
+<@override name="body">
+	<!-- PAGE CONTENT BEGINS HERE -->
+	<div id=content_bg>
+	<#include "/advertiser/main/public-head.ftl">
+    <div id= "pagecontent">
+		<div id="handler" style="padding:20px 0px; margin:0px;">
+			<ul>
+				<li class="size1" style="margin-left:0px;"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>
+				<span class="divider1"><i class="icon-angle-right"></i></span></li>
+				<li class="size2"><a href="${ctx}/advertiser/main/finance/adv-balance/list">财务管理</a></li>
+				<span class="divider2"><i class="icon-angle-right"></i></span>
+				<li class="size3" id="handlerName">广告主消费记录</li>
+			</ul>  
+		</div>
+		<div id="content">
+			<form id="formPage" action="${ctx}/advertiser/main/finance/adv-balance/list" method="post">
+				<input type="hidden" id="role" value="${role}">
+				<input type="hidden" id="agentId" value="${userSession.agentId}">
+				<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
+				<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
+			    <input id="page" name="page" type="hidden" value="${pager.page}"/>
+			  	<div id="buttons">
+			  		<div id="btn-advBalance" class="btn1">广告主消费记录</div>      
+			        <div id="btn-finance" class="btn1">资金管理</div>  
+			        <div id="btn-distribution" class="btn1">广告主分配记录</div> 
+			    </div>
+			    <div id="selectuls" style="clear:both;">
+			    	<span style="float:left;">广告主：</span>
+					<ul id="main_advertiserul" style="margin-right:20px;">
+						<li class="select_box" id="advertiserul_box">
+							<span id="advertiserul_span">${selectedAdvertiserName!}</span>
+							<ul class="son_ul" id="advertiser_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedAdvertiserId" id="advertiserId" value="${advertiserId!}">
+					<input type="hidden" name="selectedAdvertiserName" id="advertiserName" value="${selectedAdvertiserName!}">
+					
+					<div class="controls-reset-1" style="float:left;margin-right:20px;">
+						<span id="u18" class="ax_droplist">查看周期： </span>
+						<span id="tex" ><i class="icon-calendar" style="background-image:none;position:absolute;margin:10px 0 0 5px;"></i>
+							<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}" style="padding-left:20px;margin:left:-5px;width:177px;"/>
+						</span>
+					</div>
+					<span style="float:left;">操作类型：</span>
+					<ul id="main_typeul">
+						<li class="select_box" id="typeul_select_box">
+							<span id="typeul_span">${typeName!}</span>
+							<ul class="son_ul" id="type_son_ul">
+								<li typeValue="0">请选择操作类型</li>
+								<li typeValue="charge">充值</li>
+								<li typeValue="consume">消费</li>
+								<li typeValue="allocate">分配</li>
+							</ul>
+						</li>
+					</ul>
+					<input type="hidden" name="type" id="typeId" value="${type!}">
+					<input type="hidden" name="typeName" id="typeName" value="${typeName!}">
+					
+					<input id="sign" type="submit" value="查询">
+					<a class="caiwuExport" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				</div>
+			    </div>
+				<table border="1" class="tablefig" id="tablefig">
+					<thead>
+						<tr>
+							<th style="width:5%;">
+								<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
+							</th>
+							<th class="td1" style="width:10%;">时间</th>
+							<th class="td1" style="width:20%;">广告主</th>
+							<th id="chargeTh" class="td1" style="display:none;">交易号</th>
+							<th class="td1" style="width:16%;">费用类型</th>
+							<th class="td1" style="width:22%;">金额（元）</th>
+							<th class="td1" style="width:16%;">余额（元）</th>
+						</tr>
+					</thead>
+					<tbody>
+					<#if advBalanceList ??>
+					<#list advBalanceList as advBalance>
+						<tr style="text-align:center;">
+							<td class="center">
+								<label><input  autocomplete="off" type="checkbox" name="id" value="${advBalance.id!}"><span class="lbl"></span></label>
+							</td>
+							<td class="breakword">${advBalance.actTime?date}</td>
+                        	<td class="breakword">${advBalance.advertiserName!}</td>
+							<td class="breakword chargeTd" style="display:none;">${advBalance.num!}</td>
+				        	<td class="breakword">${advBalance.type!}</td>
+							<td class="breakword">${advBalance.cash!}</td>
+							<td class="breakword">${advBalance.balance!}</td>
+						</tr>
+					</#list>
+					</#if>
+				</tbody>
+				</table>
+								
+				<div id="pageDiv"  style="margin: 10px 36px 0 0;">
+		            <#include "/common/pagination/simple.ftl"/>
+		        </div>	
+			</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/advertiser/main/finance/finance-data/allocation.ftl

@@ -36,7 +36,7 @@
 			
 			//批广告主分配记录
 			$("#btn-distribution").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/adv-balance/distribution";
+				location.href = "${ctx}/advertiser/main/finance/adv-balance/distribution";
 			});
 			
 			$("#allocate").blur(function(){

src/main/webapp/WEB-INF/pages/advertiser/main/finance/finance-data/financelist.ftl

@@ -29,7 +29,7 @@
 			
 			//批广告主分配记录
 			$("#btn-distribution").click(function(){
-				location.href = "${ctx}/advertiser/main/ad/adv-balance/distribution";
+				location.href = "${ctx}/advertiser/main/finance/adv-balance/distribution";
 			});
 			
 			//复选框按钮
@@ -131,7 +131,7 @@
                         	<td class="breakword">${finance.adBalance!}</td>
 							<td class="breakword">${finance.sumAllocation!}</td>
 				        	<td class="breakword">${finance.upDated?datetime}</td>
-							<td class="breakword"><a href="${ctx}/advertiser/main/finance/finance-data/allocation?id=${finance.id}&agentBalance=${agentBalance}" style="text-decoration:none;color:#36aeea">资金分配</a></td>
+							<td class="breakword"><a href="${ctx}/advertiser/main/finance/finance-data/allocation?advertiserId=${finance.id}&agentBalance=${agentBalance}" style="text-decoration:none;color:#36aeea">资金分配</a></td>
 						</tr>
 					</#list>
 					</#if>

src/main/webapp/WEB-INF/pages/advertiser/main/public-head.ftl

@@ -31,7 +31,7 @@
 		</@sec.authorize>
 		
 		<@sec.authorize access="hasAnyRole('ROLE_agent_finance,ROLE_MANAGER')">
-			<li><a href="${ctx}/advertiser/main/ad/adv-balance/list"><span>财务管理</span></a></li>
+			<li><a href="${ctx}/advertiser/main/finance/adv-balance/list"><span>财务管理</span></a></li>
 		</@sec.authorize>
 		
 		<@sec.authorize access="hasAnyRole('ROLE_agent_authority,ROLE_MANAGER')">