设备点检记录和保养记录选设备带出默认点检规程和默认保养规程数据
7个文件已修改
275 ■■■■■ 已修改文件
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html 83 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipMaintainBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFile.html
@@ -468,6 +468,24 @@
                set_btnSave(data);
            })
            //自动计算剩余寿命
            $("#HUseLife").blur(function () {
                var beginlife = $("#HDesignLife").val();
                var userlife = $("#HUseLife").val();
                var result = beginlife - userlife;
                if (result > 0) {
                    $("#HLeaveLife").val(result)
                }
            });
            $("#HDesignLife").blur(function () {
                var beginlife = $("#HDesignLife").val();
                var userlife = $("#HUseLife").val();
                var result = beginlife - userlife;
                if (result > 0) {
                    $("#HLeaveLife").val(result)
                }
            });
            //对应Erp物料
            form.on('submit(btnHMaterList)', function () {
                //页面层-自定义
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckBillList.html
@@ -201,7 +201,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "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);
@@ -222,6 +222,39 @@
            //表头点检计划内码信息
            form.on('submit(HPlanInterList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '点检计划列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../模治具管理/Sc_MouldDotCheckPlanBillList.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('请选择数据');
                        }
                        console.log(checkStatus);
                        $("#HPlanInterName").val(checkStatus.data[0].单据号);
                        $("#HPlanInterID").val(checkStatus.data[0].hmainid);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
@@ -306,10 +339,46 @@
                                }
                            });
                        }
                        if (obj.event === 'HDotCheckItem')  //点检项目代码
                        {
                            //页面层-自定义
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
                                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 () {
                                }
                            });
                        }
                        obj.event = "";
                        return false;
                    }
                })
            }
