From d5a456fee1dd3b6beda90ec6cc1b91814ec2750f Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 24 三月 2022 12:59:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/views/quality/quality.html | 61 ++++++++++++------------------
1 files changed, 25 insertions(+), 36 deletions(-)
diff --git a/src/main/webapp/views/quality/quality.html b/src/main/webapp/views/quality/quality.html
index b982ff8..6629a8d 100644
--- a/src/main/webapp/views/quality/quality.html
+++ b/src/main/webapp/views/quality/quality.html
@@ -17,7 +17,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="bill_no" placeholder="妫�楠岀紪鍙�" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
@@ -61,22 +61,10 @@
</body>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form">
+ <div id="detail" lay-filter="detail" class="layui-form admin-form">
<input name="id" type="hidden">
<div class="layui-row">
<div class="layui-col-md12">
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">ID: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="id" placeholder="璇疯緭鍏D" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="hostId" placeholder="璇疯緭鍏�">
- </div>
- </div>
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">缂栧彿: </label>
<div class="layui-input-block">
@@ -86,7 +74,7 @@
<div class="layui-form-item">
<label class="layui-form-label">妫�楠屽崟鍙�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="billNo" placeholder="璇疯緭鍏ユ楠屽崟鍙�">
+ <input class="layui-input" name="billNo" id="billNo" placeholder="璇疯緭鍏ユ楠屽崟鍙�" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -108,7 +96,7 @@
<div class="layui-form-item">
<label class="layui-form-label">淇敼浜哄憳: </label>
<div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
<input id="modiUser$" 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="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
@@ -120,36 +108,37 @@
<div class="layui-form-item">
<label class="layui-form-label">淇敼鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ <input class="layui-input" name="updateTime" id="updateTime$" 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="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��" style="display: none">
- <input id="appeUser$" 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="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" 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="appeTime" id="appeTime$" 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="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��" style="display: none">-->
+<!-- <input id="appeUser$" 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="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" 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="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
<hr class="layui-bg-gray">
<div class="layui-form-item text-right">
+ <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo1()">缂栧彿鑷姩鐢熸垚</button>
<button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
</div>
- </form>
+ </div>
</script>
</html>
--
Gitblit v1.9.1