From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/report/viewWorkIn.html | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index fbd97fc..63930ca 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -6,12 +6,12 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="/static/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="/static/css/cool.css" media="all">
- <link rel="stylesheet" href="/static/css/common.css" media="all">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
#btn-export {
- float:initial !important;
+ margin-top: 10px;
}
</style>
</head>
@@ -19,14 +19,21 @@
<!-- 鎼滅储鏍� -->
<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 class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" 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: 300px">
+ </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>
@@ -44,11 +51,11 @@
<script type="text/html" id="operate">
</script>
-<script type="text/javascript" src="/static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="/static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="/static/js/report/workIn.js" charset="utf-8"></script>
-<script type="text/javascript" src="/static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="/static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/report/workIn.js" charset="utf-8"></script>
</body>
</html>
--
Gitblit v1.9.1