Merge remote-tracking branch 'aliyun/hylyasrs' into hylyasrs

18516761980

2022-11-25 938d10604366db71cb73fddc2320fb573b7949f2

 src/main/webapp/views/order/order.html

@@ -54,6 +54,8 @@
                            </select>
                        </div>
                    </div>
                    
                    
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="settle">
@@ -176,7 +178,7 @@
                <div id="mat" name="mat">
                </div>
            </div>
        </div>
       
        <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px">
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
            <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>保存</button>