Merge remote-tracking branch 'origin/master'

sgj

2026-02-13 72a67eb9ba942e632c11906093c5cd14e364eed7

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

@@ -205,7 +205,7 @@
                            <div class="layui-col-xs4 layui-text-right">
                                <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" 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()"/>
                                <input type="button" style="border-radius: 50px;background-color: #1ab394 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="登记" class="qyzj-top-btn layui-btn btn-group" onclick="quickRegister()"/>
                                <input type="button" style="border-radius: 50px;background-color: #1ab394 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="称重" class="qyzj-top-btn layui-btn btn-group" onclick="quickRegister()"/>
                            </div>

                        </form>
@@ -333,6 +333,8 @@
    var snapDto1 = [[${snapDto1}]];
    var snapDto2 = [[${snapDto2}]];
    var snapDto3 = [[${snapDto3}]];
    //网关信息
    var gatewaySer = [[${gatewaySer}]];
    //默认查询时间
    var startTime = [[${startTime}]];
    var endTime = [[${endTime}]];
@@ -591,7 +593,7 @@
                                    <label class="layui-form-label color-red">毛重(满车)</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="fullWeight" id="fullWeight" autocomplete="off"
                                               placeholder="地磅自动带入" class="layui-input rkbk-search-input"
                                               placeholder="地磅自动带入" class="layui-input weight rkbk-search-input"
                                               disabled>
                                        <em
                                                class="kccz-data-dw">KG</em>
@@ -692,22 +694,13 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                            <div class="layui-col-xs4 display-none">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">入库重量</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="recordWeight" placeholder="自动计算，不可编辑"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs8">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="remarks" placeholder="请输入内容"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
@@ -721,7 +714,15 @@
                                    </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="remarks" placeholder="请输入内容"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs12">
                                <div class="line-container" id="text-info">
                                    <div class="line"></div>