Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

20 小时以前 7b6329313ca3a5e6ff96246eeaf96f839df7760b

 src/main/webapp/views/basArmMast/basArmMast.html

@@ -82,6 +82,11 @@
                            <input class="layui-input" type="text" name="binding_tags" placeholder="分拣绑定标记" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="barcode" placeholder="托盘码" autocomplete="off">
                        </div>
                    </div>
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">-->
@@ -234,6 +239,12 @@
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">托盘码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="barcode" placeholder="请输入托盘码" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">异常代码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="armError" placeholder="请输入异常代码">