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/wrkMast/wrkMast.html | 72 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 4c14501..aed8900 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -25,10 +25,26 @@
.btn-cancel {
display: none;
}
+ .btn-pick {
+ display: none;
+ }
/*鏄庣粏琛�*/
#detlTable {
margin-top: 20px;
+ }
+
+ #search-box {
+ padding: 30px 30px 10px 30px;
+ }
+ #search-box .layui-inline {
+ margin-right: 5px;
+ }
+ #data-search-btn {
+ margin-top: 10px;
+ }
+ #data-search-btn.layui-btn-container .layui-btn {
+ margin-right: 20px;
}
</style>
</head>
@@ -36,29 +52,15 @@
<!-- 鎼滅储鏍� -->
<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="wrk_no" placeholder="璇疯緭鍏�" autocomplete="off">-->
- <!--</div>-->
- <!--</div>-->
<div class="layui-inline">
- <label class="layui-form-label">宸� 浣� 鍙凤細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="wrkNo" name="wrk_no" class="layui-input" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="wrkNo$" 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="wrkMastQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="wrkMastQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ヤ綔鐘舵�侊細</label>
<div class="layui-input-inline cool-auto-complete">
<input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�" onfocus=this.blur()>
+ <input id="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
<select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -67,18 +69,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍫� 鍨� 鏈猴細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="crnNo" class="layui-input" name="crn_no" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="crnNo$" 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="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="crn_no" 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="io_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" 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>
@@ -108,9 +113,16 @@
</div>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-sm btn-detlShow" lay-event="detlShow">鏄庣粏</a>
- <a class="layui-btn layui-btn-danger layui-btn-sm btn-complete" lay-event="complete">瀹屾垚</a>
- <a class="layui-btn layui-btn-primary layui-btn-sm btn-cancel" lay-event="cancel">鍙栨秷</a>
+ <div class="dropdown-menu">
+ <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"><i class="layui-icon layui-icon-shrink-right"></i></button>
+ <ul class="dropdown-menu-nav" style="margin-left: -35px">
+ <li><a lay-event="detlShow">鏄庣粏</a></li>
+ <li><a lay-event="complete">瀹屾垚</a></li>
+ <li><a lay-event="cancel">鍙栨秷</a></li>
+ <li><a lay-event="shuttleCommand">绌挎杞︽寚浠�</a></li>
+ <li><a lay-event="liftCommand">鎻愬崌鏈烘寚浠�</a></li>
+ </ul>
+ </div>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1