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-sample.html | 55 +++++++++++++++++--------------------------------------
1 files changed, 17 insertions(+), 38 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 95629ae..c4e5083 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
@@ -20,34 +20,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 {
@@ -109,6 +95,9 @@
.input_ba {
background: #e7eaec !important;
+ }
+ .layui-table-body {
+ height: 450px;
}
</style>
@@ -188,21 +177,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">
@@ -310,30 +295,24 @@
var type = [[${type}]];
//userId
var userId = [[${loginUser.username}]];
-
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/in-sample.js}"></script>
<script type="text/html" id="barControl">
@@ -341,7 +320,7 @@
</script>
</body>
-<!-- 鍖栭獙淇℃伅锛屽寘鎷熀鏈俊鎭拰鍖栭獙缁撴灉 -->
+<!-- 鎵︽牱淇℃伅 -->
<div class="layui-tab-content" id="checkDetail" style="display: none;">
<!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
<div style="height: 100%; width: 55%; float: left">
--
Gitblit v1.9.3