From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-web/src/main/resources/templates/admin/inout/in-check.html | 106 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 67 insertions(+), 39 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 7a9a74a..dbc2da0 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
@@ -111,6 +111,7 @@
.input_ba {
background: #e7eaec !important;
}
+
.layui-layer-btn .layui-layer-btn1 {
border-color: #53adce;
background-color: #53adce;
@@ -130,29 +131,29 @@
<button type="button" class="rkbk-quick-btn layui-btn btn-violet" onclick="showScanCode()">
<i><img th:src="@{../../static/images/icon-hyd.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>澶ц溅鎵︽牱-->
-<!-- </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>澶ц溅鎵︽牱-->
+ <!-- </button>-->
-<!-- <button type="button" class="rkbk-quick-btn layui-btn btn-violet"-->
-<!-- onclick="checkExe('small')">-->
-<!-- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>灏忚溅鎵︽牱-->
-<!-- </button>-->
+ <!-- <button type="button" class="rkbk-quick-btn layui-btn btn-violet"-->
+ <!-- onclick="checkExe('small')">-->
+ <!-- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>灏忚溅鎵︽牱-->
+ <!-- </button>-->
-<!-- <button class="rkbk-quick-btn layui-btn btn-blue"-->
-<!-- onclick="checkReset()">-->
-<!-- <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎵︽牱澶嶄綅-->
-<!-- </button>-->
+ <!-- <button class="rkbk-quick-btn layui-btn btn-blue"-->
+ <!-- onclick="checkReset()">-->
+ <!-- <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎵︽牱澶嶄綅-->
+ <!-- </button>-->
-<!-- <button class="rkbk-quick-btn layui-btn btn-red"-->
-<!-- onclick="checkStop()">-->
-<!-- <i><img th:src="@{../../static/images/icon-stop.png}"/></i>鎵︽牱鎬ュ仠-->
-<!-- </button>-->
-<!-- <button class="rkbk-quick-btn layui-btn btn-blue"-->
-<!-- onclick="checkResetStop()">-->
-<!-- <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎬ュ仠澶嶄綅-->
-<!-- </button>-->
+ <!-- <button class="rkbk-quick-btn layui-btn btn-red"-->
+ <!-- onclick="checkStop()">-->
+ <!-- <i><img th:src="@{../../static/images/icon-stop.png}"/></i>鎵︽牱鎬ュ仠-->
+ <!-- </button>-->
+ <!-- <button class="rkbk-quick-btn layui-btn btn-blue"-->
+ <!-- onclick="checkResetStop()">-->
+ <!-- <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎬ュ仠澶嶄綅-->
+ <!-- </button>-->
</div>
<!--娴佺▼寮曞-->
@@ -349,8 +350,11 @@
var companyId = [[${loginUser.companyId}]];
//鍝佺
var listFoodVariety = [[${listFoodVariety}]];
+ //鎬ц川
+ var listFoodType = [[${listFoodType}]];
var startTime = [[${startTime}]];
var endTime = [[${endTime}]];
+ var foodYear = [[${foodYear}]];
//鎵︽牱鏈轰俊鎭�
var checkDto = [[${checkDto}]];
@@ -374,25 +378,27 @@
</body>
<!-- 鎵爜寮圭獥 -->
-<div class="layui-tab-content" id="scanCodeDetail" style="display: none;">
+<div class="layui-tab-content" id="scanCodeDetail" style="display: none;" 慰nsubmit="return false;">
<!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
- <form class="layui-form" id="form-sacnCodeDetail" lay-filter="form-sacnCodeDetail">
-
- <div class="layui-col-xs12">
- <div class="layui-form-item">
- <label class="layui-form-label">璐ㄦ鍗曞彿</label>
- <div class="layui-input-block">
- <input type="text" id="checkId" name="checkId" placeholder="璇锋壂鐮侊紝涔熷彲鎵嬪姩杈撳叆" class="layui-input">
- </div>
+ <form class="layui-form" id="form-sacnCodeDetail" lay-filter="form-sacnCodeDetail">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐ㄦ鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" id="checkId" name="checkId" placeholder="璇锋壂鐮侊紝涔熷彲鎵嬪姩杈撳叆" class="layui-input">
+ <!--杩欒浠ｇ爜涓嶈兘鍒�-->
+ <!--褰揻orm琛ㄥ崟涓彧鏈変竴涓猧nput鏃舵寜鍥炶溅鎸夐敭浼氬埛鏂伴〉闈紝鍥犳娣诲姞涓�涓猧nput骞堕殣钘忥紝涓嶈兘浣跨敤type="hidden"鏂瑰紡闅愯棌-->
+ <input type="text" id="hiddenText" name="hiddenText" style="display:none"/>
</div>
</div>
+ </div>
- <div class="layui-col-xs12" style="margin-bottom: 10px">
- <div style="padding-left: 50px; color: #2ab5ad;">
- <span style="font-weight: bold; margin-right: 10px;">澶囨敞锛氳川妫�鍗曞彿鍙互鎵爜锛屼篃鍙互鎵嬪姩杈撳叆锛屾墜鍔ㄨ緭鍏ュ悗闇�瑕佺偣鍑绘煡璇�</span>
- </div>
+ <div class="layui-col-xs12" style="margin-bottom: 10px">
+ <div style="padding-left: 50px; color: #2ab5ad;">
+ <span style="font-weight: bold; margin-right: 10px;">澶囨敞锛氳川妫�鍗曞彿鍙互鎵爜锛屼篃鍙互鎵嬪姩杈撳叆锛屾墜鍔ㄨ緭鍏ュ悗闇�瑕佺偣鍑绘煡璇�</span>
</div>
- </form>
+ </div>
+ </form>
</div>
@@ -502,15 +508,28 @@
</div>
</div>
</div>
- <div class="layui-col-xs8">
+ <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="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-input">
+ <input type="text" name="foodYear" placeholder="璇疯緭鍏�" autocomplete="off"
+ class="layui-input rkbk-search-input bg-date" id="foodYear">
</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="foodType" name="foodType" lay-filter="select_foodType">
+ <option value=""></option>
+ <option th:each="dic,dicSet:${listFoodType}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label red">鍖栭獙缁撴灉</label>
@@ -520,6 +539,15 @@
<option value="PASS">鍚堟牸</option>
<option value="UNPASS">涓嶅悎鏍�</option>
</select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-input">
</div>
</div>
</div>
@@ -537,7 +565,7 @@
</blockquote>
</div>
<div class="layui-col-xs6">
- <blockquote class="layui-elem-quote" style="width: 95%;float: right;">
+ <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>
--
Gitblit v1.9.3