From f23f7a18fe8fe3729dfb91af5b55b515b835c7d8 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 17 八月 2023 17:40:16 +0800
Subject: [PATCH] 问题修改
---
igds-web/src/main/resources/templates/admin/inout/in-weight.html | 162 ++++++++++++++++++++++++++++--------------------------
1 files changed, 84 insertions(+), 78 deletions(-)
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-weight.html b/igds-web/src/main/resources/templates/admin/inout/in-weight.html
index 640a2c9..85339ce 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-weight.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-weight.html
@@ -11,6 +11,7 @@
th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
<link rel="stylesheet" type="text/css"
th:href="@{../../static/admin/inout/style.css}">
+
<!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
<script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
@@ -126,7 +127,12 @@
width: 130px;
height: 28px;
}
-
+ .layui-table, .layui-table-view {
+ margin: 0 0;
+ }
+ .layui-table-body {
+ max-height: 350px;
+ }
</style>
</head>
@@ -138,25 +144,20 @@
<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 id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
onclick="weight()">
- <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>绉伴噸纭
+ <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>姝ラ1锛氱О閲嶇‘璁�
</button>
<button id="btn-submit"
- class="rkbk-quick-btn layui-btn btn-green layui-btn-disabled"
- disabled=true onclick="submit()">
- <i><img th:src="@{../../static/images/icon-ok.png}"/></i>瀹屾垚绉伴噸
+ class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i>姝ラ2锛氬畬鎴愮О閲�
</button>
<button id="btn-printBill"
- class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
- disabled=true onclick="printBill()">
- <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>鎵撳嵃杩囩鍗�
+ class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
+ <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>姝ラ3锛氭墦鍗拌繃纾呭崟
</button>
- <button class="rkbk-quick-btn layui-btn" onclick="gateCtrl()">
- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>閬撻椄鎿嶄綔
+ <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-violet"
onclick="flushPage()">
@@ -264,7 +265,7 @@
class="rkbk-search-btn layui-btn r-120"
onclick="flushIdCard()">
<input type="button" value="鎵嬪姩鏌ヨ"
- class="rkbk-search-btn layui-btn" onclick="flushData()">
+ class="rkbk-search-btn layui-btn" onclick="flushByHand()">
</div>
</div>
@@ -272,30 +273,23 @@
<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">
- <label class="layui-form-label">闅愯棌瀛楁-瀹㈡埛缂栫爜Id</label>
- <input type="text" name="customerId">
+ <input type="text" name="foodLocationId">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-閫氱煡鍗旾D</label>
<input type="text" name="noticeId">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-绮鎬ц川</label>
<input type="text" name="foodType">
</div>
-
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -333,7 +327,7 @@
<label class="layui-form-label color-red">姣涢噸(婊¤溅)</label>
<div class="layui-input-block">
<input type="text" name="fullWeight" id="fullWeight" autocomplete="off"
- placeholder="鍦扮鑷姩甯﹀叆" class="layui-input weight rkbk-search-input" disabled>
+ placeholder="鍦扮鑷姩甯﹀叆" class="layui-input rkbk-search-input" disabled>
<em
class="kccz-data-dw">KG</em>
</div>
@@ -345,7 +339,8 @@
<label class="layui-form-label color-red">鐨噸(绌鸿溅)</label>
<div class="layui-input-block">
<input type="text" name="emptyWeight" id="emptyWeight" autocomplete="off"
- placeholder="鍦扮鑷姩甯﹀叆" class="layui-input weight rkbk-search-input" disabled>
+ placeholder="鍦扮鑷姩甯﹀叆" class="layui-input weight rkbk-search-input"
+ disabled>
<em
class="kccz-data-dw">KG</em>
</div>
@@ -370,14 +365,14 @@
<div class="layui-input-block">
<input type="text" name="customerName" placeholder="璇烽�夋嫨"
autocomplete="off" class="layui-input" disabled="disabled"> <em
- class="kccz-data-dw cursor" onclick="showNotice()">鈥�</em>
+ class="kccz-data-dw cursor" onclick="showNotice()">鈥︹��</em>
</div>
</div>
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">瑁呭嵏浠撳簱</label>
+ <label class="layui-form-label" id="depotIdLabel">瑁呭嵏浠撳簱</label>
<div class="layui-input-block">
<select name="depotId" id="depotId" lay-filter="select_depotId">
<option value=""></option>
@@ -392,14 +387,14 @@
<div class="layui-form-item kccz-data-group-md">
<label class="layui-form-label">璐ㄦ鎵ｉ噸</label>
<div class="posi-r kccz-data-bfb fr">
- <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
+ <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()">
<i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璇︾粏
</button>
</div>
<div class="layui-input-block">
<div class="posi-r">
<input id="deCheck" type="text" name="deCheck" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input"> <em
+ autocomplete="off" class="layui-input weight"> <em
class="kccz-data-dw">KG</em>
</div>
</div>
@@ -435,14 +430,14 @@
<div class="layui-form-item kccz-data-group-md">
<label class="layui-form-label">璐ㄦ澧為噸</label>
<div class="posi-r kccz-data-bfb fr">
- <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
+ <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()">
<i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璇︾粏
</button>
</div>
<div class="layui-input-block">
<div class="posi-r">
<input id="addCheck" type="text" name="addCheck" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input"> <em
+ autocomplete="off" class="layui-input weight"> <em
class="kccz-data-dw">KG</em>
</div>
</div>
@@ -454,7 +449,8 @@
<label class="layui-form-label color-red">绮浜у湴</label>
<div class="layui-input-block">
<input type="text" name="foodLocation" placeholder="璇烽�夋嫨"
- autocomplete="off" class="layui-input">
+ autocomplete="off" class="layui-input" disabled="disabled"> <em
+ class="kccz-data-dw cursor" onclick="showFoodLocation()">鈥︹��</em>
</div>
</div>
</div>
@@ -528,16 +524,6 @@
<!-- 琛ュ厖瀛楁榛樿闅愯棌 -->
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">妫�鏂ょ被鍨�</label>
- <div class="layui-input-block">
- <input type="radio" name="jjlx" value="0" title="绉伴噸鍏ュ簱" checked>
- <input type="radio" name="jjlx" value="1" title="鏍囧噯鍖呭叆搴�">
- </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="radio" name="bzw" value="1" title="楹昏">
@@ -554,30 +540,8 @@
<label class="layui-form-label">鍖呰鎵ｉ噸</label>
<div class="layui-input-block">
<input type="text" name="dePackage" autocomplete="off"
- placeholder="璇疯緭鍏�" class="layui-input"> <em
- class="kccz-data-dw">KG</em>
- </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="dbz" autocomplete="off"
placeholder="璇疯緭鍏�" class="layui-input weight"> <em
class="kccz-data-dw">KG</em>
- </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="bzbjs" autocomplete="off"
- placeholder="璇疯緭鍏�" class="layui-input weight"> <em
- class="kccz-data-dw">浠�</em>
</div>
</div>
</div>
@@ -592,6 +556,27 @@
</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="dbz" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
+ class="kccz-data-dw">KG</em>
+ </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="bzbjs" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
+ class="kccz-data-dw">浠�</em>
+ </div>
+ </div>
+ </div>
</form>
</div>
@@ -747,6 +732,42 @@
lay-filter="tableFoodLoaction" style="margin: 0px;"></table>
</div>
+<!-- 璐ㄦ淇℃伅 -->
+<div class="layui-tab-content" id="checkDetail" style="display: none;">
+ <!-- 鍖栭獙缁撴灉淇℃伅 -->
+ <table class="layui-table tableCheckItem" id="tableCheckItem"
+ lay-filter="tableCheckItem">
+ <colgroup>
+ <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>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+
+</div>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
@@ -777,21 +798,6 @@
</tr>
</tbody>
</table>
-</div>
-<!-- 寮瑰嚭妗�-閬撻椄鎿嶄綔-->
-<div class="layui-tab-content areation-center" id="control-gate"
- style="display: none;">
- <div class="layui-btn-container m10">
- <button class="rkbk-quick-btn layui-btn btn-violet"
- onClick="controlGate('OPEN')">
- <i><img th:src="@{../../static/images/icon-sm-fc.png}"/></i>寮�閬撻椄
- </button>
- <button class="rkbk-quick-btn layui-btn btn-red"
- onClick="controlGate('CLOSE')">
- <i><img th:src="@{../../static/images/icon-sm-fc.png}"/></i>鍏抽亾闂�
- </button>
- </div>
-
</div>
<script type="text/html" id="toolbarFoodLocaton">
--
Gitblit v1.9.3