登记、化验、称重页面调整，及登记化验数据提交

czt

2025-12-03 53fab3f56e8335fbf39fc07c4e10f6abdb0505bb

 fzzy-igdss-web/src/main/resources/templates/inout/check.html

ÎļþÃû´Ó fzzy-igdss-web/src/main/resources/templates/inout/inout-check.html ÐÞ¸Ä
@@ -16,7 +16,9 @@
            overflow: hidden;
            width: 100%;
        }

        .layui-table-view .layui-table {
            width: 100%;
        }
        #layui-table-page1 {
            text-align: right !important;
        }
@@ -82,10 +84,6 @@
            background: #FFF !important;
        }

        thead span {
            font-weight: bold
        }

        .red {
            color: red;
            font-weight: bold;
@@ -93,10 +91,6 @@

        .layui-select-disabled .layui-disabled {
            color: #000 !important;
        }

        .layui-table td {
            font-weight: bold;
        }

        .layui-elem-quote {
@@ -113,6 +107,9 @@
            border-color: #53adce;
            background-color: #53adce;
            color: #fff;
        }
        .qyzj-con {
            height: 710px;
        }
    </style>

@@ -168,26 +165,31 @@
                                   autocomplete="off" class="layui-input rkbk-search-input">
                        </div>
                    </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>
                    </div>
                    <div class="layui-col-xs3">
                        <div class="layui-form-item">
                            <label class="layui-form-label">质检单号</label>
                            <label class="layui-form-label">往来单位</label>
                            <div class="layui-input-block">
                                <input type="text" name="checkId" placeholder="请输入"
                                <input type="text" name="customerName" placeholder="请输入"
                                       autocomplete="off" class="layui-input rkbk-search-input">
                            </div>
                        </div>
                    </div>
                    <div class="layui-col-xs3">
                        <div class="layui-form-item">
                            <label class="layui-form-label">装卸仓库</label>
                            <div class="layui-input-block">
                                <select name="depotId">
                                    <option value=""></option>
                                    <option th:each="depot,depotSet:${listDepot}"
                                            th:value="${depot.id}" th:text="${depot.name}"></option>
                                </select>
                            </div>
                        </div>
                    </div>
                    <div class="layui-col-xs3">
                        <div class="layui-form-item">
                            <label class="layui-form-label">粮食品种</label>
                            <div class="layui-input-block rkbk-selBox">
                            <div class="layui-input-block">
                                <select name="foodVariety">
                                    <option value=""></option>
                                    <option th:each="dic,dicSet:${listFoodVariety}"
@@ -198,41 +200,8 @@
                    </div>
                    <div class="layui-col-xs3">
                        <div class="layui-form-item">
                            <label class="layui-form-label">起始时间</label>
                            <div class="layui-input-block">
                                <input type="text" name="start" placeholder="请输入" autocomplete="off"
                                       class="layui-input rkbk-search-input bg-date" id="start">
                            </div>
                        </div>
                    </div>

                    <div class="layui-col-xs3">
                        <div class="layui-form-item">
                            <label class="layui-form-label">截止时间</label>
                            <div class="layui-input-block">
                                <input type="text" name="end" placeholder="请输入" autocomplete="off"
                                       class="layui-input rkbk-search-input bg-date" id="end">
                            </div>
                        </div>
                    </div>

                    <div class="layui-col-xs3">
                        <div class="layui-form-item">
                            <label class="layui-form-label">装卸仓库</label>
                            <div class="layui-input-block rkbk-selBox">
                                <select name="depotId">
                                    <option value=""></option>
                                    <option th:each="depot,depotSet:${listDepot}"
                                            th:value="${depot.id}" th:text="${depot.name}"></option>
                                </select>
                            </div>
                        </div>
                    </div>

                    <div class="layui-col-xs3">
                        <div class="layui-form-item">
                            <label class="layui-form-label">是否化验</label>
                            <div class="layui-input-block rkbk-selBox">
                            <div class="layui-input-block">
                                <select name="checkStatus">
                                    <option value="NONE" selected>未化验</option>
                                    <option value="CHECK">已化验</option>
@@ -240,14 +209,30 @@
                            </div>
                        </div>
                    </div>

                    <div class="layui-col-xs3">
                        <div class="layui-form-item">
                            <label class="layui-form-label">起始时间</label>
                            <div class="layui-input-block">
                                <input type="text" name="start" placeholder="请选择" autocomplete="off"
                                       class="layui-input rkbk-search-input bg-date" id="start">
                            </div>
                        </div>
                    </div>
                    <div class="layui-col-xs3">
                        <div class="layui-form-item">
                            <label class="layui-form-label">截止时间</label>
                            <div class="layui-input-block">
                                <input type="text" name="end" placeholder="请选择" autocomplete="off"
                                       class="layui-input rkbk-search-input bg-date" id="end">
                            </div>
                        </div>
                    </div>
                    <div class="layui-col-xs3 layui-text-right">
                        <input type="button" value="查询/刷新"
                        <input type="button" style="border-radius: 50px;background-color: #1c84c6 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="搜索"
                               class="qyzj-top-btn layui-btn btn-blue" onclick="flushData()"/>
                        <input type="button" value="清空条件"
                        <input type="button" style="border-radius: 50px;background-color: #f8ac59 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="重置"
                               class="qyzj-top-btn layui-btn btn-red" onclick="resetForm()"/>
                    </div>

                </form>
            </div>
            <!--qyzj-con-oop end-->
@@ -257,26 +242,27 @@
                       lay-filter="tableData">
                    <colgroup>
                        <col width="10%">
                        <col width="10%">
                        <col width="10%">
                        <col width="10%">
                        <col width="10%">
                        <col width="10%">
                        <col width="10%">
                        <col width="10%">
                        <col width="8%">
                        <col width="6%">
                        <col width="">
                        <col width="10%">
                        <col width="10%">
                        <col width="8%">
                        <col width="8%">
                        <col width="10%">
                        <col width="9%">
                    </colgroup>
                    <thead>
                    <tr class="qyzj-table-tit">
                        <th>质检单号</th>
                        <th>登记时间</th>
                        <th>扦样状态</th>
                        <th>扦样人</th>
                        <th>扦样时间</th>
                        <th>粮食品种</th>
                        <th>单据号</th>
                        <th>车牌号</th>
                        <th>类型</th>
                        <th>往来单位</th>
                        <th>装卸仓库</th>
                        <th>检验结果</th>
                        <th>粮食品种</th>
                        <th>水分</th>
                        <th>杂质</th>
                        <th>流程进度</th>
                        <th>操作</th>
                    </tr>
                    </thead>
@@ -304,12 +290,8 @@
    //品种
    var listFoodVariety = [[${listFoodVariety}]];
    //性质
    var listFoodType = [[${listFoodType}]];
    var startTime = [[${startTime}]];
    var endTime = [[${endTime}]];
    var foodYear = [[${foodYear}]];
    //扦样机信息
    var checkDto = [[${checkDto}]];

    //所属分库
    var deptId = [[${deptId}]];
@@ -322,102 +304,78 @@
<script th:src="@{/common/constant.js}"></script>
<script th:src="@{/common/igds-common.js}"></script>
<script th:src="@{/inout/inout-common.js}"></script>
<script th:src="@{/web/inout/inout-check.js}"></script>
<script th:src="@{/inout/check.js}"></script>

<script type="text/html" id="barControl">
    <a class="layui-btn control-btn" lay-event="edit">结果录入</a>
</script>
</body>

<!-- æ‰«ç å¼¹çª— -->
<div class="layui-tab-content" id="scanCodeDetail" style="display: none;" Î¿nsubmit="return false;">
    <!-- è¡¨å•åŸºæœ¬ä¿¡æ¯ -->
    <form class="layui-form" id="form-sacnCodeDetail" lay-filter="form-sacnCodeDetail">
        <div class="layui-col-xs12">
            <div class="layui-form-item">
                <label class="layui-form-label">质检单号</label>
                <div class="layui-input-block">
                    <input type="text" id="checkId" name="checkId" placeholder="请扫码，也可手动输入" class="layui-input">
                    <!--这行代码不能删-->
                    <!--当form表单中只有一个input时按回车按键会刷新页面，因此添加一个input并隐藏，不能使用type="hidden"方式隐藏-->
                    <input type="text" id="hiddenText" name="hiddenText" style="display:none"/>
                </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 class="layui-tab-content" id="checkDetail" style="display: none;">

    <!-- è¡¨å•åŸºæœ¬ä¿¡æ¯ -->
    <form class="layui-form" id="form-detail" lay-filter="form-detail">

        <div class="layui-col-xs12" style="display: none;">
        <div class="layui-col-xs4" style="display: none;">
            <div class="layui-form-item">
                <label class="layui-form-label">隐藏字段-流水编号</label>
                <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-xs4">
            <div class="layui-form-item">
                <label class="layui-form-label">质检单号</label>
                <div class="layui-input-block">
                    <input type="text" name="checkId" autocomplete="off"
                    <input type="text" name="companyId" autocomplete="off"
                           class="layui-input input_ba" disabled="">
                </div>
            </div>
        </div>

        <div class="layui-col-xs4">
        <div class="layui-col-xs4" style="display: none;">
            <div class="layui-form-item">
                <label class="layui-form-label">扦 æ · äºº</label>
                <label class="layui-form-label">隐藏字段-库区编码</label>
                <div class="layui-input-block">
                    <input type="text" name="sampleUser" autocomplete="off"
                    <input type="text" name="deptId" autocomplete="off"
                           class="layui-input input_ba" disabled="">
                </div>
            </div>
        </div>
        <div class="layui-col-xs4">
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label">扦样时间</label>
                <label class="layui-form-label">单据号</label>
                <div class="layui-input-block">
                    <input type="text" name="sampleTime" autocomplete="off"
                           class="layui-input input_ba" disabled="">
                    <input type="text" name="id" autocomplete="off"
                           class="layui-input input_ba" disabled>
                </div>
            </div>
        </div>
        <div class="layui-col-xs4">
        <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="checkUser" autocomplete="off"
                           class="layui-input">
                </div>
            </div>
        </div>
        <div class="layui-col-xs4">
            <div class="layui-form-item">
                <label class="layui-form-label red">装卸仓库</label>
                <label class="layui-form-label">装卸仓库</label>
                <div class="layui-input-block">
                    <select name="depotId" id="depotId" lay-filter="select_depot">
                        <option value=""></option>
                        <option th:each="depot,depotSet:${listDepot}"
                                th:value="${depot.id}" th:text="${depot.name}"></option>
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-col-xs4">
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label red">粮食品种</label>
                <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-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label">往来单位</label>
                <div class="layui-input-block">
                    <select name="depotId" id="customerName" lay-filter="select_depot">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label">粮食品种</label>
                <div class="layui-input-block">
                    <select name="foodVariety" style="font-weight: bold"
                            id="foodVariety" lay-filter="select_foodVariety">
@@ -428,27 +386,7 @@
                </div>
            </div>
        </div>
        <div class="layui-col-xs4">
            <div class="layui-form-item">
                <label class="layui-form-label">质检时间</label>
                <div class="layui-input-block">
                    <input type="text" name="checkTime" autocomplete="off"
                           class="layui-input">
                </div>
            </div>
        </div>
        <div class="layui-col-xs4">
            <div class="layui-form-item">
                <label class="layui-form-label">收粮定价</label>
                <div class="layui-input-block">
                    <input type="text" name="price" id="price"
                           class="layui-input rkbk-search-input" placeholder="根据粮食等级带入/手动录入">
                    <em class="kccz-data-dw">元/公斤</em>
                </div>
            </div>
        </div>

        <div class="layui-col-xs4">
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label red">粮食等级</label>
                <div class="layui-input-block">
@@ -460,37 +398,23 @@
                </div>
            </div>
        </div>
        <div class="layui-col-xs4">
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label">粮食年份</label>
                <label class="layui-form-label red">水分</label>
                <div class="layui-input-block">
                    <input type="text" name="foodYear" placeholder="请输入" autocomplete="off"
                           class="layui-input rkbk-search-input bg-date" id="foodYear">
                    <input id="perWet" type="text" name="perWet" autocomplete="off"
                           placeholder="请输入" class="layui-input weight"> <em
                        class="kccz-data-dw">%</em>
                </div>
            </div>
        </div>
        <div class="layui-col-xs4">
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label red">粮食性质</label>
                <label class="layui-form-label red">杂质</label>
                <div class="layui-input-block">
                    <select id="foodType" name="foodType" lay-filter="select_foodType">
                        <option value=""></option>
                        <option th:each="dic,dicSet:${listFoodType}"
                                th:value="${dic.dictValue}" th:text="${dic.dictLabel}"></option>
                    </select>
                </div>
            </div>
        </div>

        <div class="layui-col-xs4">
            <div class="layui-form-item">
                <label class="layui-form-label red">化验结果</label>
                <div class="layui-input-block">
                    <select name="checkStatus" id="checkStatus">
                        <option value="NONE">未化验</option>
                        <option value="PASS">合格</option>
                        <option value="UNPASS">不合格</option>
                    </select>
                    <input id="perImpurity" type="text" name="perImpurity" autocomplete="off"
                           placeholder="请输入" class="layui-input weight"> <em
                        class="kccz-data-dw">%</em>
                </div>
            </div>
        </div>
@@ -503,62 +427,7 @@
                </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;">备注说明：1.结果判定：系统根据各化验项结果判定，最后化验结果需手动选择确认；2.核算定价：根据化验项配置计算相关增扣价，最后单价需手动确认。</span>
            </div>
        </div>
        <div class="layui-col-xs6">
            <blockquote class="layui-elem-quote" style="width: 95%;float: left;">
                <div>
                    <span style="font-weight: bold; margin-right: 10px;">结果判定：</span>
                    <span id="check-result-tip" style="margin-right: 25px;">化验结果：</span>
                </div>
            </blockquote>
        </div>
        <div class="layui-col-xs6">
            <blockquote class="layui-elem-quote" style="width: 95%;float: right;">
                <div>
                    <span style="font-weight: bold; margin-right: 10px;">定价判定：</span>
                    <span id="check-result-tip2" style="margin-right: 25px;">收粮单价：#元/公斤</span>
                </div>
            </blockquote>
        </div>
    </form>

    <!-- åŒ–验结果信息 -->
    <table class="layui-table tableCheckItem" id="tableCheckItem"
           lay-filter="tableCheckItem">
        <colgroup>
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="">
        </colgroup>
        <thead>
        <tr class="qyzj-table-tit">
            <th>检验项目</th>
            <th>检验值</th>
            <th>标准值</th>
            <th>单位</th>
            <th>扣重</th>
            <th>增重</th>
            <th>扣价</th>
            <th>增价</th>
            <th>检验结果</th>
            <th>备注</th>
        </tr>
        </thead>
        <tbody>
        </tbody>
    </table>

</div>

<!-- å¼¹å‡ºæ¡†çš„信息 -->
@@ -584,10 +453,6 @@
        <tr>
            <td>下一步</td>
            <td id="resultType" style="font-weight: bold;"></td>
        </tr>
        <tr>
            <td>智慧卡号</td>
            <td id="resultIntelCard" style="font-weight: bold;"></td>
        </tr>
        </tbody>
    </table>