From 6eb6a4b530627471d41979ccbc977a7371e99c1f Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 15:36:59 +0800
Subject: [PATCH] 找库位

---
 src/main/webapp/static/js/report/workIn.js |   54 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index ec329f9..2ca190e 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -88,32 +88,38 @@
                             fields.push(col.field);
                         }
                     });
-                    var exportData = {};
+                    var param = '?';
                     $.each($('#search-box [name]').serializeArray(), function() {
-                        exportData[this.name] = this.value;
+                        param += this.name + '=' + this.value + '&';
                     });
-                    var param = {
-                        fields: fields,
-                        exportData: exportData
-                    };
-                    $.ajax({
-                        url: baseUrl+"/report/viewWorkInExport.action",
-                        headers: {'token': localStorage.getItem('token')},
-                        data: JSON.stringify(param),
-                        dataType:'json',
-                        contentType:'application/json;charset=UTF-8',
-                        method: 'POST',
-                        success: function (res) {
-                            layer.closeAll();
-                            if (res.code === 200) {
-                                table.exportFile(titles,res.data,'xls');
-                            } else if (res.code === 403) {
-                                top.location.href = baseUrl+"/";
-                            } else {
-                                layer.msg(res.msg)
-                            }
-                        }
-                    });
+                    window.location.href = baseUrl + "/report/download/in" + param;
+                    layer.closeAll();
+                    // var exportData = {};
+                    // $.each($('#search-box [name]').serializeArray(), function() {
+                    //     exportData[this.name] = this.value;
+                    // });
+                    // var param = {
+                    //     fields: fields,
+                    //     exportData: exportData
+                    // };
+                    // $.ajax({
+                    //     url: baseUrl+"/report/viewWorkInExport.action",
+                    //     headers: {'token': localStorage.getItem('token')},
+                    //     data: JSON.stringify(param),
+                    //     dataType:'json',
+                    //     contentType:'application/json;charset=UTF-8',
+                    //     method: 'POST',
+                    //     success: function (res) {
+                    //         layer.closeAll();
+                    //         if (res.code === 200) {
+                    //             table.exportFile(titles,res.data,'xls');
+                    //         } else if (res.code === 403) {
+                    //             top.location.href = baseUrl+"/";
+                    //         } else {
+                    //             layer.msg(res.msg)
+                    //         }
+                    //     }
+                    // });
                 });
                 break;
         }

--
Gitblit v1.9.1