修复导出未使用抵用券查询bug

src/main/webapp/WEB-INF/templates/basic/voucher/list.ftl

@@ -4,10 +4,14 @@
 
 
 	function exportVoucher(){
-		$.get("/voucher/export",{},function(data){
-			
-		});
-		
+		var form=document.getElementById("myform");
+		form.action="/voucher/excel/export";
+		form.submit();
+	}
+	function queryVoucher(){
+		var form=document.getElementById("myform");
+		form.action="/voucher/queryList";
+		form.submit();
 	}
 	
 </script>
@@ -22,7 +26,7 @@
 </#assign>
 
 <@com.layout title="查询现金券规则" module="marketing" current="voucher_list" pageCss=pageCssContent pageJs=pageJsContent>
-<form class="form-inline search-box widthShow" action="" method="get" autocomplete="off" >
+<form id="myform" class="form-inline search-box widthShow" action="" method="get" autocomplete="off" >
     
     <@com.textInput "dto.uid" "style=\"margin-left: 5px;\"" "UID"/>
     <@com.textInput "dto.description" "style=\"margin-left: 5px;\"" "券描述"/>
@@ -42,8 +46,8 @@
     	</select>
     </div>
 
-    <button type="submit" class="btn btn-primary">查询</button>
-    <button type="button" class="btn btn-success" onclick="javascript:location.href='/voucher/excel/export';" style="margin-left:20px;">导出</button>
+    <button type="submit" class="btn btn-primary" onclick="javascript:queryVoucher();">查询</button>
+    <button type="button" class="btn btn-success" onclick="javascript:exportVoucher();" style="margin-left:20px;">导出</button>
 </form>
 <table class="table table-bordered table-striped widthShow">
     <thead>
@@ -54,16 +58,16 @@
         <th style="width:5%">金额</th>
         <th style="width:15%">有效期</th>
         <th style="width:5%">使用状况</th>
+        <th style="width:7%">描述</th>
         <th style="width:10%">备注</th>
-        <th style="width:7%">券名称</th>
-        <th style="width:10%">操作</th>
+    <!--    <th style="width:10%">操作</th>   -->
     </tr>
     </thead>
     <tbody>
         <#list list as item>
         <tr>
             <td>${item.id!}</td>
-            <td>${item.type!}</td>
+            <td>${item.typeString!}</td>
             <td>${item.uid!}</td>
             <td>${item.amount!}</td>
             <td>${item.startUseDate?string("yyyy-MM-dd")} ~ ${item.endUseDate?string("yyyy-MM-dd")}</td>
@@ -72,9 +76,9 @@
             <#if item.used==0>未使用<#elseif item.used==1>已使用</#if>
             <#if item.useDate??>${item.useDate?string("yyyy-MM-dd")}  </#if>
             </td>
-            <td>${item.remark!}</td>
             <td><a href="/voucherRule/update?id=${item.ruleId!}&page=${paginationData.pageNumber!}">${item.description!}</a></td>
-            <td>操作</td>
+            <td>${item.remark!}</td>
+          <!--  <td>操作</td>  -->
         </tr>
         </#list>
     </tbody>