From a881d98d2eee345af7454fd943fccbcc5c8bcb6f Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期一, 04 八月 2025 15:01:40 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/locDetl/locDetl.js |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index bb3d566..664055a 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -9,8 +9,8 @@
         ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
         ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', sort:true}
         ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-        ,{field: 'units', align: 'center',title: '閿�鍞鍗曞彿', hide: true}
-        ,{field: 'units', align: 'center',title: '閿�鍞鍗曡鍙�', hide: true}
+        ,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿', hide: true}
+        ,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�', hide: true}
         ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
         ,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: true}
         ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}
@@ -20,6 +20,8 @@
         ,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
         ,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
         ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+        ,{field: 'proddate$', align: 'center',title: '鐢熶骇鏃ユ湡', hide:false}
+        ,{field: 'deadline$', align: 'center',title: '鍒版湡鏃ユ湡', hide:false}
 
     ];
 
@@ -46,7 +48,8 @@
         page: true,
         limit: 20,
         where:{
-          unreason: false
+            unreason: false,
+            expired: false
         },
         limits: [20, 30, 50, 100, 200, 500],
         even: true,
@@ -192,6 +195,17 @@
                             layer.close(loadIndex);
                             layer.closeAll();
                             if (res.code === 200) {
+                                res.data.forEach((item,index) => {
+                                    if (item[0] != null) {
+                                        item[0] = "'" + item[0];
+                                    }
+                                    if (item[1] != null) {
+                                        item[1] = "'" + item[1];
+                                    }
+                                    if (item[2] != null) {
+                                        item[2] = "'" + item[2];
+                                    }
+                                })
                                 table.exportFile(titles,res.data,'xls');
                             } else if (res.code === 403) {
                                 top.location.href = baseUrl+"/";
@@ -451,7 +465,30 @@
 
         tableIns.reload({
             where: {
-                unreason: true
+                unreason: true,
+                expired:false
+            },
+            page: {
+                curr: pageCurr
+            },
+            done: function (res, curr, count) {
+
+                if (res.code === 403) {
+                    top.location.href = baseUrl+"/";
+                }
+                pageCurr=curr;
+
+                limit(child);
+            }
+        });
+    });
+    form.on('submit(expired)', function (data) {
+        pageCurr = 1;
+
+        tableIns.reload({
+            where: {
+                expired: true,
+                unreason:false
             },
             page: {
                 curr: pageCurr
@@ -501,7 +538,8 @@
 
 function tableReload(child) {
     var searchData = {
-        unreason: false
+        unreason: false,
+        expired: false
     };
     $.each($('#search-box [name]').serializeArray(), function() {
         searchData[this.name] = this.value;

--
Gitblit v1.9.1