Merge remote-tracking branch 'origin/master'

mrzhssss

2022-03-16 c445cc6b68ee932bbcb3b3389b4298aaf8b291e0

 src/main/webapp/views/receiveDetl/receiveDetl.html

@@ -69,6 +69,14 @@
            </div>
            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label" >入库单号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="orderNo" placeholder="请输入" disabled>
                    </div>
                </div>
            </div>
            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label" >商品名称: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="maktx" placeholder="请输入" disabled>
@@ -136,6 +144,7 @@
                    </div>
                </div>
            </div>

            <hr class="layui-bg-gray">
            <div class="layui-form-item text-right">
<!--                <button class="layui-btn" lay-filter="recommendIn" lay-submit="">自动入库</button>-->