From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

---
 src/main/webapp/static/js/report/inOut.js |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/report/inOut.js b/src/main/webapp/static/js/report/inOut.js
index 84a0f22..5c8ef7e 100644
--- a/src/main/webapp/static/js/report/inOut.js
+++ b/src/main/webapp/static/js/report/inOut.js
@@ -17,8 +17,8 @@
         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: '鍑哄簱娆℃暟'}
@@ -116,6 +116,17 @@
         pageCurr = 1;
         tableReload(false);
     });
+    // 鎼滅储鏍忛噸缃簨浠�
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'date'
+        ,range: true
+    });
 });
 
 // 鍏抽棴鍔ㄤ綔

--
Gitblit v1.9.1