网页版：模块测试以及功能完善（新增修改删除审核反审核功能测试，必录项目测试并页面标记，原单下推和选择原单功能测试） 设备档案、设备分类 设备保养规程、...

yangle

2024-05-07 dea35c2c9c4ca4980a5137075d400273ec943742

网页版：模块测试以及功能完善（新增修改删除审核反审核功能测试，必录项目测试并页面标记，原单下推和选择原单功能测试） 设备档案、设备分类 设备保养规程、设备点检规程 设备保养计划-》设备保养记录（流程测试并完善流程，关联数量，反写关闭等功能测试） 设备点检计划-》设备点检记录（流程测试并完善流程，关联数量，反写关闭等功能测试） 设备故障登记-》设备维修记录单-》设备维修验收单（流程测试并完善流程，关联数量，反写关闭等功能测试）

 WebTM/Files/XMJDHB00000319/˧ÍþÑéÊÕ.jpg

 WebTM/Properties/PublishProfiles/JFTM.pubxml

@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>G:\issWeb\网站发布\LAYUI</PublishUrl>
    <PublishUrl>D:\网站发布\智云MESWMS\LAYUI</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>

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

@@ -125,6 +125,7 @@
                        break;
                    //反关闭
                    case 'set_CancelCloseBill': set_CloseBill(2);
                        break;
                    //禁用按钮
                    case 'btn-Stop':
                        set_De_Stop(0);
@@ -132,7 +133,6 @@
                    //反禁用按钮
                    case 'btn-DeStop':
                        set_De_Stop(1);
                        break;
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
@@ -205,7 +205,15 @@
                        , { field: 'HEndFlag', title: '明细标记', width: 200, sort: true}
                        , { field: 'HStopFlag', title: '禁用标记', width: 200, sort: true}
                        , { field: 'HRemark', title: '备注', width: 200, sort: true}
                        , { field: 'HUseFlag', title: '使用标记', width: 200, sort: true}
                        , { field: 'HUseFlag', title: '使用标记', width: 200, sort: true }
                        , { field: 'HMakeEmp', title: '制单人', sort: true }
                        , { field: 'HMakeTime', title: '制单日期', templet: "<div>{{d.HMakeTime ==null ?'':layui.util.toDateString(d.HMakeTime, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: 'HCheckEmp', title: '审核人', sort: true }
                        , { field: '审核日期', title: '审核日期', templet: "<div>{{d.HCheckTime ==null ?'':layui.util.toDateString(d.HCheckTime, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: 'HModifyEmp', title: '修改人', sort: true }
                        , { field: 'HModifyTime', title: '修改日期', templet: "<div>{{d.HModifyTime ==null ?'':layui.util.toDateString(d.HModifyTime, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: 'HCloseEmp', title: '关闭人', sort: true }
                        , { field: 'HCloseTime', title: '关闭日期', templet: "<div>{{d.HCloseTime ==null ?'':layui.util.toDateString(d.HCloseTime, 'yyyy-MM-dd')}}</div>", sort: true }
                    ]]
                };
            }
@@ -389,6 +397,7 @@
                            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 {

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

@@ -113,7 +113,7 @@
                                                <label class="layui-form-label">维修项目<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="RepairItemList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -519,7 +519,7 @@
                            return layer.msg('请选择数据');
                        }
                        $("#HRepairName").val(checkStatus.data[0].维修项目);
                        $("#HRepairID").val(checkStatus.data[0].HItemID);
                        $("#HRepairID").val(checkStatus.data[0].hitemid);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {

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

@@ -119,7 +119,7 @@
                                                <label class="layui-form-label">维修记录<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HMouldRepairWorkName" id="HMouldRepairWorkName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldRepairWorkID" id="HMouldRepairWorkID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldRepairWorkID" id="HMouldRepairWorkID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldRepairWork" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -752,7 +752,7 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HRepairCheckID: checkStatus.data[0].HItemID,
                                        HRepairCheckID: checkStatus.data[0].hitemid,
                                        HRepairCheckCode: checkStatus.data[0].维修验收项目代码,
                                        HRepairCheckName: checkStatus.data[0].维修验收项目,
                                    });
