Merge remote-tracking branch 'origin/lmy_start' into lmy_start

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/financial/export.html

@@ -59,6 +59,8 @@
 
 <script th:inline="javascript">
     var prefix = ctx + "tools/export";
+    var url = prefix;
+    var formData = new FormData();
 
     $("input[name='timeStart']").datetimepicker({
         format: "yyyy-mm-dd hh:ii:ss",
@@ -77,37 +79,55 @@
         var et = document.getElementById("endTime").value;
         if (type == 0) {
             alert("请选择导出类型");
+            return
         } else if (type == 1) {//商品导出逻辑
             if (st == "" || et == "") {
                 alert("请选择时间范围");
+                return
+            } else {
+                url = url + "/export/commodityOrder";
             }
-        } else if (type == 2) {//商品导出逻辑
+        } else if (type == 2) {//演出[订单时间]
             if (st == "" || et == "") {
                 alert("请选择时间范围");
+                return
+            } else {
+                url = url + "/export/orderInfo";
             }
-        } else if (type == 4) {//商品导出逻辑
+        } else if (type == 3) {//演出[演出id]
+            if (performanceId == "") {
+                alert("演出id不能为空");
+                return
+            } else {
+                url = url + "/export/orderInfo";
+            }
+        } else if (type == 4) {//演出[演出时间]
             if (st == "" || et == "") {
                 alert("请选择时间范围");
+                return
+            } else {
+                url = url + "/export/orderInfo";
             }
-        } else if (type == 5) {//商品导出逻辑
+        } else if (type == 5) {//会员[订单时间]
             if (st == "" || et == "") {
                 alert("请选择时间范围");
+                return
+            } else {
+                url = url + "/export/memberOrder";
             }
-        } else if (type == 3) {//演出导出逻辑
-            if (performanceId == "") {
-                alert("演出id不能为空");
-            }
         }
-        // $.ajax({
-        //     url: prefix + "/platform/basicServices/alOss/upload",//路径是你控制器中上传图片的方法，下面controller里面我会写到
-        //     data: formData,
-        //     cache: false,
-        //     contentType: false,
-        //     processData: false,
-        //     type: 'POST',
-        //     success: function (res) {
-        //     }
-        // });
+        var options = {
+            modalName: "财务导出",
+            exportUrl:url,
+        }
+        $.table.init(options);
+        var param = {
+            "beginTime": st,
+            "endTime": et,
+            "showId":performanceId
+        };
+        $.table.exportExcel("", param)
+        url = prefix;
     }
 </script>
 </body>