工艺参数分类: 增加超链接功能 添加编辑页面审核功能 修复日期显示为空白 添加已审核单据的保护
设备保养规程:调整页面布局 单据号添加超链接 子表添加列设置 添加已审核单据的保护 添加编辑页面审核功能 添加双击返回和批量返回 添加不可编辑列样式
设备点检规程 修改网格高度 单据号添加超链接 添加已审核单据的保护 修改点检周期值未带入和页面异常 添加刷双击返回 添加编辑页面审核功能 添加子表列设置
9个文件已修改
523 ■■■■ 已修改文件
WebTM/WebTM.csproj.user 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/layui-common-custom.js 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_TechnologyParameterType.html 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterType.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList.html 120 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleList.html 127 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user
@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
WebTM/layuiadmin/layui-common-custom.js
@@ -19,27 +19,7 @@
    });
}
// æ¸…除制单信息
function Clear_BillMakeMsg(formLayui, formWrapperStr) {
    if (typeof Object.assign === 'function') {
        let formObj = formLayui.val(formWrapperStr)
        formObj['HMaker'] = sessionStorage['HMaker']
        formObj['HMakeDate'] = ''
        formObj['HChecker'] = ''
        formObj['HCheckDate'] = ''
        formObj['HUpDater'] = ''
        formObj['HUpDateDate'] = ''
        formObj['HCloseMan'] = ''
        formObj['HCloseDate'] = ''
        formObj['HDeleteMan'] = ''
        formObj['HDeleteDate'] = ''
        formObj['HStopMan'] = ''
        formObj['HStopDate'] = ''
        form.val(formWrapperStr, formObj);
    }
}
// è®¾ç½®ä¸å¯ç¼–辑列 / éšè—åˆ—
// è®¾ç½®ä¸å¯ç¼–辑列 / éšè—åˆ— è®¾ç½®å¯ç¼–辑列
function setUneditableCol(option, editable, hideCols) {
    if (Array.isArray(editable) !== true) {
        return
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_TechnologyParameterType.html
@@ -14,6 +14,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/common.js"></script>
</head>
<body>
@@ -25,6 +26,7 @@
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Checker">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
                        </div>
@@ -32,7 +34,7 @@
                            <div class="layui-tab layui-tab-brief">
                                <ul class="layui-tab-title">
                                    <li class="layui-this">基本信息</li>
                                    <li>其他信息</li>
                                    <li>制单信息</li>
                                </ul>
                                <div class="layui-tab-content">
                                    <div class="layui-tab-item layui-show">
@@ -100,7 +102,7 @@
                                            </div>
                                        </div>
                                    </div>
                                    <!--其他信息-->
                                    <!--制单信息-->
                                    <div class="layui-tab-item">
                                        <div class="layui-form-item">
                                            <div class="layui-row">
@@ -215,7 +217,7 @@
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "SaveGy_TechnologyTypeList", //方法所在页面和方法名
                        url: GetWEBURL() + "/SaveGy_TechnologyTypeList", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainStr },
                        dataType: "json",
@@ -237,6 +239,36 @@
                        }
                    });
            });
            //审核
            form.on('submit(Checker)', function (data) {
                var InterID = linterid
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_BadReason/AuditGy_TechnologyParameterClass", //方法所在页面和方法名
                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": 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);
                                $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
                                $("#check-btn").addClass("layui-btn-disabled").attr("disabled", true);
                                //修改为功后刷新界面
                                //$("#btnSearch").trigger('click');
                            });
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }
                })
            })
            //退出
            form.on('submit(Exit)', function (data) {//
                if (linterid == undefined) {
@@ -266,6 +298,7 @@
            //初始化界面
            function set_ClearBill() {
                $("#check-btn").addClass("layui-btn-disabled").attr("disabled", true);
                $("#HUSEORGID").attr("disabled", true);
                $("#HCREATEORGID").attr("disabled", true);
                $("#HStopflag").attr("disabled", true);
@@ -287,7 +320,7 @@
            function set_EditForm(linterid) {
                //查询检验方案单是否存在
                $.ajax({
                    url: GetWEBURL() + "GetGy_TechnologyTypeDetail",
                    url: GetWEBURL() + "/GetGy_TechnologyTypeDetail",
                    type: "GET",
                    async: false,
                    data: {
@@ -313,6 +346,21 @@
                            $("#HCheckTime").val(data.审核时间 == null ? "" : Format(new Date(data.审核时间), "yyyy-MM-dd"));
                            layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话
                            if (OperationType != 2) {
                                if (isEmpty(data["审核人"]) === false) {
                                    $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
                                } else {
                                    $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false)
                                }
                            } else {
                                $("#HMakeEmp").val(sessionStorage["HMaker"]);
                                $("#HMakeTime").val("");
                                $("#HStopEmp").val("");
                                $("#HStopTime").val("");
                                $("#HCheckEmp").val("");
                                $("#HCheckTime").val("");
                            }
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_TechnologyParameterType.html
@@ -15,6 +15,7 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/common.js"></script>
</head>
<body>
@@ -273,6 +274,15 @@
                        break;
                };
            });
            //表格自定义事件监听
            table.on('tool(mainTable)', function (obj) {
                let data = obj.data
                switch (obj.event) {
                    case "onTechParamUnitCodeClickHandler": onTechParamUnitCodeClickHandler(data); break;
                }
            })
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
@@ -380,6 +390,13 @@
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '工艺参数分类代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'onTechParamUnitCodeClickHandler', templet: function (d) {
                                            return '<span style="color: blue;">' + d.工艺参数分类代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -664,12 +681,16 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    if (isEmpty(data[0]['审核人']) === false) {
                        layer.alert('删除失败: å•据已被审核!', { icon: 5 });
                        return;
                    }
                    var HItemID = data[0].HItemID.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "DeltetGy_TechnologyType", //方法所在页面和方法名
                            url: GetWEBURL() + "/DeltetGy_TechnologyType", //方法所在页面和方法名
                            data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {
                                if (result.count == 1) {
@@ -994,6 +1015,30 @@
                })
            }
            //#region è‡ªå®šä¹‰äº‹ä»¶æ•获
            function onTechParamUnitCodeClickHandler(data) {
                var hID = data.HItemID;
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '编辑工艺参数分类'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: '../公用基础资料/Add_Edit_Gy_TechnologyParameterType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                    , resize: false,
                    end: function () {
                        //刷新页面,
                        get_FastQuery();
                        //location.reload();
                    }
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            }
            //#endregion
            //#endregion
            //以上是layui模块
        });
WebTM/views/»ù´¡×ÊÁÏ/Òþ²ØÁÐÉèÖÃ/Gy_GridView_Hide_New.html
@@ -14,14 +14,25 @@
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <style>
        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        .layui-table-cell {
        /*.layui-table-cell {
            overflow: visible !important;
        }
        }*/
        /* ä½¿å¾—下拉框与单元格刚好合适 */
        td .layui-form-select {
        /*td .layui-form-select {
            margin-top: -10px;
            margin-left: -15px;
            margin-right: -15px;
        }*/
        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        td:has(select) .layui-table-cell {
            overflow: visible !important;
            padding: 0;
            box-sizing: border-box;
        }
        /* ä½¿å¾—下拉框与单元格刚好合适 */
        td:has(select) .layui-form-select {
            margin-top: -10px;
        }
    </style>
</head>
WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipDotCheckRuleEdit.html
@@ -38,6 +38,7 @@
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Checker">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
                        </div>
@@ -205,10 +206,9 @@
                        <table class="layui-hide" 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="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="xuhao">
@@ -228,6 +228,9 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/common.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
    <script src="../../../layuiadmin/layui-common-custom.js"></script>
    <script>
        var OptionData = [];
        var Stverf = "";
@@ -258,6 +261,8 @@
                , util = layui.util
                ;
            var sBillType = "3913";
            var HModName= "Sb_EquipDotCheckRuleEdit"
            var unEditable = ["HManagerName"]
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -287,7 +292,7 @@
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                get_MAXNum();
                OperationType = 1;
            }
            else if (OperationType == 3) {//编辑
                Stverf = "Update";
@@ -312,6 +317,11 @@
                        break;
                    //复制一行
                    case 'btn-CopyLine': btnCopyLine(data);
                        break;
                    case 'set_HideColumn': get_HideColumnEditWithCallback(HModName, sessionStorage['HUserName'], option, table, function () {
                        setUneditableCol_WithUneditable(option, unEditable, [])
                        table.render(option)
                    })
                        break;
                }
            });
