Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

仲国强

2021-09-07 79d53a42545a6701912877756c07d3ffbccd21e5

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/views/基础资料/公用基础资料/Gy_MouldType.html

@@ -65,6 +65,7 @@
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px;width:60px !important">閲嶇疆</button>
                                            </div>
                                            <div>
                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -402,6 +403,15 @@
                });
                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
            });

            //閲嶇疆鎸夐挳
            form.on('submit(btnReSearch)', function (data) {
                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
                $("#HNumber").val("");//浠ｇ爜
                $("#HName").val("");//鍚嶇О
                sWhere = "";
                $("#btnSearch").click();
            });
            //#endregion

            //laydate.render({

 WebTM/views/模治具管理/模治具管理/Gy_Mould.html

@@ -209,7 +209,7 @@
                            layer.close(index);
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            layer.alert("娌℃湁浣犺鎵剧殑璁板綍", { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);