From 8bba7f03df59c7689dbb64a952a63944a1f43ade Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 30 六月 2023 16:05:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/templates/admin/inout/in-sample.html | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 c4e5083..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 {
@@ -287,8 +290,9 @@
</div>
<script th:inline="javascript">
+ //鎵�灞炲垎搴�
+ var deptId = [[${deptId}]];
var progress = [[${progress}]];
- var listDepot = [[${listDepot}]];
//涓氬姟姝ラ
var bizType = [[${bizType}]];
//鍑哄叆搴撶被鍨�
@@ -301,8 +305,6 @@
var endTime = [[${endTime}]];
//鎵︽牱鏈轰俊鎭�
var checkDto = [[${checkDto}]];
- //鎵�灞炲垎搴�
- var deptId = [[${deptId}]];
//搴撳尯鍚嶇О
var deptName = [[${deptName}]];
var inoutProgress = [[${inoutProgress}]];
@@ -313,6 +315,7 @@
<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">
@@ -404,19 +407,19 @@
<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>
+ <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/txm.jpg}"/>
+ <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">2023-05-31 17:30:30</span>
+ <span id="printTime">--------</span>
</div>
</div>
</div>
@@ -453,5 +456,4 @@
</tbody>
</table>
</div>
-
</html>
--
Gitblit v1.9.3