@@ -767,7 +767,7 @@
                                    if (OptionData.length > 0) {
                                        //更新表格缓存的数据
                                        obj.update({
                                            HRepairCheckID: OptionData[0].HItemID,
                                            HRepairCheckID: OptionData[0].hitemid,
                                            HRepairCheckCode: OptionData[0].维修验收项目代码,
                                            HRepairCheckName: OptionData[0].维修验收项目,
                                        });
@@ -863,8 +863,12 @@
                    layer.msg("日期不能为空", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if ($("#HMouldRepairWorkID").val() == '0') {
                    layer.msg("维修记录不能为空", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                //判断物料明细项
                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                if (typeof (sSubStr) != "undefined" || sSubStr != "" || sSubStr != "[]") {
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HRepairCheckID == "" || sSubStr[i].HDotCheckItemID == "") {

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

@@ -417,7 +417,7 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -470,7 +470,7 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , height: 780
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
@@ -588,7 +588,7 @@
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    //get_FastQuery();
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
@@ -621,6 +621,7 @@
                            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 {

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

@@ -289,7 +289,7 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -416,7 +416,7 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , height: 780
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
@@ -616,7 +616,7 @@
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    //get_FastQuery();
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
@@ -649,6 +649,7 @@
                            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 {

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

@@ -236,7 +236,7 @@
                //初始化表格(主表)
                set_InitGrid();
                //查询
                get_Display(sWhere);
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -493,7 +493,7 @@
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    //get_FastQuery();
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
@@ -526,6 +526,7 @@
                            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 {

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

@@ -408,7 +408,7 @@
                            return layer.msg('请选择一条数据');
                        }
                        $("#HPlanName").val(checkStatus.data[0].单据号);
                        $("#HPlanNo").val(checkStatus.data[0].hmainid);
                        $("#HPlanNo").val(checkStatus.data[0].单据号);
                        $("#HEquipDotCheckPlanInterID").val(checkStatus.data[0].hmainid);                        
                        //$("#HEquipName").val(checkStatus.data[0].设备名称);
                        //$("#HEquipID").val(checkStatus.data[0].设备ID);

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

@@ -55,11 +55,6 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <div class="layui-inline">
                                        <span>其他条件></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始时间</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" name="BenginHCreateDate" id="BenginHCreateDate">
@@ -274,7 +269,7 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -635,6 +630,7 @@
                            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 {

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

@@ -53,14 +53,14 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">点检周期</label>
                                                <label class="layui-form-label" style="width: 85px;">点检周期<label style="color:red"> * </label></label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <input type="text" class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle">
                                                </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;" ">
                                                <div class="layui-input-block" style="margin-left: 120px;width: 185px;">
                                                    <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
                                                        <option value="天">天</option>
                                                        <option value="月">月</option>
@@ -76,7 +76,7 @@
                                        </div>
                                        <div class="layui-row" style="margin-top:10px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">设备</label>
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">设备<label style="color:red"> * </label></label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
@@ -790,6 +790,10 @@
                    layer.msg("请选择设备", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HCheckCycle").val() == '' || $("#HCheckCycle").val() == '0') {
                    layer.msg("请输入保养周期", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {

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

@@ -250,7 +250,7 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -307,8 +307,8 @@
                        , { field: '设备代码', title: '设备代码', width: 200, sort: true }
                        , { field: '设备名称', title: '设备名称', width: 200, sort: true }
                        , { field: '表头备注', title: '表头备注', width: 200, hide: true, sort: true }
                        , { field: '开始日期', title: '开始日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '结束日期', title: '结束日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '开始日期', title: '开始日期', width: 200, templet: "<div>{{d.开始日期 ==null ?'':layui.util.toDateString(d.开始日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '结束日期', title: '结束日期', width: 200, templet: "<div>{{d.结束日期 ==null ?'':layui.util.toDateString(d.结束日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '周期单位', title: '周期单位', width: 200, sort: true }
                        , { field: '点检周期', title: '点检周期', width: 200, sort: true }
                        , { field: '摘要', title: '摘要', width: 200, sort: true }
@@ -325,15 +325,15 @@
                        , { field: '关闭类型', title: '关闭类型', width: 200, sort: true }
                        , { field: '表体备注', title: '表体备注', width: 200, hide: true, sort: true }
                        , { field: '制单人', title: '制单人', width: 115, hide: true, sort: true }
                        , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '审核人', title: '审核人', width: 200, sort: true }
                        , { field: '审核日期', title: '审核日期', width: 200, hide: true, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '审核日期', title: '审核日期', width: 200, hide: true, templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '修改人', title: '修改人', width: 200, hide: true, sort: true }
                        , { field: '修改日期', title: '修改日期', width: 115, hide: true, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '修改日期', title: '修改日期', width: 115, hide: true, templet: "<div>{{d.修改日期 ==null ?'':layui.util.toDateString(d.修改日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '关闭人', title: '关闭人', width: 200, sort: true }
                        , { field: '关闭日期', title: '关闭日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '关闭日期', title: '关闭日期', width: 200, templet: "<div>{{d.关闭日期 ==null ?'':layui.util.toDateString(d.关闭日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '作废人', title: '作废人', width: 200, hide: true, sort: true }
                        , { field: '作废日期', title: '作废日期', width: 115, hide: true, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '作废日期', title: '作废日期', width: 115, hide: true, templet: "<div>{{d.作废日期 ==null ?'':layui.util.toDateString(d.作废日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '源单主内码', title: '源单主内码', width: 200, hide: true, sort: true }
                        , { field: '源单子内码', title: '源单子内码', width: 200, hide: true, sort: true }
                        , { field: '源单单号', title: '源单单号', width: 200, sort: true }
@@ -511,6 +511,7 @@
                            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 {

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

@@ -64,7 +64,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">设备</label>
                                                <label class="layui-form-label">设备<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly>

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

@@ -286,29 +286,6 @@
                };
            });

            //点击主表带出从表数据
            table.on('row(mainTable)', function (obj) { //注：tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                var datas = obj.data; //获得当前行数据
                var linterid = datas.hmainid;
                $.ajax({
                    url: GetWEBURL() + 'Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option1.data = data1.list[0];
                            table1.render(option1);
                            option2.data = data1.list[1];
                            table2.render(option2);
                        } else {
                            layer.alert("获取失败", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            });

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
@@ -331,7 +308,7 @@
                //初始化表格(子表2)
                set_InitGrid2();
                //查询
                get_Display(sWhere);
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -374,15 +351,15 @@
                        , { field: '关闭类型', title: '关闭类型', width: 200 }
                        , { field: '表体备注', title: '表体备注', width: 200, hide: true }
                        , { field: '制单人', title: '制单人', width: 115, hide: true }
                        , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核人', title: '审核人', width: 200 }
                        , { field: '审核日期', title: '审核日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '审核日期', title: '审核日期', width: 200, templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '修改人', title: '修改人', width: 200, hide: true }
                        , { field: '修改日期', title: '修改日期', width: 115, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '修改日期', title: '修改日期', width: 115, templet: "<div>{{d.修改日期 ==null ?'':layui.util.toDateString(d.修改日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '关闭人', title: '关闭人', width: 200 }
                        , { field: '关闭日期', title: '关闭日期', width: 200 }
                        , { field: '作废人', title: '作废人', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '作废日期', title: '作废日期', width: 115, hide: true }
                        , { field: '关闭日期', title: '关闭日期', width: 200, templet: "<div>{{d.关闭日期 ==null ?'':layui.util.toDateString(d.关闭日期, 'yyyy-MM-dd')}}</div>"}
                        , { field: '作废人', title: '作废人', width: 200 }
                        , { field: '作废日期', title: '作废日期', width: 115, templet: "<div>{{d.作废日期 ==null ?'':layui.util.toDateString(d.作废日期, 'yyyy-MM-dd')}}</div>", hide: true }
                        , { field: '源单主内码', title: '源单主内码', width: 200, hide: true }
                        , { field: '源单子内码', title: '源单子内码', width: 200, hide: true }
                        , { field: '源单单号', title: '源单单号', width: 200 }
@@ -408,6 +385,26 @@
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });

                var datas = obj.data; //获得当前行数据
                var linterid = datas.hmainid;
                $.ajax({
                    url: GetWEBURL() + 'Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option1.data = data1.list[0];
                            table1.render(option1);
                            option2.data = data1.list[1];
                            table2.render(option2);
                        } else {
                            layer.alert("获取失败", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            })
@@ -697,6 +694,7 @@
                            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 {

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

@@ -58,7 +58,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">保养周期</label>
                                                <label class="layui-form-label" style="width: 85px;">保养周期<label style="color:red"> * </label></label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <input type="text" class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle">
                                                </div>
@@ -81,7 +81,7 @@
                                        </div>
                                        <div class="layui-row" style="margin-top:10px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">设备</label>
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">设备<label style="color:red"> * </label></label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">

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

@@ -248,8 +248,24 @@
                };
            });

            //点击主表带出从表数据
            table.on('row(mainTable)', function (obj) { //注：tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });

                var datas = obj.data; //获得当前行数据
                var linterid = datas.hmainid;
                $.ajax({
@@ -267,25 +283,6 @@
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            });

            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
@@ -314,7 +311,7 @@
                //初始化表格(子表2)
                set_InitGrid2();
                //查询
                get_Display(sWhere);
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -341,21 +338,21 @@
                        , { field: 'HEquipID', title: '设备ID', width: 160, hide: true, sort: true }
                        , { field: '设备代码', title: '设备代码', width: 200, sort: true }
                        , { field: '设备名称', title: '设备名称', width: 200, sort: true }
                        , { field: '开始日期', title: '开始日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '结束日期', title: '结束日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '开始日期', title: '开始日期', width: 200, templet: "<div>{{d.开始日期 ==null ?'':layui.util.toDateString(d.开始日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '结束日期', title: '结束日期', width: 200, templet: "<div>{{d.结束日期 ==null ?'':layui.util.toDateString(d.结束日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '周期单位', title: '周期单位', width: 200, sort: true }
                        , { field: '保养周期', title: '保养周期', width: 200, sort: true }
                        , { field: '摘要', title: '摘要', width: 200, sort: true }
                        , { field: '内部单据号', title: '内部单据号', width: 200, sort: true }
                        , { field: '备注', title: '备注', width: 200, sort: true }
                        , { field: '制单人', title: '制单人', width: 115, sort: true }
                        , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '审核人', title: '审核人', width: 200, sort: true }
                        , { field: '审核日期', title: '审核日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '审核日期', title: '审核日期', width: 200, templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '修改人', title: '修改人', width: 200, sort: true }
                        , { field: '修改日期', title: '修改日期', width: 115, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '修改日期', title: '修改日期', width: 115, templet: "<div>{{d.修改日期 ==null ?'':layui.util.toDateString(d.修改日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '关闭人', title: '关闭人', width: 200, sort: true }
                        , { field: '关闭日期', title: '关闭日期', width: 200, sort: true }
                        , { field: '关闭日期', title: '关闭日期', width: 200, templet: "<div>{{d.关闭日期 ==null ?'':layui.util.toDateString(d.关闭日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '作废人', title: '作废人', width: 200, hide: true, sort: true }
                        , { field: '作废日期', title: '作废日期', width: 115, hide: true, sort: true }
                        , { field: '源单主内码', title: '源单主内码', width: 200, hide: true, sort: true }
@@ -600,6 +597,7 @@
                            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 {

 WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainEdit.html

@@ -135,7 +135,9 @@
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">对应ERP物料<label style="color:red"> * </label></label>
                                                <label class="layui-form-label">对应ERP物料
                                                <!--<label style="color:red"> * </label>-->
                                                </label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
                                                    <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="float:left;width:150px;">

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

@@ -76,9 +76,9 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">点检周期</label>
                                                <label class="layui-form-label">点检周期 <label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle">
                                                    <input class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle" value="">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
@@ -538,6 +538,13 @@

            //保存
            function set_btnSave(data) {

                var HCheckCycle = $("#HCheckCycle").val();

                if (HCheckCycle == "") {
                    return layer.msg("点检周期不能为空!");
                }

                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);

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

@@ -260,10 +260,10 @@
                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化表格
                set_InitGrid();
                //set_InitGrid();

                //查询
                get_Display(sWhere);
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -362,7 +362,7 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , height: 780
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
@@ -579,6 +579,7 @@
                            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 {

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

@@ -71,7 +71,10 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">保养周期</label>
                                                <label class="layui-form-label">
                                                    ä¿å…»å‘¨æœŸ
                                                    <label style="color:red"> * </label>
                                                </label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
                                                </div>

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

@@ -267,7 +267,24 @@
            });

            //点击主表带出从表数据
            table.on('row(mainTable)', function (obj) { //注：tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });

                var datas = obj.data; //获得当前行数据
                var linterid = datas.hmainid;
                $.ajax({
@@ -285,25 +302,6 @@
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            });

            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
@@ -338,7 +336,7 @@
                //初始化表格(子表2)
                set_InitGrid2();
                //查询
                get_Display(sWhere);
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -670,6 +668,7 @@
                            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 {