Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-05-31 29a928860314d79adfbd6fd564b916ea9e834a4e

 igds-web/src/main/resources/templates/admin/inout/in-sample.html

@@ -106,6 +106,10 @@
            padding: 10px;
            color: blue;
        }

        .input_ba {
            background: #e7eaec !important;
        }
    </style>

</head>
@@ -307,7 +311,7 @@
    //userId
    var userId = [[${loginUser.username}]];

    var checkUser = [[${loginUser.cname}]];
    var sampleUser = [[${loginUser.cname}]];

    var companyId = [[${loginUser.companyId}]];
    //品种
@@ -319,6 +323,7 @@

    //所属分库
    var deptId = [[${deptId}]];
    var deptName = [[${deptName}]];

    var inoutProgress = [[${inoutProgress}]];

@@ -339,79 +344,103 @@
<!-- 化验信息，包括基本信息和化验结果 -->
<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/txm.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>
            </div>
        </div>
    </div>
</div>

<!-- 弹出框的信息 -->