From a673b25a0bc23b3b8b914088bdb7dca3d2e89d45 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 12 八月 2023 16:18:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/templates/admin/inout/in-sample.html | 236 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 123 insertions(+), 113 deletions(-)
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-sample.html b/igds-web/src/main/resources/templates/admin/inout/in-sample.html
index 66fcc91..916ba8d 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-sample.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-sample.html
@@ -9,9 +9,12 @@
<title>鍑哄叆搴撶鐞�-鎵︽牱</title>
<link rel="stylesheet" type="text/css"
- th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
+ th:href="@{../../static/plugins/layui/css/layui.css}">
<link rel="stylesheet" type="text/css"
th:href="@{../../static/admin/inout/style.css}">
+
+ <!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
+ <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
<style type="text/css">
.qyzj-tabBox {
@@ -20,34 +23,20 @@
width: 100%;
}
- #layui-table-page1 {
- text-align: right !important;
- }
-
.display-none {
display: none;
}
-
+ #layui-table-page1 {
+ text-align: right !important;
+ }
.control-btn {
height: 35px;
line-height: 30px;
background-color: #f67d06;
}
- .tip-red {
- text-align: right;
- padding-left: 40px;
- font-size: 16px;
- color: red;
- font-weight: bold;
- }
-
thead span {
font-weight: bold
- }
-
- #label1, #label4, #label5 {
- color: red;
}
.layui-select-disabled .layui-disabled {
@@ -105,6 +94,13 @@
.layui-elem-quote {
padding: 10px;
color: blue;
+ }
+
+ .input_ba {
+ background: #e7eaec !important;
+ }
+ .layui-table-body {
+ height: 450px;
}
</style>
@@ -184,21 +180,17 @@
<div class="qyzj-con radius-6">
<div class="qyzj-con-top layui-row">
<form class="layui-form" action="" id="form-param" lay-filter="form-param">
-
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌-绫诲瀷</label>
- <div class="layui-input-block">
- <input type="text" name="type" th:value="${type}" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
+ <input type="text" name="type" th:value="${type}">
</div>
-
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌-娴佺▼</label>
- <div class="layui-input-block">
- <input type="text" name="progress" th:value="${progress}" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
+ <input type="text" name="progress" th:value="${progress}">
+ </div>
+ <div class="layui-form-item display-none">
+ <input type="text" name="companyId" th:value="${companyId}">
+ </div>
+ <div class="layui-form-item display-none">
+ <input type="text" name="deptId" th:value="${deptId}">
</div>
<div class="layui-col-xs3">
@@ -298,37 +290,32 @@
</div>
<script th:inline="javascript">
+ //鎵�灞炲垎搴�
+ var deptId = [[${deptId}]];
var progress = [[${progress}]];
- var listDepot = [[${listDepot}]];
//涓氬姟姝ラ
var bizType = [[${bizType}]];
//鍑哄叆搴撶被鍨�
var type = [[${type}]];
//userId
var userId = [[${loginUser.username}]];
-
- var checkUser = [[${loginUser.cname}]];
-
+ var sampleUser = [[${loginUser.cname}]];
var companyId = [[${loginUser.companyId}]];
- //鍝佺
- var listFoodVariety = [[${listFoodVariety}]];
var startTime = [[${startTime}]];
var endTime = [[${endTime}]];
//鎵︽牱鏈轰俊鎭�
var checkDto = [[${checkDto}]];
-
- //鎵�灞炲垎搴�
- var deptId = [[${deptId}]];
-
+ //搴撳尯鍚嶇О
+ var deptName = [[${deptName}]];
var inoutProgress = [[${inoutProgress}]];
-
</script>
-
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
<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-common.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-print.js}"></script>
<script th:src="@{../../static/admin/inout/in-sample.js}"></script>
<script type="text/html" id="barControl">
@@ -336,82 +323,106 @@
</script>
</body>
-<!-- 鍖栭獙淇℃伅锛屽寘鎷熀鏈俊鎭拰鍖栭獙缁撴灉 -->
+<!-- 鎵︽牱淇℃伅 -->
<div class="layui-tab-content" id="checkDetail" style="display: none;">
<!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
- <form class="layui-form" id="form-detail" lay-filter="form-detail">
-
- <div class="layui-col-xs6" style="display: none;">
- <div class="layui-form-item">
- <label class="layui-form-label">闅愯棌瀛楁-娴佹按缂栧彿</label>
- <div class="layui-input-block">
- <input type="text" name="id" autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
- </div>
-
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label">璐ㄦ鍗曞彿</label>
- <div class="layui-input-block">
- <input type="text" name="checkId" autocomplete="off"
- class="layui-input rkbk-search-input" disabled="">
- </div>
- </div>
- </div>
-
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label">杞� 鐗� 鍙�</label>
- <div class="layui-input-block">
- <input type="text" name="plateNum" autocomplete="off"
- class="layui-input rkbk-search-input" disabled="">
- </div>
- </div>
- </div>
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label">鐧昏鏃堕棿</label>
- <div class="layui-input-block">
- <input type="text" name="registerTime" autocomplete="off"
- class="layui-input rkbk-search-input" disabled="">
- </div>
- </div>
- </div>
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label red">鎵︽牱浜哄憳</label>
- <div class="layui-input-block">
- <input type="text" name="sampleUser" autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
- </div>
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label red">鎵︽牱鏃堕棿</label>
- <div class="layui-input-block">
- <input type="text" name="sampleTime" autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
- </div>
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label red">鎵︽牱鏂瑰紡</label>
- <div class="layui-input-block">
- <input type="radio" name="sampleType" value="0" title="浜哄伐" checked>
- <input type="radio" name="sampleType" value="1" title="鑷姩">
- <input type="radio" name="sampleType" value="2" title="鏅鸿兘闅忔満">
- </div>
- </div>
- </div>
+ <div style="height: 100%; width: 55%; float: left">
<div class="layui-col-xs12">
<blockquote class="layui-elem-quote">
- <div>
- <span style="font-weight: bold; margin-right: 10px;">澶囨敞锛氭墻鏍锋椂闂撮渶鏅氫簬鐧昏鏃堕棿</span>
- </div>
+ <span style="font-weight: bold; margin-right: 10px;">鎵︽牱淇℃伅</span>
</blockquote>
</div>
- </form>
+ <form class="layui-form" id="form-detail" lay-filter="form-detail">
+ <div class="layui-col-xs12" style="display: none;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">闅愯棌瀛楁-娴佹按缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="id" autocomplete="off" class="layui-input rkbk-search-input">
+ </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="checkId" autocomplete="off"
+ class="layui-input input_ba" disabled="">
+ </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="plateNum" autocomplete="off"
+ class="layui-input input_ba" disabled="">
+ </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="registerTime" autocomplete="off"
+ class="layui-input input_ba" disabled="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label red">鎵︽牱浜哄憳</label>
+ <div class="layui-input-block">
+ <input type="text" name="sampleUser" autocomplete="off" class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label red">鎵︽牱鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="text" name="sampleTime" placeholder="璇烽�夋嫨"
+ autocomplete="off" class="layui-input rkbk-search-input bg-date" id="sampleTime">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label red">鎵︽牱鏂瑰紡</label>
+ <div class="layui-input-block">
+ <input type="radio" name="sampleType" value="0" title="浜哄伐" checked>
+ <input type="radio" name="sampleType" value="1" title="鑷姩">
+ <input type="radio" name="sampleType" value="2" title="鏅鸿兘闅忔満">
+ </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>
+ </form>
+ </div>
+ <div style="height: 100%; width: 42%; float: right">
+ <div class="layui-col-xs12">
+ <blockquote class="layui-elem-quote">
+ <span style="font-weight: bold; margin-right: 10px;">鏉＄爜淇℃伅</span>
+ </blockquote>
+ <div style="text-align: center; margin-top: 10px">
+ <img style="max-width: 100px;" th:src="@{/static/images/login-app-code.png}"/>
+ </div>
+ <div style="text-align: center; margin-top: 10px">
+ <img style="max-width: 220px;" th:src="@{/static/images/br-code.jpg}"/>
+ </div>
+ <div style="text-align: center; font-size: 16px; margin-top: 10px">
+ <span th:text="${deptName}"></span>
+ </div>
+ <div style="text-align: center; font-size: 14px; margin-top: 10px">
+ <span id="printTime">--------</span>
+ </div>
+ </div>
+ </div>
</div>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
@@ -445,5 +456,4 @@
</tbody>
</table>
</div>
-
</html>
--
Gitblit v1.9.3