设备Bug修复

zzr99

2021-11-25 ccaea4025c1459f2eeeb43dd6618f8492be33f5a

设备Bug修复

 WebTM/views/É豸¹ÜÀí/Sb_Add_EqpRepairCheckBillList.html

@@ -405,7 +405,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                if (AllowLoadData()) {
                if (AllowLoadData(sSubStr)) {
                    $.ajax(
                        {
                            type: "POST",

 WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBillEdit.html

@@ -357,6 +357,7 @@
                    }
                };
            }

            //增加一行事件
            function btnAddLine(NewRow) {
                var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
@@ -369,7 +370,6 @@
                    data: buttonArr    //将数据重新载入表格
                })
            }

            //表格复制一行事件
            function btnCopyLine(data) {
                var copydata = JSON.stringify(data);
@@ -489,6 +489,7 @@
                    }
                })
            }

            //获取最大单据号及默认值赋值
            function get_MAXNum() {
                //获取最大单据号 new
@@ -515,6 +516,7 @@
                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                table.render(option);
            }

            //编辑获取表头、获取表体
            function set_EditFromGrid(linterid) {
                set_EditForm(linterid);  //编辑获取表头

 WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipDotCheckRuleEdit.html

@@ -19,7 +19,12 @@
        }
        /*end*/
        .layui-form-label {
            width: 95px;
            width: 199px;
        }

        .layui-input-block {
            margin-left: 229px;
            min-height: 36px;
        }
    </style>
