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

chenhaozhe

2025-07-17 f2e1cd96163ce0aeff624eb1ebd325d12f3cade1

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MaintainList.html

@@ -224,7 +224,7 @@
            var ins;                //用于导出excel
            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //需要设置的按钮的父级节点的id
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID"];
            var titleData = ["HItemID", "等级", "HMaintainClassID", "HUSEORGID","使用组织代码"];
            //#endregion
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

@@ -401,18 +401,7 @@
                    , page: true
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                    , cellMinWidth: 90
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: 'HNumber', title: '保养项目代码', width: 200 }
                    //    , { field: 'HName', title: '保养项目名称', width: 200 }
                    //    , { field: 'HLevel', title: '等级', width: 200 }
                    //    , { field: 'HEndFlag', title: '明细标记', width: 200 }
                    //    , { field: 'HStopFlag', title: '禁用标记', width: 200 }
                    //    , { field: 'HRemark', title: '备注', width: 200 }
                    //    , { field: 'HUseFlag', title: '使用标记', width: 200 }
                    //]]
                    , cellMinWidth: 90                  
                };
            }
            //查询
@@ -690,6 +679,10 @@
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../基础资料/Gy_MaintainEdit.html?OperationType=2&hID=' + HInterID
                        , resize: false
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {

                        }
@@ -824,33 +817,38 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.confirm('您确定要删除吗？', {
                        btn: ['确定', '取消'] //按钮
                        , yes: function (index, layero) {
                            $.ajax({
                                url: GetWEBURL() + '/Gy_Maintain/DeleteMaintain',
                                type: "GET",
                                data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"]},
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                            //重载tree
                                            //tree.reload('treeDepartment', {});
                                        });
                    if (data[0].审核人 != undefined && data[0].审核人 != "") {
                        layer.confirm('您确定要删除吗？', {
                            btn: ['确定', '取消'] //按钮
                            , yes: function (index, layero) {
                                $.ajax({
                                    url: GetWEBURL() + '/Gy_Maintain/DeleteMaintain',
                                    type: "GET",
                                    data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                                // å¾—到frame索引
                                                var index = layer.getFrameIndex(window.name);
                                                //关闭当前frame
                                                layer.close(index);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                                //重载tree
                                                //tree.reload('treeDepartment', {});
                                            });

                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                        } else {
                                            layer.alert(result.code + result.Message, { icon: 5 });
                                        }
                                    }
                                }
                            })
                        }
                    });
                                })

                            }
                        });
                    } else {
                        layer.msg('该行数据已审核，不允许删除！');
                    }                    
                }
                else {
                    layer.msg('请选择一行数据编辑！');