@@ -321,7 +390,6 @@
            });
            //保存
            form.on('submit(Saver)', function (data) {
                data.field.HPlanInterID = 0;
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
@@ -401,7 +469,8 @@
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: 'HDotCheckItem', 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 }
@@ -437,7 +506,7 @@
            function set_EditFromGrid() {
                set_EditForm(linterid);  //编辑获取表头
                set_EditGrid(linterid);  //编辑获取表体
                option.data = [{ "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
                option.data = [{ "HDotCheckItemID":0,"HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
                table.render(option);
            }
@@ -485,7 +554,8 @@
                                , "HExplanation": data.摘要
                                , "HRemark": data.备注
                                , "HPlanNo": data.点检计划编号
                                , "HPlanInterID": data.点检计划内码
                                , "HPlanInterID": data.HPlanInterID
                                , "HPlanInterName": data.点检计划内码
                                , "HMouldID": data.HMouldID
                            });
@@ -600,12 +670,12 @@
                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HDotCheckItem == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,点检项目为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        if (sSubStr[i].HDotCheckItemID == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,请选择点检项目!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr[i].HManagerNumber == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,负责人代码为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            layer.msg("明细记录第" + (i + 1) + "行,请选择负责人代码!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                    }
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainBillList.html
@@ -321,7 +321,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/MouldInformation.html', 'yes'],
                    content: ['../模治具管理/Sc_MouldMaintainRuleBillList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
@@ -360,8 +360,12 @@
                                var PJData = result.list[1];//配件
                                var rowdate1 = layui.table.cache["mainTable"];
                                var rowdate2 = layui.table.cache["mainTable1"];
                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                                option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HManagerID": "0", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                                table.render(option);
                                table.render(option2);
                                if (rowdate1.length == 0)  //表体数据为空时
                                if (BYData.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < BYData.length; i++) {
@@ -376,44 +380,10 @@
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                if (rowdate1.length > 0 && rowdate1.length <= BYData.length) //表体数据不为空,且表体数据行数小于等于选中带回数据行数
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < rowdate1.length; i++) {
                                        var checkrow = {
                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    //buttonArr.push(NewRow);  //在尾部加一行
                                    table.reload("mainTable", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                if (rowdate1.length > 0 && rowdate1.length > BYData.length) //表体数据不为空,且表体数据行数大于选中带回数据行数
                                {
                                    console.log(checkStatus.data.length);
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < rowdate.length; i++) {
                                        var checkrow = {
                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    //buttonArr.push(NewRow);  //在尾部加一行
                                    table.reload("mainTable", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                if (rowdate2.length == 0)  //表体数据为空时
                                if (PJData.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < PJData.length; i++) {
@@ -430,42 +400,7 @@
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                if (rowdate2.length > 0 && rowdate2.length <= PJData.length) //表体数据不为空,且表体数据行数小于等于选中带回数据行数
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < rowdate2.length; i++) {
                                        var checkrow = {
                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
                                            "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
                                            "HManagerID": rowdate2[i].HManagerID, "HManagerNumber": rowdate2[i].HManagerNumber, "HManagerName": rowdate2[i].HManagerName,
                                            "HRemark": rowdate2[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    //buttonArr.push(NewRow);  //在尾部加一行
                                    table.reload("mainTable1", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                if (rowdate2.length > 0 && rowdate2.length > PJData.length) //表体数据不为空,且表体数据行数大于选中带回数据行数
                                {
                                    console.log(checkStatus.data.length);
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < rowdate.length; i++) {
                                        var checkrow = {
                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
                                            "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
                                            "HManagerID": rowdate2[i].HManagerID, "HManagerNumber": rowdate2[i].HManagerNumber, "HManagerName": rowdate2[i].HManagerName,
                                            "HRemark": rowdate2[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    table.reload("mainTable1", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBillEdit.html
@@ -233,7 +233,7 @@
                        }
                        $("#HEquipName").val(checkStatus.data[0].HName);
                        $("#HEquipID").val(checkStatus.data[0].HInterID);
                        get_MaintainItem();
                        get_DocCheckItem();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -246,15 +246,37 @@
                    }
                });
            });
            function get_MaintainItem() {
            function get_DocCheckItem() {
                $.ajax({
                    url: GetWEBURL() + "/Web/GetDotCheckRuleItemByEquipProjectID",
                    type: "GET",
                    data: { "EquipProjectID": $("#HEquipID").val() },
                    success: function (result) {
                        if (result != null) {
                            option.data = result.data;
                            table.render(option);
                            if (result.count == 1) {
                                var BYData = result;//
                                var rowdate1 = layui.table.cache["mainTable"];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                                table.render(option);
                                if (BYData.data.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < BYData.data.length; i++) {
                                        var checkrow = {
                                            "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
                                            "HManagerName": BYData.data[i].HManagerName,  "HRemark": rowdate1[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    table.reload("mainTable", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }
                    }
                })
WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBillEdit.html
@@ -300,8 +300,55 @@
                    data: { "EquipProjectID": $("#HEquipID").val() },
                    success: function (result) {
                        if (result != null) {
                            option.data = result.data;
                            table.render(option);
                            if (result.count == 1) {
                                var BYData = result.list[0];//保养
                                var PJData = result.list[1];//配件
                                var rowdate1 = layui.table.cache["mainTable"];
                                var rowdate2 = layui.table.cache["mainTable1"];
                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
                                table.render(option);
                                table.render(option1);
                                if (BYData.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < BYData.length; i++) {
                                        var checkrow = {
                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    table.reload("mainTable", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                if (PJData.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < PJData.length; i++) {
                                        var checkrow = {
                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
                                            "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty,
                                            "HManagerID": rowdate2[i].HManagerID, "HManagerNumber": rowdate2[i].HManagerNumber, "HManagerName": rowdate2[i].HManagerName,
                                            "HRemark": rowdate2[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    table.reload("mainTable1", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }
                    }
                })
WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBillList.html
@@ -257,7 +257,7 @@
                        , { field: '内部单据号', title: '内部单据号', width: 200 }
                        , { field: '配件代码', title: '配件代码', width: 115, hide: true }
                        , { field: '配件名称', title: '配件名称', width: 200 }
                        , { field: '单位', title: '单位', width: 200 }
                        , { field: '单位名称', title: '单位名称', width: 200 }
                        , { field: '实际用量', title: '实际用量', width: 200 }
                        , { field: '标准用量', title: '标准用量', width: 200 }
                        , { field: '负责人', title: '负责人', width: 200 }
WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainEdit.html
@@ -862,7 +862,10 @@
                        $("#HSetupDate").val(d.data[0].安装日期);
                        $("#HStartupDate").val(d.data[0].运行开始日期);
                        $("#HStatus").val(d.data[0].当前状态);
                        $("#HEquipDotCheckRuleInterID").val(d.data[0].HEquipDotCheckRuleInterID);
                        $("#HEquipDotCheckRuleInterName").val(d.data[0].默认点检规程);
                        $("#HEquipMaintainRuleInterID").val(d.data[0].HEquipMaintainRuleInterID);
                        $("#HEquipMaintainRuleInterName").val(d.data[0].默认保养规程);
                        $("#HProNum").val(d.data[0].工程编码);
                        $("#HWorkArea").val(d.data[0].产地);
                        $("#HLogo").val(d.data[0].品牌);