@@ -534,6 +544,7 @@
            }
            //初始化表单插件
            function set_InitFrom() {
                $("#check-btn").addClass("layui-btn-disabled").attr("disabled", true);
                //常规用法
                laydate.render({
                    elem: '#HDate'
@@ -676,7 +687,7 @@
                    },
                    success: function (d) {
                        if (d.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ                           
                            var data = d.data.h_v_Sb_EquipDotCheckRuleEdit想·[0];
                            var data = d.data.h_v_Sb_EquipDotCheckRuleEdit[0];
                            if (data.默认规程 == 1) {
                                $("input[name='HStandard']").prop("checked", true);
                            }
@@ -707,6 +718,26 @@
                                , "HUSEORGID": data.HUSEORGID
                            });
                            if (OperationType != 2) {
                                if (isEmpty(data["审核人"]) === false) {
                                    $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
                                } else {
                                    $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false);
                                }
                            } else {
                                $("#HMaker").val(sessionStorage["HUserName"])
                                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"))
                                $("#HChecker").val("")
                                $("#HCheckDate").val("")
                                $("#HUpDater").val("")
                                $("#HUpDateDate").val("")
                                $("#HCloseMan").val("")
                                $("#HCloseDate").val("")
                                $("#HDeleteMan").val("")
                                $("#HDeleteDate").val("")
                                OperationType = 1;
                            }
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
@@ -718,7 +749,7 @@
                $("#HInterID").val(linterid);//修改时主表ID
                //编辑加载数据
                $.ajax({
                    url: GetWEBURL() + 'Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListProjectDetai',
                    url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListProjectDetai',
                    type: "GET",
                    data: { "sqlWhere": "and hmainid=" + linterid },
                    success: function (result) {
@@ -729,6 +760,8 @@
                                rowarr.push({ "HDotCheckItemID": data[i].点检项目ID, "HDotCheckItem": data[i].点检项目, "HDotCheckPart": data[i].点检部位, "HClaim": data[i].具体要求, "HManagerID": data[i].负责人ID, "HManagerNumber": data[i].负责人代码, "HManagerName": data[i].负责人, "HRemark": data[i].子备注, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].点检项目分类名称, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].点检方法名称 });
                            }
                            option.data = rowarr;
                            DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
                            setUneditableCol_WithUneditable(option, unEditable, [])
                            table.render(option);
                        } else {
WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipDotCheckRuleList.html
@@ -14,6 +14,7 @@
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/HideButton_New.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
    <script src="../../../layuiadmin/common.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -170,8 +171,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>导入</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_UnDelete" id="btn_UnDelete"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
@@ -305,6 +306,13 @@
                };
            });
            //自定义事件
            table.on("tool(mainTable)", function (obj) {
                let data = obj.data;
                switch (obj.event) {
                    case "onBillNumberClickHandler": onBillNumberClickHandler(data); break;
                }
            })
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
@@ -461,6 +469,13 @@
                                if ($.inArray(data[i].name, titleData) > -1 ) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '单据号') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'onBillNumberClickHandler', templet: function (d) {
                                            return '<span style="color: blue;">' + d.单据号 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
@@ -486,7 +501,7 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 780
                                , height: "full-130"
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
@@ -768,9 +783,17 @@
            function set_CheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                debugger
                if (data.length == 1) {
                    layer.confirm("确认要审核吗?", function (index) {
                    if (num == 1 && isEmpty(data[0]["审核人"]) === false) {
                        layer.alert("审核失败: å•据已被审核!", { icon: 5 })
                        return
                    }
                    else if (num == 2 && isEmpty(data[0]["审核人"]) === true) {
                        layer.alert("反审核失败: å•据未被审核!", { icon: 5 })
                        return
                    }
                    layer.confirm("确认要"+ (num == 1 ? "审核" : "反审核") +"吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
                        $.ajax({
@@ -798,38 +821,38 @@
            }
            //关闭/反关闭
            function set_CloseBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
            //function set_CloseBill(num) {
            //    var checkStatus = table.checkStatus('mainTable')
            //        , data = checkStatus.data;
                if (data.length == 1) {
                    layer.confirm("确认要关闭吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
                        $.ajax({
                            url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/CloseSb_EquipDotCheckRuleBill',
                            type: "GET",
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                }
                else {
                    layer.msg("请选择一条数据!");
                }
            }
            //    if (data.length == 1) {
            //        layer.confirm("确认要关闭吗?", function (index) {
            //            var wait = layer.load();
            //            var HInterID = data[0].hmainid;
            //            $.ajax({
            //                url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/CloseSb_EquipDotCheckRuleBill',
            //                type: "GET",
            //                data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
            //                success: function (result) {
            //                    if (result.count == 1) {
            //                        get_FastQuery();
            //                        layer.msg(result.Message, { icon: 1 });
            //                        layer.close(wait);
            //                    } else {
            //                        layer.alert(result.code + result.Message, { icon: 5 });
            //                        layer.close(wait);
            //                    }
            //                }, error: function () {
            //                    layer.alert("接口请求失败!", { icon: 5 });
            //                    layer.close(wait);
            //                }
            //            });
            //        })
            //    }
            //    else {
            //        layer.msg("请选择一条数据!");
            //    }
            //}
            //#region ä½œåºŸ/反作废
            function btn_Delete(num) {
@@ -1198,6 +1221,31 @@
                })
            }
            //#region è‡ªå®šä¹‰äº‹ä»¶ç›‘听
            function onBillNumberClickHandler(data) {
                var linterid = data.hmainid;
                //if (AllowLoadData(sSubStr) != false) {//非空验证
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '编辑' + HPageTitle
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: '../设备规程单/Sb_EquipDotCheckRuleEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    , resize: false,
                    end: function () {
                        //刷新页面,
                        location.reload();
                    }
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            }
            //#endregion
            //#endregion
            //以上是layui模块
WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipMaintainRuleEdit.html
@@ -10,6 +10,9 @@
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
    <script src="../../../layuiadmin/common.js"></script>
    <script src="../../../layuiadmin/layui-common-custom.js"></script>
    <style type="text/css">
        .layui-form-label {
            width: 85px;
@@ -26,6 +29,7 @@
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="add-btn">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Check" id="check-btn">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">预览</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">打印</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
@@ -229,6 +233,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
@@ -237,6 +242,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine1"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1" id="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
@@ -288,6 +294,10 @@
            //查询条件
            var option = [];//保养
            var option1 = [];//配件
            var HModName = "Sb_EquipMaintainRuleListSub1";
            var HModName1 = "Sb_EquipMaintainRuleListSub2";
            var unEditable = ["HMaintainItem", "HManagerName"]
            var unEditable1 = ["HMaterName", "HUnitNumber", "HUnitName"]
            var sBillType = "3912";
            //#endregion
@@ -345,6 +355,11 @@
                    //复制一行
                    case 'btn-CopyLine': btnCopyLine(data);
                        break;
                    case 'set_HideColumn': get_HideColumnEditWithCallback(HModName, sessionStorage["HUserName"], option, table, function () {
                            setUneditableCol_WithUneditable(option, unEditable, [])
                            table.render(option)
                        });
                        break;
                }
            });
            //头工具栏事件
@@ -358,6 +373,10 @@
                        break;
                    //复制一行
                    case 'btn-CopyLine1': btnCopyLine1(data);
                        break;
                    case 'set_HideColumn1': get_HideColumnEditWithCallback(HModName1, sessionStorage["HUserName"], option1, table, function () {
                        table.render(option1)
                    });
                        break;
                }
            });
@@ -465,7 +484,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_MaintainLev.html', 'yes'],
                    content: ['../../基础资料/公用基础资料/Gy_MaintainLev.html?openType=2', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
@@ -499,6 +518,7 @@
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            //初始化表单
            function set_InitFrom() {
                $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true)
                laydate.render({
                    elem: '#HDate',
                });
@@ -618,7 +638,7 @@
            //编辑获取表头
            function set_EditForm(linterid) {
                $.ajax({
                    url: GetWEBURL() + "Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillListCheckDetai",
                    url: GetWEBURL() + "/Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillListCheckDetai",
                    type: "GET",
                    data: {
                        "HID": linterid
@@ -658,6 +678,25 @@
                                , "HUSEORGID": data.HUSEORGID
                            });
                            if (OperationType != 2) {
                                if (isEmpty(data.审核人) === false) {
                                    $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
                                } else {
                                    $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false);
                                }
                            } else {
                                $("#HMaker").val(sessionStorage["HUserName"])
                                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"))
                                $("#HChecker").val("")
                                $("#HCheckDate").val("")
                                $("#HUpDater").val("")
                                $("#HUpDateDate").val("")
                                $("#HCloseMan").val("")
                                $("#HCloseDate").val("")
                                $("#HDeleteMan").val("")
                                $("#HDeleteDate").val("")
                            }
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
@@ -671,14 +710,18 @@
                $("#HInterID").val(linterid);//修改时主表ID
                //编辑加载数据
                $.ajax({
                    url: GetWEBURL() + 'Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillSubAndSubItem',
                    url: GetWEBURL() + '/Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillSubAndSubItem',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.list[0];
                            DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
                            setUneditableCol_WithUneditable(option, unEditable, [])
                            table.render(option);
                            option1.data = result.list[1];
                            DisPlay_HideColumnEdit(HModName1, sessionStorage["HUserName"], option1, table);
                            setUneditableCol_WithUneditable(option1, unEditable1, [])
                            table.render(option1);
                        } else {
@@ -1018,7 +1061,31 @@
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    } else if (checkStatus.data.length > 1) {
                                        let tableBak = table.cache['mainTable']
                                        let tempArr = []
                                        for (let tableOne of tableBak) {
                                            if (isEmpty(tableOne.HItemID, true, true) === false) {
                                                tempArr.push(tableOne)
                                    }
                                        }
                                        for (let checkOne of checkStatus.data) {
                                            tempArr.push({
                                                HMaterID:     checkOne.HItemID,
                                                HMaterNumber: checkOne.物料代码,
                                                HMaterName:   checkOne.物料名称,
                                                HUnitID:      checkOne.HUnitID,
                                                HUnitNumber:  checkOne.计量单位代码,
                                                HUnitName:    checkOne.计量单位名称
                                            })
                                        }
                                        table.reload('mainTable1', {
                                            data: tempArr
                                        })
                                    } else {
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HMaterID: checkStatus.data[0].HItemID,
@@ -1028,6 +1095,8 @@
                                        HUnitNumber: checkStatus.data[0].计量单位代码,
                                        HUnitName: checkStatus.data[0].计量单位名称
                                    });
                                    }
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                                }
                                , btn2: function (index, layero) {
@@ -1121,6 +1190,18 @@
        function GetMaterValue(obj) {
            OptionData = obj;
        }
        //配件信息
        function GetGyMaterial(obj) {
            OptionData[0] = obj;
        }
        //保养级别
        function GetMaintainLevValue(obj) {
            $("#HMaintainLevName").val(obj[0].保养级别名称);
            $("#HMaintainLevID").val(obj[0].HItemID);
        }
    </script>
</body>
</html>
WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipMaintainRuleList.html
@@ -13,6 +13,7 @@
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/HideButton_New.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
    <script src="../../../layuiadmin/common.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
@@ -32,26 +33,14 @@
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">制单人</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HCreateBy" id="HCreateBy">
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
@@ -71,6 +60,12 @@
                                        <input type="date" class="layui-input ForFilteringSchemes" name="EndHCreateDate" id="EndHCreateDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <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>
@@ -80,6 +75,16 @@
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-colla-content">                                    
                                    <div class="layui-row" style="margin: 5px 0;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
@@ -204,6 +209,18 @@
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet1">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1" id="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet2">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="xuhao">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
@@ -247,6 +264,8 @@
            var option1 = [];
            var option2 = [];
            var HModName = "Sb_EquipMaintainRuleList";
            var HModName1 = "Sb_EquipMaintainRuleListSub1";
            var HModName2 = "Sb_EquipMaintainRuleListSub2";
            var ins; //用于导出excel
            var HBillType = "3912";
@@ -355,6 +374,31 @@
                };
            });
            //主表自定义事件
            table.on('tool(mainTable)', function (obj) {
                let data = obj.data
                switch (obj.event) {
                    case "onBillNumberClickHandler": onBillNumberClickHandler(data); break;
                }
            })
            //保养项信息工具栏事件
            table.on('toolbar(mainTable1)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    case "set_HideColumn1": get_HideColumnNoPage(HModName1, sessionStorage['HUserName'], option1, get_FastQuery); break;
                    default: break;
                }
            })
            //配件信息工具栏事件
            table.on('toolbar(mainTable2)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    case "set_HideColumn2": get_HideColumnNoPage(HModName2, sessionStorage['HUserName'], option2, get_FastQuery); break;
                    default: break;
                }
            })
            //点击主表带出从表数据
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
@@ -377,7 +421,7 @@
                var datas = obj.data; //获得当前行数据
                var linterid = datas.hmainid;
                $.ajax({
                    url: GetWEBURL() + 'Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillListProjectDetaiNew',
                    url: GetWEBURL() + '/Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillListProjectDetaiNew',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (data1) {
@@ -521,7 +565,7 @@
                var ajaxLoad = layer.load();
                option1 = {
                    elem: '#mainTable1'
                    //, toolbar: '#toolbarDemo'
                    , toolbar: '#toolbarDemo1'
                    , height: '350'
                    , page: true
                    , cellMinWidth: 90
@@ -550,7 +594,7 @@
                var ajaxLoad = layer.load();
                option2 = {
                    elem: '#mainTable2'
                    //, toolbar: '#toolbarDemo'
                    , toolbar: '#toolbarDemo2'
                    , height: '350'
                    , page: true
                    , cellMinWidth: 90
@@ -605,6 +649,13 @@
                                if ($.inArray(data[i].name, titleData) > -1 ) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '单据号') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'onBillNumberClickHandler', templet: function (d) {
                                            return '<span style="color: blue;">' + d.单据号 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
@@ -630,7 +681,7 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , height: "full-130"
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
@@ -644,14 +695,20 @@
                            //列设置
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
                            DisPlay_HideColumn(HModName1, sessionStorage["HUserName"], option1, []);
                            table.render(option1)
                            DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
                            table.render(option2)
                            ////刷新表格数据
                            ins = table.render(option);
                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                get_DefaultModule();//加载方案
                            }
                            //刷新按钮显示
                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                        } else {
@@ -790,6 +847,13 @@
                    , data = checkStatus.data;
                if (data.length == 1) {
                    if (num === 1 && isEmpty(data[0]['审核人']) === false) { // å·²å®¡æ ¸çš„单据不能再审核
                        layer.alert('审核失败: å•据已审核', { icon: 5 })
                        return;
                    } else if (num === 2 && isEmpty(data[0]['审核人']) === true) { // æœªå®¡æ ¸çš„单据不能反审核
                        layer.alert('反审核失败: å•据审核', { icon: 5 })
                        return;
                    }
                    layer.confirm("确认要审核吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
@@ -1372,6 +1436,31 @@
            //#endregion
            //#region自定义事件捕获
            function onBillNumberClickHandler(data) {
                var linterid = data.hmainid;
                //if (AllowLoadData(sSubStr) != false) {//非空验证
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '编辑' + HPageTitle
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: '../设备规程单/Sb_EquipMaintainRuleEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    , resize: false,
                    end: function () {
                        //刷新页面,
                        //location.reload();
                        get_FastQuery()
                    }
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            }
            //#endregion
            //#endregion
        });