</head>
@@ -188,7 +193,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HDotCheckItemID": "0","HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
                var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -228,13 +233,49 @@
            function set_GridCellCheck(obj) {
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event === 'HManagerNumber')  //责任人信息

                        if (obj.event === 'HDotCheckItem')  //点检项目代码
                        {
                            //页面层-自定义
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
                                title: '责任人列表',
                                title: '物料列表',
                                closeBtn: 1,
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../PublicPage/CheckItemInformation.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    //按钮【按钮一】的回调
                                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HDotCheckItemID: checkStatus.data[0].HItemID,
                                        HDotCheckItem: checkStatus.data[0].HName
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
                                , btn2: function (index, layero) {
                                    //按钮【按钮二】的回调
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {
                                }
                            });
                        }
                        if (obj.event === 'HManagerNumber')  //负责人代码
                        {
                            //页面层-自定义
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
                                title: '物料列表',
                                closeBtn: 1,
                                shift: 2,
                                area: ['90%', '90%'],
@@ -248,12 +289,11 @@
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HManagerID: checkStatus.data[0].HItemID,
                                        HManagerNumber: checkStatus.data[0].HNumber,
                                        HManagerName: checkStatus.data[0].HName,
                                        HManagerName: checkStatus.data[0].HName
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
@@ -286,14 +326,14 @@
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: '点检项目ID', title: '点检项目ID', edit: 'text' }
                    , { field: '点检项目', title: '点检项目', edit: 'text' }
                    , { field: '点检部位', title: '点检部位', edit: 'text' }
                    , { field: '具体要求', title: '具体要求', edit: 'text' }
                    , { field: '负责人ID', title: '负责人ID', edit: 'text', hide: true }
                    , { field: '负责人代码', title: '负责人代码', edit: 'text', event: 'HManagerNumber' }
                    , { field: '负责人', title: '负责人', edit: 'text' }
                    , { field: '子备注', title: '备注', edit: 'text' }
                    , { field: 'HDotCheckItemID', title: '点检项目ID', edit: 'text', hide: true }
                    , { field: 'HDotCheckItem', title: '点检项目', edit: 'text', event: 'HDotCheckItem' }
                    , { field: 'HDotCheckPart', title: '点检部位', edit: 'text' }
                    , { field: 'HClaim', title: '具体要求', edit: 'text' }
                    , { field: 'HManagerID', title: '负责人ID', edit: 'text', hide: true }
                    , { field: 'HManagerNumber', title: '负责人代码', edit: 'text', event: 'HManagerNumber' }
                    , { field: 'HManagerName', title: '负责人', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
                ];
                option = {
@@ -314,6 +354,8 @@
            function set_AddFNew() {
                //获取最大单据号
                get_MAXNum();
                option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
                table.render(option);
            }
            //获取最大单据号
            function get_MAXNum() {
@@ -340,7 +382,6 @@
                option.data = [{ "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
                table.render(option);

                
            }
            //编辑获取表头
            function set_EditForm(linterid) {
@@ -349,19 +390,27 @@
                    url: GetWEBURL() + "/Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListCheckDetai",
                    type: "GET",
                    data: {
                        "HInterID": linterid
                        "HID": linterid
                    },
                    success: function (d) {
                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
                        $("#HInterID").val(d.data[0].hmainid);
                        $("#HBillNo").val(d.data[0].单据号);
                        $("#HDate").val(formatDate(d.data[0].日期));
                        $("#HOutComNo").val(formatDate(d.data[0].计划开始日期));
                        $("#HBarCode").val(formatDate(d.data[0].计划结束日期));
                        $("#HCheckCycle").val(d.data[0].点检周期);
                        $("#HCycleUnit").val(d.data[0].周期单位);
                        $("#HExplanation").val(d.data[0].摘要);
                        $("#HRemark").val(d.data[0].备注);
                        if (d.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            //console.log(result)
                            var data = d.data.h_v_Sb_EquipDotCheckRuleList[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HInterID": data.hmainid
                                , "HDate": formatDate(data.日期)
                                ,"HBeginDate":formatDate(data.计划开始日期)
                                ,"HEndDate":formatDate(data.计划结束日期)
                                ,"HCheckCycle":data.点检周期
                                ,"HCycleUnit":data.周期单位
                                ,"HExplanation":data.摘要
                                ,"HRemark":data.备注
                            });

                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }
                });
            }
@@ -403,79 +452,38 @@

            //保存
            function set_btnSave(data) {

                $("#HMaker").val(sessionStorage["HUserName"]);
                var user = sessionStorage["HUserName"];
                var ModRightNameAdd = 'Gy_MouldFile_Edit';

                if (!AllowLoadData())//数据验证
                {
                    return false;
                }
                if (Stverf == "Add") {
                    data.field.HMaker = sessionStorage["HUserName"];//制单人
                    var sMainStr = JSON.stringify(data.field);
                    var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user;
                    //新增
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Gy_EquipFileMain/AddBill",
                        async: true,
                        data: { "oMain": oMain },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    if (linterid == undefined) {
                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                                    }
                                    else {
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                if (AllowLoadData(sSubStr)) {
                    $.ajax(
                        {
                            type: "POST",
                            url: GetWEBURL() + "/Sb_EquipDotCheckRuleBill/SaveEquipDotCheckRuleBill", //方法所在页面和方法名
                            async: true,
                            data: { "msg": sMainSub },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                        parent.layer.close(index); //再执行关闭
                                    }
                                });
                            }
                            else {
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                }
                else {
                    //修改
                    data.field.HUpDater = sessionStorage["HUserName"];//修改人
                    var sMainStr = JSON.stringify(data.field);
                    var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user;
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Gy_EquipFileMain/EditBill",
                        async: true,
                        data: { "oMain": oMain },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    if (linterid == undefined) {
                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                                    }
                                    else {
                                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                        parent.layer.close(index); //再执行关闭
                                    }
                                    });
                                }
                                else {
                                    f_alert(data.Message);
                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {

                                });
                                f_alert("错误:" + err);
                                console.log("Reason" + sMainStr);
                            }
                            else {
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                        });
                }
            }

@@ -489,10 +497,13 @@
                }
            })
        });
        function f_alert(sMsg) {
            layer.alert(sMsg, { icon: 5 });

        }
        function AllowLoadData() {  //非空验证
            var Result = true;
            

            return Result;
        }
    </script>

 WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipDotCheckRuleList.html

@@ -199,7 +199,7 @@

            //查询
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                var index = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
@@ -211,8 +211,10 @@
                            table.render(option);
                            layer.close(index);
                        } else {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            layer.alert("暂无记录", { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
@@ -280,7 +282,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../设备档案/Sb_EquipDotCheckRuleEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , content: '../设备规程单/Sb_EquipDotCheckRuleEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,

 WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipMaintainRuleList.html

@@ -343,6 +343,8 @@
                            table.render(option);
                            layer.close(index);
                        } else {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                            layer.alert("没有数据记录!", { icon: 5 });
                        }