From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/templates/admin/inout/in-weight.html | 119 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 67 insertions(+), 52 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 415352c..3d2898b 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
@@ -126,7 +126,12 @@
width: 130px;
height: 28px;
}
-
+ .layui-table, .layui-table-view {
+ margin: 0 0;
+ }
+ .layui-table-body {
+ max-height: 350px;
+ }
</style>
</head>
@@ -138,22 +143,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"
- 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"
- 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="showCheck()">
+ <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璐ㄦ璇︾粏
</button>
<button class="rkbk-quick-btn layui-btn btn-violet"
onclick="flushPage()">
@@ -335,7 +338,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>
@@ -360,7 +364,7 @@
<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>
@@ -382,7 +386,7 @@
<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>
@@ -425,7 +429,7 @@
<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>
@@ -444,7 +448,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>
@@ -518,16 +523,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="楹昏">
@@ -546,6 +541,16 @@
<input type="text" name="dePackage" 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="price" placeholder="璇疯緭鍏�"
+ class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>
</div>
</div>
</div>
@@ -571,17 +576,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="price" placeholder="璇疯緭鍏�"
- class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>
- </div>
- </div>
- </div>
-
</form>
</div>
@@ -737,6 +731,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;">
@@ -767,21 +797,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