合作方导出不打开新窗口

Application/Admin/View/Partner/add.html

@@ -244,9 +244,10 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
     <script type="text/javascript">
         $('.time1').datetimepicker({
-            format: 'yyyy-mm-dd hh:ii',
+            format: 'yyyy-mm-dd',
             language:"zh-CN",
-            minView:0,startDate:new Date(),
+            minView: "month",
+            startDate:new Date(),
             autoclose:true
         }).change(function(){
             var start = new Date($(this).val()).getTime();
@@ -260,9 +261,10 @@
         });
 
         $('.time2').datetimepicker({
-            format: 'yyyy-mm-dd hh:ii',
+            format: 'yyyy-mm-dd',
             language:"zh-CN",
-            minView:0,startDate:new Date(),
+            minView: "month",
+            startDate:new Date(),
             autoclose:true
         }).change(function(){
             var end = new Date($(this).val()).getTime();

Application/Admin/View/Partner/lists.html

@@ -264,7 +264,17 @@
     $(function(){
         $("#downloadexcel").on("click",function(){
             var url = $(this).attr("url");
-            window.open(url, "blank");
+            var title =  '合作方导出';
+            layer.open({
+                type: 2,
+                title: title,
+                shadeClose: true,
+                shade: 0,
+                area: ['40%', '60%'],
+                content: url,
+                zIndex :-5
+            });
+            // window.open(url, "blank");
         });
         $('#time-start').datetimepicker({
             format: 'yyyy-mm-dd',