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/stoMan/stoQue.html | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index 0d10b8f..9f881d3 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -6,12 +6,11 @@
<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;
}
#refresh-sto {
display: none;
@@ -28,19 +27,27 @@
<!-- 鎼滅储鏍� -->
<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 cool-auto-complete">
- <input id="locNo" class="layui-input" name="loc_no" type="text" onkeyup="check(this.id, 'locDetl')" autocomplete="off" style="display: none">
- <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </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="loc_sts" placeholder="搴撲綅鐘舵��" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="barcode" 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="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -49,7 +56,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="refresh-sto" lay-event="refreshSto">鏇存柊搴撳瓨</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" id="refresh-sto" lay-event="refreshSto" style="margin-left: 10px">鏇存柊搴撳瓨</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
</script>
@@ -57,7 +64,7 @@
<table class="layui-hide" id="stoQue" lay-filter="stoQue"></table>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-sm loc-detl" lay-event="locDetl" style="font-size: 15px">鏌ョ湅鏄庣粏</a>
+ <a class="layui-btn layui-btn-xs loc-detl" lay-event="locDetl">鏌ョ湅鏄庣粏</a>
</script>
<!--鏄庣粏琛�-->
@@ -69,11 +76,11 @@
<table class="layui-hide" id="locDetlByMap" lay-filter="locDetlByMap"></table>
</div>
-<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/stoMan/stoQue.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/stoMan/stoQue.js" charset="utf-8"></script>
</body>
</html>
--
Gitblit v1.9.1