From d320b9ae40b3dfc1942ea484c8893ba1404c73ec Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:19 +0800
Subject: [PATCH] 调整卡回收页面操作逻辑
---
igds-web/src/main/resources/templates/admin/inout/in-card-back.html | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-card-back.html b/igds-web/src/main/resources/templates/admin/inout/in-card-back.html
index 0c7eb14..3adde1b 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-card-back.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-card-back.html
@@ -39,17 +39,9 @@
<div class="qyzj-btnbox layui-clear">
<div class="rkbk-quick fl">
- <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i> 鏌ョ湅鍖栭獙鍗�
- </button>
<button class="rkbk-quick-btn layui-btn btn-green"
onclick="submit()">
<i><img th:src="@{../../static/images/icon-ok.png}"/></i> 鏀跺崱鍑哄簱
- </button>
- <button class="rkbk-quick-btn layui-btn btn-violet"
- onclick="printBill()">
- <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>
- 鎵撳嵃杩囩鍗�
</button>
</div>
@@ -188,7 +180,7 @@
<div class="rkbk-quick layui-text-center">
<button id="button_readID" type="button"
onclick="flushIdCard()"
- class="rkbk-quick-btn layui-btn btn-blue">璇诲彇韬唤璇�
+ class="rkbk-quick-btn layui-btn btn-blue">璇昏韩浠借瘉鏌ヨ
</button>
</div>
<!--rkbk-form-box2 end-->
@@ -211,33 +203,35 @@
<div class="rkbk-left-form rkbk-right-form">
<form class="layui-form" action="" id="form-data"
lay-filter="form-data">
-
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-ID</label>
<input type="text" name="id">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-娴佺▼鑺傜偣</label>
<input type="text" name="progress">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-涓氬姟绫诲瀷</label>
<input type="text" name="type">
+ </div>
+ <div class="layui-form-item display-none">
+ <input type="text" name="deptId">
+ </div>
+ <div class="layui-form-item display-none">
+ <input type="text" name="noticeId">
</div>
<div class="layui-form-item">
- <input type="button" value="璇诲崱" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()">
+ <input type="button" value="璇诲崱鏌ヨ" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()">
<label class="layui-form-label">鏅烘収鍗″彿</label>
<div class="layui-input-block">
<input type="text" name="intelCard" id="intelCard"
- placeholder="鍏堢偣鍑昏鍗★紝鍚庢斁鍗�......" autocomplete="off"
+ placeholder="璇诲崱鑾峰彇" autocomplete="off"
class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <input type="button" value="鏌ヨ" class="rkbk-r-btn fr layui-btn" onclick="flushData()">
+ <input type="button" value="杞︾墝鏌ヨ" class="rkbk-r-btn fr layui-btn" onclick="flushData()">
<label class="layui-form-label">杞︾墝鍙�</label>
<div class="layui-input-block">
<input type="text" name="plateNum" id="plateNum"
@@ -258,23 +252,27 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">绮鍝佺</label>
+ <label class="layui-form-label">鍑哄叆搴撶被鍨�</label>
<div class="layui-input-block">
- <select name="foodVariety" disabled>
- <option value="">鑷姩鑾峰彇</option>
- <option th:each="dic,dicSet:${listFoodVariety}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
+ <select name="type" disabled>
+ <option value="IN">鍏ュ簱浣滀笟</option>
+ <option value="OUT">鍑哄簱浣滀笟</option>
</select>
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">绮绛夌骇</label>
+ <label class="layui-form-label">娴佺▼杩涘害</label>
<div class="layui-input-block">
- <select name="foodLevel" disabled>
- <option value="">鑷姩鑾峰彇</option>
- <option th:each="dic,dicSet:${listFoodLevel}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
+ <select name="progress" disabled>
+ <option value="REGISTER">鐧昏鐜妭</option>
+ <option value="CHECK">璐ㄦ鐜妭</option>
+ <option value="HANDLE">鍊间粨鐜妭</option>
+ <option value="WEIGHT_TAG">绉伴噸鐜妭</option>
+ <option value="WEIGHT_FULL">绉伴噸鐜妭</option>
+ <option value="WEIGHT_EMPTY">绉伴噸鐜妭</option>
+ <option value="CARD_BACK">绂诲簱纭</option>
+ <option value="RECORD">娴佺▼瀹屾垚</option>
</select>
</div>
</div>
@@ -293,6 +291,15 @@
autocomplete="off" class="layui-input rkbk-search-input" disabled>
</div>
</div>
+
+
+ <div class="rkbk-quick layui-text-center">
+ <button class="rkbk-quick-btn layui-btn btn-green"
+ onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 鏀跺崱鍑哄簱
+ </button>
+ </div>
+
</form>
</div>
</div>
@@ -322,9 +329,6 @@
var companyId = [[${loginUser.companyId}]];
//鍑哄叆搴撶被鍨�
var type = [[${type}]];
- //鍝佺
- var listFoodVariety = [[${listFoodVariety}]];
- var listFoodLevel = [[${listFoodLevel}]];
</script>
@@ -332,7 +336,7 @@
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
-<script th:src="@{../../static/admin/inout/inout-print.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/in-card-back.js}"></script>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
--
Gitblit v1.9.3