From d9e1a4fe6e51958c4571efe2ced4d4172ed385db Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 12 六月 2023 21:49:53 +0800
Subject: [PATCH] 称重页面调整-增加化验信息
---
igds-web/src/main/resources/templates/admin/inout/in-check.html | 256 +++++++++++++++++++-------------------------------
1 files changed, 99 insertions(+), 157 deletions(-)
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-check.html b/igds-web/src/main/resources/templates/admin/inout/in-check.html
index ad13741..8f962a6 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-check.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-check.html
@@ -105,6 +105,11 @@
.layui-elem-quote {
padding: 10px;
color: blue;
+ margin-bottom: unset;
+ }
+
+ .input_ba {
+ background: #e7eaec !important;
}
</style>
@@ -117,16 +122,6 @@
<div class="qyzj-btnbox layui-clear">
<div class="rkbk-quick fl">
-
- <!-- <button type="button" class="rkbk-quick-btn layui-btn"-->
- <!-- onclick="flushData()">-->
- <!-- <i><img th:src="@{../../static/images/icon-shuaxin.png}" /></i>鍒锋柊-->
- <!-- </button>-->
- <!-- <button type="button" class="rkbk-quick-btn layui-btn"-->
- <!-- onclick="exportData()">-->
- <!-- <i><img th:src="@{../../static/images/icon-daochu.png}"/></i>瀵煎嚭-->
- <!-- </button>-->
-
<button type="button" class="rkbk-quick-btn layui-btn btn-violet"
onclick="checkExe('big')">
<i><img th:src="@{../../static/images/icon-hyd.png}"/></i>澶ц溅鎵︽牱
@@ -194,7 +189,6 @@
</ul>
</div>
<!--娴佺▼寮曞缁撴潫-->
-
</div>
<!--qyzj-btnbox end-->
@@ -219,17 +213,15 @@
autocomplete="off" class="layui-input rkbk-search-input">
</div>
</div>
-
<div class="layui-col-xs3">
<div class="layui-form-item">
- <label class="layui-form-label">鍗曟嵁缂栫爜</label>
+ <label class="layui-form-label">璐ㄦ鍗曞彿</label>
<div class="layui-input-block">
<input type="text" name="checkId" placeholder="璇疯緭鍏�"
autocomplete="off" class="layui-input rkbk-search-input">
</div>
</div>
</div>
-
<div class="layui-col-xs3">
<div class="layui-form-item">
<label class="layui-form-label">绮鍝佺</label>
@@ -242,13 +234,11 @@
</div>
</div>
</div>
-
<div class="layui-col-xs3">
<div class="layui-form-item">
- <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <label class="layui-form-label">璧峰鏃堕棿</label>
<div class="layui-input-block">
- <input type="text" name="start" placeholder="璇疯緭鍏�"
- autocomplete="off"
+ <input type="text" name="start" placeholder="璇疯緭鍏�" autocomplete="off"
class="layui-input rkbk-search-input bg-date" id="start">
</div>
</div>
@@ -256,15 +246,13 @@
<div class="layui-col-xs3">
<div class="layui-form-item">
- <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <label class="layui-form-label">鎴鏃堕棿</label>
<div class="layui-input-block">
- <input type="text" name="end" placeholder="璇疯緭鍏�"
- autocomplete="off"
+ <input type="text" name="end" placeholder="璇疯緭鍏�" autocomplete="off"
class="layui-input rkbk-search-input bg-date" id="end">
</div>
</div>
</div>
-
<div class="layui-col-xs3">
<div class="layui-form-item">
@@ -313,39 +301,30 @@
<col width="10%">
<col width="10%">
<col width="10%">
+ <col width="10%">
<col width="">
- <col width="15%">
+ <col width="10%">
</colgroup>
<thead>
<tr class="qyzj-table-tit">
- <th>鍗曟嵁鍙�</th>
- <th>杞︾墝</th>
- <th>寰�鏉ュ崟浣�</th>
- <th>鍝佺</th>
- <th>鐩爣浠撳簱</th>
- <th>鏄惁鍚堟牸</th>
- <th>鍖栭獙鏃堕棿</th>
- <th>绮浜у湴</th>
+ <th>璐ㄦ鍗曞彿</th>
+ <th>鐧昏鏃堕棿</th>
+ <th>鎵︽牱鐘舵��</th>
+ <th>鎵︽牱浜�</th>
+ <th>鎵︽牱鏃堕棿</th>
+ <th>绮鍝佺</th>
+ <th>瑁呭嵏浠撳簱</th>
+ <th>妫�楠岀粨鏋�</th>
<th>鎿嶄綔</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
-
</div>
- <!--qyzj-tabBox end-->
-
- <!--qyzj-page-wrap end-->
-
</div>
- <!--qyzj-con end-->
-
</div>
- <!--rk-main end-->
-
</div>
-<!--l-container end-->
<script th:inline="javascript">
var progress = [[${progress}]];
@@ -374,7 +353,6 @@
</script>
-
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
@@ -382,53 +360,61 @@
<script th:src="@{../../static/admin/inout/in-check.js}"></script>
<script type="text/html" id="barControl">
- <a class="layui-btn control-btn" lay-event="edit">缂栬緫</a>
+ <a class="layui-btn control-btn" lay-event="edit">鍖栭獙</a>
</script>
</body>
-<!-- 鍖栭獙淇℃伅锛屽寘鎷熀鏈俊鎭拰鍖栭獙缁撴灉 -->
+<!-- 鍖栭獙淇℃伅 -->
<div class="layui-tab-content" id="checkDetail" style="display: none;">
<!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
<form class="layui-form" id="form-detail" lay-filter="form-detail">
- <div class="layui-col-xs4" style="display: none;">
+ <div class="layui-col-xs12" style="display: none;">
<div class="layui-form-item">
- <label class="layui-form-label">闅愯棌瀛楁-瀹㈡埛</label>
+ <label class="layui-form-label">闅愯棌瀛楁-娴佹按缂栧彿</label>
<div class="layui-input-block">
- <input type="text" name="customerId" autocomplete="off"
- class="layui-input rkbk-search-input">
+ <input type="text" name="id" autocomplete="off" class="layui-input rkbk-search-input">
</div>
</div>
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">妫�楠屽崟鍙�</label>
+ <label class="layui-form-label">璐ㄦ鍗曞彿</label>
<div class="layui-input-block">
<input type="text" name="checkId" autocomplete="off"
- class="layui-input rkbk-search-input" disabled="">
+ class="layui-input input_ba" disabled="">
</div>
</div>
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">杞� 鐗� 鍙�</label>
+ <label class="layui-form-label">鎵� 鏍� 浜�</label>
<div class="layui-input-block">
- <input type="text" name="plateNum" autocomplete="off"
- class="layui-input rkbk-search-input" disabled="">
+ <input type="text" name="sampleUser" autocomplete="off"
+ class="layui-input input_ba" disabled="">
</div>
</div>
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">妫�楠屼汉鍛�</label>
+ <label class="layui-form-label">鎵︽牱鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="text" name="sampleTime" autocomplete="off"
+ class="layui-input input_ba" disabled="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐� 妫� 浜�</label>
<div class="layui-input-block">
<input type="text" name="checkUser" autocomplete="off"
- class="layui-input rkbk-search-input">
+ class="layui-input">
</div>
</div>
</div>
@@ -456,9 +442,29 @@
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
+ <label class="layui-form-label">璐ㄦ鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="text" name="checkTime" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏀剁伯瀹氫环</label>
+ <div class="layui-input-block">
+ <input type="text" name="price" id="price"
+ class="layui-input rkbk-search-input" placeholder="鏍规嵁绮绛夌骇甯﹀叆/鎵嬪姩褰曞叆">
+ <em class="kccz-data-dw">鍏�/鍏枻</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
<label class="layui-form-label red">绮绛夌骇</label>
<div class="layui-input-block">
- <select id="foodLevel" name="foodLevel" lay-filter="foodLevel">
+ <select id="foodLevel" name="foodLevel" lay-filter="select_foodLevel">
<option value=""></option>
<option th:each="dic,dicSet:${listFoodLevel}"
th:value="${dic.code}" th:text="${dic.name}"></option>
@@ -466,46 +472,6 @@
</div>
</div>
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">绮浜у湴</label>
- <div class="layui-input-block">
- <input type="text" name="foodLocation" autocomplete="off"
- class="layui-input"> <em class="kccz-data-dw cursor"
- onclick="showFoodLocation()">鈥�</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label red">绮骞翠唤</label>
- <div class="layui-input-block">
- <input type="text" name="foodYear" id="foodYear" autocomplete="off"
- class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label red">鏀剁伯瀹氫环</label>
- <div class="layui-input-block">
- <input type="text" name="price" id="price"
- class="layui-input rkbk-search-input" placeholder="璇疯緭鍏ュ崟浠�">
- <em class="kccz-data-dw">鍏�/鍏枻</em>
- </div>
- </div>
- </div>
-
- <div class="layui-col-xs4" style="display: none;">
- <div class="layui-form-item">
- <label class="layui-form-label">闅愯棌瀛楁-鏈�浣庝繚鎶や环鏍�</label>
- <div class="layui-input-block">
- <input type="text" name="price0"
- class="layui-input">
- </div>
- </div>
- </div>
-
<div class="layui-col-xs8">
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞璇存槑</label>
@@ -527,74 +493,62 @@
</div>
</div>
</div>
- <div class="layui-col-xs12">
- <blockquote class="layui-elem-quote">
+ <div class="layui-col-xs12" style="margin-bottom: 10px">
+ <div style="padding-left: 50px; color: #2ab5ad;">
+ <span style="font-weight: bold; margin-right: 10px;">澶囨敞璇存槑锛�1.缁撴灉鍒ゅ畾锛氱郴缁熸牴鎹悇鍖栭獙椤圭粨鏋滃垽瀹氾紝鏈�鍚庡寲楠岀粨鏋滈渶鎵嬪姩閫夋嫨纭锛�2.鏍哥畻瀹氫环锛氭牴鎹寲楠岄」閰嶇疆璁＄畻鐩稿叧澧炴墸浠凤紝鏈�鍚庡崟浠烽渶鎵嬪姩纭銆�</span>
+ </div>
+ </div>
+ <div class="layui-col-xs6">
+ <blockquote class="layui-elem-quote" style="width: 95%;float: left;">
<div>
- <span style="font-weight: bold; margin-right: 10px;">绯荤粺鍒ゅ畾</span>
-<!-- <span id="check-result-level" style="margin-right: 25px;">绮绛夌骇锛�#</span>-->
-<!-- <span id="check-result-price" style="margin-right: 25px;">甯傚満浠凤細#</span>-->
-<!-- <span id="check-result-price0" style="margin-right: 25px;">鏈�浣庝繚鎶や环锛�#</span>-->
- <span id="check-result-tip" style="margin-right: 25px;">妫�楠岀粨鏋滐細#</span>
-
-<!-- <button type="button" class="layui-btn layui-btn-sm layui-btn-warm layui-btn-radius fr"-->
-<!-- onclick="">绯荤粺楠岃瘉-->
-<!-- </button>-->
-
- <span id="check-result-msg" style="margin-right: 25px;color: red;float: right;"></span>
+ <span style="font-weight: bold; margin-right: 10px;">缁撴灉鍒ゅ畾锛�</span>
+ <span id="check-result-tip" style="margin-right: 25px;">鍖栭獙缁撴灉锛�</span>
</div>
</blockquote>
</div>
-
+ <div class="layui-col-xs6">
+ <blockquote class="layui-elem-quote" style="width: 95%;float: right;">
+ <div>
+ <span style="font-weight: bold; margin-right: 10px;">瀹氫环鍒ゅ畾锛�</span>
+ <span id="check-result-tip2" style="margin-right: 25px;">鏀剁伯鍗曚环锛�#鍏�/鍏枻</span>
+ </div>
+ </blockquote>
+ </div>
</form>
<!-- 鍖栭獙缁撴灉淇℃伅 -->
- <table class="layui-table" id="tableCheckItem"
+ <table class="layui-table tableCheckItem" id="tableCheckItem"
lay-filter="tableCheckItem">
<colgroup>
- <col width="25%">
- <col width="25%">
- <col width="25%">
- <col width="25%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="">
</colgroup>
<thead>
<tr class="qyzj-table-tit">
- <th>鍖栭獙椤圭洰</th>
- <th>鍖栭獙缁撴灉</th>
+ <th>妫�楠岄」鐩�</th>
+ <th>妫�楠屽��</th>
+ <th>鏍囧噯鍊�</th>
<th>鍗曚綅</th>
- <th>鍚堟牸鏍囧噯</th>
- <th>璇存槑</th>
+ <th>鎵ｉ噸</th>
+ <th>澧為噸</th>
+ <th>鎵ｄ环</th>
+ <th>澧炰环</th>
+ <th>妫�楠岀粨鏋�</th>
+ <th>澶囨敞</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
-</div>
-
-
-<!-- 寮瑰嚭寰�鏉ュ崟浣嶅垪琛� -->
-<div class="layui-tab-content" id="listCustomer" style="display: none;">
- <table class="layui-table" lay-skin="nob" id="tableCustomer"
- lay-filter="tableCustomer" style="margin: 0px;"></table>
-</div>
-
-<script type="text/html" id="toolbarCustomer">
- <div class="">
- <div class="layui-col-xs6">
- <input type="text" id="key" placeholder="杈撳叆缂栫爜鎴栬�呭悕绉扳�︹��" class="layui-input">
- </div>
- <div class="layui-col-xs6" style="padding-left: 10px;">
- <button class="layui-btn layui-btn-sm" onclick="flushCustomer()">鏌ヨ</button>
- </div>
- </div>
-</script>
-
-
-<!-- 寮瑰嚭绮浜у湴 -->
-<div class="layui-tab-content" id="listFoodLocation"
- style="display: none;">
- <table class="layui-table" lay-skin="nob" id="tableFoodLoaction"
- lay-filter="tableFoodLoaction" style="margin: 0px;"></table>
</div>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
@@ -628,16 +582,4 @@
</tbody>
</table>
</div>
-
-<script type="text/html" id="toolbarFoodLocaton">
- <div class="">
- <div class="layui-col-xs6">
- <input type="text" id="key2" placeholder="杈撳叆缂栫爜鎴栬�呭悕绉扳�︹��" class="layui-input">
- </div>
- <div class="layui-col-xs6" style="padding-left: 10px;">
- <button class="layui-btn layui-btn-sm" onclick="flushFoodLocation()">鏌ヨ</button>
- </div>
- </div>
-</script>
-
</html>
--
Gitblit v1.9.3