From 74951023b54f1789d1244fe923219d467487d771 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期一, 26 一月 2026 09:03:42 +0800
Subject: [PATCH] agv增加一个新单号防重复 ，增加一个手动呼叫agv
---
src/main/webapp/views/user/user.html | 124 +++++++++++++++++++++++++----------------
1 files changed, 76 insertions(+), 48 deletions(-)
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index e0ccc6d..1d8bd18 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">
+
<head>
<meta charset="utf-8">
<title></title>
@@ -22,63 +23,68 @@
}
</style>
</head>
+
<body>
-<!-- 姝ｆ枃寮�濮� -->
-<div class="layui-fluid" style="padding-bottom: 0;">
- <div class="layui-row layui-col-space15">
- <div class="layui-col-md12">
- <div class="layui-card">
- <div class="layui-card-body" style="padding: 10px;">
- <form class="layui-form toolbar">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鐢ㄦ埛鍚�:</label>
- <div class="layui-input-inline">
- <input name="username" class="layui-input" placeholder="杈撳叆鐢ㄦ埛鍚�"/>
+ <!-- 姝ｆ枃寮�濮� -->
+ <div class="layui-fluid" style="padding-bottom: 0;">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 10px;">
+ <form class="layui-form toolbar">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢ㄦ埛鍚�:</label>
+ <div class="layui-input-inline">
+ <input name="username" class="layui-input" placeholder="杈撳叆鐢ㄦ埛鍚�" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵嬫満鍙�:</label>
+ <div class="layui-input-inline">
+ <input name="mobile" class="layui-input" placeholder="杈撳叆鎵嬫満鍙�" />
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="userTbSearch" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鎵嬫満鍙�:</label>
- <div class="layui-input-inline">
- <input name="mobile" class="layui-input" placeholder="杈撳叆鎵嬫満鍙�"/>
- </div>
- </div>
- <div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="userTbSearch" lay-submit>
- <i class="layui-icon"></i>鎼滅储
- </button>
- </div>
- </div>
- </form>
- <table id="userTable" lay-filter="userTable"></table>
+ </form>
+ <table id="userTable" lay-filter="userTable"></table>
+ </div>
</div>
</div>
</div>
</div>
-</div>
-<script type="text/html" id="hostTpl">
+ <script type="text/html" id="hostTpl">
<span name="hostName" class="layui-badge layui-badge-gray">{{d.hostName}}</span>
</script>
-<script type="text/html" id="statusTpl">
+ <script type="text/html" id="statusTpl">
<input type="checkbox" name="status" value="{{d.status}}" lay-skin="switch" lay-text="姝ｅ父|绂佺敤" lay-filter="statusSwitch" {{ d.status === 1 ? 'checked' : '' }}>
</script>
-<script type="text/html" id="operate">
+ <script type="text/html" id="adLoginTpl">
+ <input type="checkbox" name="adLogin" value="{{d.adLogin}}" lay-skin="switch" lay-text="鍚敤|绂佺敤" lay-filter="adLoginSwitch" {{ d.adLogin === 1 ? 'checked' : '' }}>
+</script>
+
+ <script type="text/html" id="operate">
<a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
<a class="layui-btn layui-btn-xs btn-edit layui-btn-warm" lay-event="resetPwd">閲嶇疆瀵嗙爜</a>
</script>
-<script type="text/html" id="userToolbar">
+ <script type="text/html" id="userToolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="add"><i class="layui-icon"></i>鏂板</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="del"><i class="layui-icon"></i>鍒犻櫎</button>
</div>
</script>
-<!-- 閲嶇疆瀵嗙爜 -->
-<script type="text/html" id="resetpwd-window">
+ <!-- 閲嶇疆瀵嗙爜 -->
+ <script type="text/html" id="resetpwd-window">
<form class="layui-form model-form">
<input type="hidden" id="resetUserId" name="resetUserId">
<div class="layui-form-item">
@@ -94,8 +100,8 @@
</form>
</script>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
+ <!-- 琛ㄥ崟寮圭獥 -->
+ <script type="text/html" id="editDialog">
<form id="detail" lay-filter="detail" class="layui-form admin-form">
<input name="id" type="hidden">
<input name="status" type="hidden">
@@ -103,9 +109,9 @@
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐢ㄦ埛鍚�</label>
+ <label class="layui-form-label layui-form-required">鐧诲綍璐︽埛</label>
<div class="layui-input-block">
- <input name="username" placeholder="璇疯緭鍏ョ敤鎴峰悕" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input name="username" placeholder="璇疯緭鍏ョ櫥褰曡处鎴�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
@@ -136,10 +142,32 @@
<input name="email" placeholder="璇疯緭鍏ラ偖绠�" class="layui-input">
</div>
</div>
-
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">閮ㄩ棬锛�</label>
+ <div class="layui-input-block cool-auto-complete">
+ <input name="deptId" class="layui-input" style="display: none">
+ <input id="deptName" name="deptName" 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="deptQuery" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="deptQuerySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
</div>
</div>
<hr class="layui-bg-gray">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">AD鐧诲綍</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="adLogin" value="1" title="鍚敤AD鐧诲綍" lay-skin="switch" lay-text="鍚敤|绂佺敤" lay-filter="adLoginFormSwitch">
+ <div class="layui-form-mid layui-word-aux" style="margin-left: 10px;">寮�鍚悗锛岀敤鎴峰彲浠ヤ娇鐢ˋD鍩熻处鍙风櫥褰曠郴缁�</div>
+ </div>
+ </div>
+ </div>
+ </div>
<div class="layui-form-item text-right">
<button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
@@ -147,16 +175,16 @@
</form>
</script>
-<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.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/tools/md5.js"></script>
-<script type="text/javascript" src="../../static/js/user/user.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/js/handlebars/handlebars-v4.5.3.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/tools/md5.js"></script>
+ <script type="text/javascript" src="../../static/js/user/user.js" charset="utf-8"></script>
-<!-- 椤圭洰缂栬緫绐楀彛 -->
-<script type="text/html" id="hostEditDialog">
+ <!-- 椤圭洰缂栬緫绐楀彛 -->
+ <script type="text/html" id="hostEditDialog">
<form id="hostEditForm" lay-filter="hostEditForm" class="layui-form model-form">
<input name="id" type="hidden"/>
<div class="layui-form-item">
@@ -173,5 +201,5 @@
</form>
</script>
</body>
-</html>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1