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/basShuttle/basShuttle.html | 96 +++++------------------------------------------
1 files changed, 11 insertions(+), 85 deletions(-)
diff --git a/src/main/webapp/views/basShuttle/basShuttle.html b/src/main/webapp/views/basShuttle/basShuttle.html
index df578b7..7f30b76 100644
--- a/src/main/webapp/views/basShuttle/basShuttle.html
+++ b/src/main/webapp/views/basShuttle/basShuttle.html
@@ -19,12 +19,7 @@
<div class="layui-form-item">
<div class="layui-inline">
<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="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input" type="text" name="shuttle_no" placeholder="鍥涘悜绌挎杞﹀彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -101,93 +96,21 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鎺�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="row" placeholder="璇疯緭鍏ユ帓">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍒�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bay" placeholder="璇疯緭鍏ュ垪">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">灞�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="lev" placeholder="璇疯緭鍏ュ眰">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍘嗗彶鎺�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="hisRow" placeholder="璇疯緭鍏ュ巻鍙叉帓">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍘嗗彶鍒�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="hisBay" placeholder="璇疯緭鍏ュ巻鍙插垪">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍘嗗彶灞�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="hisLev" placeholder="璇疯緭鍏ュ巻鍙插眰">
- </div>
- </div>
- <div class="layui-form-item">
<label class="layui-form-label">鏆傚瓨搴撲綅: </label>
<div class="layui-input-block">
<input class="layui-input" name="idleLoc" placeholder="璇疯緭鍏ユ殏瀛樺簱浣�">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">鑷姩鍏呯數: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="autoCharge" placeholder="璇疯緭鍏ヨ嚜鍔ㄥ厖鐢�">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鑷姩鍏呯數: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="autoCharge" placeholder="璇疯緭鍏ヨ嚜鍔ㄥ厖鐢�">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">鐢甸噺绾�: </label>
<div class="layui-input-block">
<input class="layui-input" name="chargeLine" placeholder="璇疯緭鍏ョ數閲忕嚎">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
- <input id="createBy$" name="createBy$" 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="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="updateBy$" name="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
</div>
</div>
<div class="layui-form-item">
@@ -205,7 +128,10 @@
<div class="layui-form-item">
<label class="layui-form-label">鏍囪: </label>
<div class="layui-input-block">
- <input class="layui-input" name="pakMk" placeholder="璇疯緭鍏ユ爣璁�">
+ <select name="pakMk">
+ <option value="1">Y</option>
+ <option value="0">N</option>
+ </select>
</div>
</div>
--
Gitblit v1.9.1