From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/templates/admin/inout/in-weight.html | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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 7350385..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>
@@ -381,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>
@@ -424,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>
@@ -726,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;">
--
Gitblit v1.9.3