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

YL

2021-08-27 6f256110a2ced22d20672a494745c9e8bd8f2967

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_DepartmentList.html

@@ -45,11 +45,11 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>-->
                               <!-- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                    </form>
@@ -190,6 +190,21 @@
            }
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and éƒ¨é—¨ä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and éƒ¨é—¨åç§° like '%" + HName + "%'";
                }
                get_Display(sWhere);
                sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];//调用接口后清空sWhere缓存
            }
            //#endregion

            //#region ç¼–辑
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -202,30 +217,10 @@
                        , area: ['100%', '100%']
                        , title: '部门列表-编辑'
                        , shift: 0//弹出动画
                        , content: '../生产基础资料/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , content: '../公用基础资料/Add_Edit_Gy_Department.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //#endregion

            //#region æµè§ˆ
            function get_PrintReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HItemID.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '生产资源-浏览'
                        , shift: 0//弹出动画
                        , content: '../生产基础资料/Add_Edit_Gy_Source.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
                    })
                } else {
                    layer.msg('请选择一行数据浏览！');
                }
            }
            //#endregion
@@ -239,7 +234,7 @@
                    var ajaxLoad = layer.load();
                    //逻辑删除方法
                    $.ajax({
                        url: GetWEBURL() + 'DeltetGy_Source',
                        url: GetWEBURL() + 'DeltetGy_Department',
                        type: "GET",
                        data: { "HItemID": ItemID },
                        success: function (result) {
@@ -263,21 +258,69 @@

            }
            //#endregion
            ////#region æµè§ˆ
            //function get_PrintReport() {
            //    var checkStatus = table.checkStatus('mainTable')
            //        , data = checkStatus.data;
            //    if (checkStatus.data.length === 1) {
            //        var linterid = data[0].HItemID.toString();
            //        //if (AllowLoadData(sSubStr) != false) {//非空验证
            //        layer.open({
            //            type: 2
            //            , area: ['100%', '100%']
            //            , title: '生产资源-浏览'
            //            , shift: 0//弹出动画
            //            , content: '../生产基础资料/Add_Edit_Gy_Source.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
            //        })
            //    } else {
            //        layer.msg('请选择一行数据浏览！');
            //    }
            //}
            ////#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and éƒ¨é—¨ä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and éƒ¨é—¨åç§° like '%" + HName + "%'";
                }
                get_Display(sWhere);
                sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];//调用接口后清空sWhere缓存
            }
            //#endregion
            ////#region åˆ é™¤
            //function set_DeleteBill() {
            //    var checkStatus = table.checkStatus('mainTable')
            //        , data = checkStatus.data;
            //    if (checkStatus.data.length === 1) {
            //        var ItemID = data[0].HItemID.toString();
            //        var ajaxLoad = layer.load();
            //        //逻辑删除方法
            //        $.ajax({
            //            url: GetWEBURL() + 'DeltetGy_Source',
            //            type: "GET",
            //            data: { "HItemID": ItemID },
            //            success: function (result) {
            //                if (result.count == 1) {
            //                    layer.msg(result.Message, { icon: 1 });
            //                    get_Display(sWhere);
            //                    layer.close(ajaxLoad);
            //                } else {
            //                    layer.close(ajaxLoad);
            //                    layer.alert(result.Message, { icon: 5 });
            //                }
            //            }, error: function () {
            //                layer.close(ajaxLoad);
            //                layer.alert("接口请求失败!", { icon: 5 });
            //            }
            //        });
            //    }
            //    else {
            //        layer.msg('请选择一行数据删除！');
            //    }

            //}
            ////#endregion

            ////#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            //function set_ClearQuery() {
            //    $("#HNumber").val("");
            //    $("#HName").val("");
            //    sWhere = "";
            //}
            ////#endregion

           

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
@@ -295,7 +338,7 @@
                    , area: ['100%', '100%']
                    , title: '生产资源-新增'
                    , shift: 0//弹出动画
                    , content: '../生产基础资料/Add_Edit_Gy_Source.html?OperationType=1&linterid=&HSouceBillType='
                    , content: '../公用基础资料/Add_Edit_Gy_Department.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#endregion