From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业,和库存明细管理 排序

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

diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 185e5cb..83312e6 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -3,7 +3,11 @@
     var cols = [
         {field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
         ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+        ,{field: 'mat_no', align: 'center',title: '鐗╂枡缂栧彿'}
+        ,{field: 'mat_name', align: 'center',title: '鐗╂枡鍚嶇О'}
     ];
+    arrRemove(detlCols, "field", "matNo");
+    arrRemove(detlCols, "field", "matName")
     cols.push.apply(cols, detlCols);
     return cols;
 }
@@ -43,6 +47,7 @@
             statusCode: 200
         },
         done: function(res, curr, count) {
+            console.log(res);
             if (res.code === 403) {
                 top.location.href = baseUrl+"/";
             }
@@ -88,8 +93,13 @@
                             fields.push(col.field);
                         }
                     });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
                     var param = {
-                        'fields': fields
+                        fields: fields,
+                        exportData: exportData
                     };
                     $.ajax({
                         url: baseUrl+"/report/viewWorkInExport.action",

--
Gitblit v1.9.1