From 296092f6666919867ac630efd986a60642e3d71e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 14 二月 2025 13:52:56 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/report/inOut.js b/src/main/webapp/static/js/report/inOut.js
index 36a37b1..a755f60 100644
--- a/src/main/webapp/static/js/report/inOut.js
+++ b/src/main/webapp/static/js/report/inOut.js
@@ -1,4 +1,5 @@
 var pageCurr;
+var type;
 layui.use(['table','laydate', 'form'], function(){
     var table = layui.table;
     var $ = layui.jquery;
@@ -11,14 +12,14 @@
     tableIns = table.render({
         elem: '#inOut',
         headers: {token: localStorage.getItem('token')},
-        url: '/report/viewInOutList.action',
+        url: baseUrl+'/report/viewInOutList.action',
         page: true,
         limit: 10,
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
-            {type: 'checkbox'}
-            ,{field: 'ymd', align: 'center', title: '鏃ユ湡', sort: true}
+            // {type: 'checkbox'}
+            {field: 'ymd', align: 'center', title: '鏃ユ湡'}
             ,{field: 'source_sta_no', align: 'center',title: '绔欑偣'}
             ,{field: 'sto_qty', align: 'center',title: '鍏ュ簱娆℃暟'}
             ,{field: 'ret_qty', align: 'center',title: '鍑哄簱娆℃暟'}
@@ -41,7 +42,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -63,7 +64,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -76,7 +77,7 @@
         var checkStatus = table.checkStatus(obj.config.id);
         switch(obj.event) {
             case 'exportData':
-                layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
                     var titles=[];
                     var fields=[];
                     obj.config.cols[0].map(function (col) {
@@ -89,19 +90,18 @@
                         'fields': fields
                     };
                     $.ajax({
-                        url: "/report/viewInOutList.action",
+                        url: baseUrl+"/report/viewInOutList.action",
                         headers: {'token': localStorage.getItem('token')},
                         data: JSON.stringify(param),
                         dataType:'json',
                         contentType:'application/json;charset=UTF-8',
                         method: 'POST',
                         success: function (res) {
-                            console.log(res);
                             layer.closeAll();
                             if (res.code === 200) {
                                 table.exportFile(titles,res.data,'xls');
                             } else if (res.code === 403) {
-                                top.location.href = "/";
+                                top.location.href = baseUrl+"/";
                             } else {
                                 layer.msg(res.msg)
                             }
@@ -115,7 +115,71 @@
     // 鎼滅储鏍忔悳绱簨浠�
     form.on('submit(search)', function (data) {
         pageCurr = 1;
-        tableReload(false);
+        tableReload(false,false);
+    });
+
+    // 鎼滅储鏍忛噸缃簨浠�
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        type = 1;
+        clearFormVal($('#search-box'));
+        $('#detlTable').css("display", 'none');
+        tableReload(false,true);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    layDate.render({
+        elem: '#ymd\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#wrkDate\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#ioTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#crnStrTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#crnEndTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#plcStrTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#crnPosTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#refIotime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#modiTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#appeTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#errorTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#logErrTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
     });
 });
 
@@ -124,11 +188,14 @@
     parent.layer.closeAll();
 });
 
-function tableReload(child) {
+function tableReload(child,isReset) {
     var searchData = {};
     $.each($('#search-box [name]').serializeArray(), function() {
         searchData[this.name] = this.value;
     });
+    if(isReset){
+        searchData["type"] = "1";
+    }
     (child ? parent.tableIns : tableIns).reload({
         where: searchData,
         page: {
@@ -136,7 +203,7 @@
         },
         done: function (res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             if (res.data.length === 0 && count !== 0) {

--
Gitblit v1.9.1