Merge remote-tracking branch 'origin/master'

YYC

2023-06-30 8bba7f03df59c7689dbb64a952a63944a1f43ade

 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>