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/views/report/viewInOut.html | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/report/viewInOut.html b/src/main/webapp/views/report/viewInOut.html
index 1605823..0e9c735 100644
--- a/src/main/webapp/views/report/viewInOut.html
+++ b/src/main/webapp/views/report/viewInOut.html
@@ -11,7 +11,7 @@
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
#btn-export {
- float:initial !important;
+ margin-top: 10px;
}
</style>
</head>
@@ -19,18 +19,22 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
- <!--<div class="layui-inline">-->
- <!--<label class="layui-form-label">搴� 浣� 鍙凤細</label>-->
- <!--<div class="layui-input-inline">-->
- <!--<input class="layui-input" type="text" name="id" placeholder="璇疯緭鍏�" autocomplete="off">-->
- <!--</div>-->
- <!--</div>-->
-
- <!-- 寰呮坊鍔� -->
-<!-- <div id="data-search-btn" class="layui-btn-container layui-form-item">-->
-<!-- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>-->
-<!-- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>-->
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">搴� 浣� 鍙凤細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="id" placeholder="璇疯緭鍏�" autocomplete="off">-->
+<!-- </div>-->
<!-- </div>-->
+
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 290px">
+ </div>
+ </div>
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
</div>
<!-- 琛ㄦ牸 -->
--
Gitblit v1.9.1