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

Junjie

2023-03-20 7bea8428d74527993cb4ae47d01c79850b5f34bc

 src/main/webapp/views/mat/mat.html

@@ -104,7 +104,7 @@
                            </div>
                        </div>
                        <div class="layui-inline">&emsp;
                            <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <button class="layui-btn icon-btn" id="search" lay-filter="search" lay-submit>
                                <i class="layui-icon">&#xe615;</i>搜索
                            </button>
                            <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
@@ -197,13 +197,28 @@
                        <input name="maktx" placeholder="请输入商品名称" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">备注</label>
                    <label class="layui-form-label">库存上限</label>
                    <div class="layui-input-block">
                        <input name="memo" placeholder="请输入备注" class="layui-input">
                        <input name="storeMax" placeholder="库存上限" type="number" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">库龄上限(天)</label>
                    <div class="layui-input-block">
                        <input name="storeMaxDate" placeholder="库龄上限(天)" type="number" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">高频物料</label>
                    <div class="layui-input-block">
                        <select name="inoutEveryday" lay-vertype="tips" lay-verify="required" required="">
                            <option value="0">否</option>
                            <option value="1">是</option>
                        </select>
                    </div>
                </div>


            </div>

@@ -219,6 +234,21 @@
                    <label class="layui-form-label">规格</label>
                    <div class="layui-input-block">
                        <input name="specs" placeholder="请输入规格" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">库存下限</label>
                    <div class="layui-input-block">
                        <input name="storeMin" placeholder="库存下限" type="number" class="layui-input">
                    </div>
                </div>


                <div class="layui-form-item">
                    <label class="layui-form-label">备注</label>
                    <div class="layui-input-block">
                        <input name="memo" placeholder="请输入备注" class="layui-input">
                    </div>
                </div>

@@ -376,14 +406,10 @@
        <tr style="height: 74px" >
            <td align="center" scope="col" colspan="1">商品</td>
            <td align="center" scope="col" colspan="1" style="
                display: inline-block;
                line-height: 20px;
                vertical-align: middle;
                border: none;
                border-top: 1px solid #000;
                overflow: hidden;
                text-overflow: ellipsis;
                display: -webkit-box;
                -webkit-line-clamp: 3;
                -webkit-box-orient: vertical;
                    ">