1

yusijie

2022-09-21 c76a355336e4bef6aed0f5afea5c38669dbf682e

1

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -166,10 +166,16 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnitList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnit_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameter_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProcList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProcList_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenterDyCol.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkStationList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterList.html" />
    <Content Include="views\基础资料\公用基础资料\Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OrderLev.html" />

 WebTM/WebTM.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -1,7 +1,7 @@

function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
   /* var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置

 WebTM/views/¹¤×ʹÜÀí/°à×éÖ°Ô±Çåµ¥/Gy_GroupEmpBillList.html

@@ -88,6 +88,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Gy_GroupEmpBillList";
            var col = [];
            var titleData = ["hmainid","单据ID", "HGroupID", "HEmpID","hsubid"];//不需要显示的字段 å¯æ‰©å±•
            //初始化界面
            set_ClearBill();
            //初始化表格
@@ -166,9 +168,48 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -351,7 +392,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["单据ID", "HGroupID","HEmpID"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["单据ID", "HGroupID","HEmpID"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');


 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldLifeChangeBillList.html

@@ -184,7 +184,8 @@
                ]]
            };
            var HModName = "Sc_MouldLifeChangeBillList";

            var col = [];
            var titleData = ["单据ID", "HEmID", "HEmID", "HDeptID", "hsubid", "HMaterID", "HPropertyID", "HSecUnitID", "Hunitid", "源单主内码", "源单类型","hmainid","HEmpID","HMangerID","HUnitID","HBillType"];//不需要显示的字段 å¯æ‰©å±•
            var index = layer.load(0);

            //初始化表格
@@ -287,22 +288,75 @@
            });

            //进入页面显示的缓存列表
            var ajaxLoad = layer.load();
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/Sc_MouldLifeChangeBill/GetMouldLifeChangeBill',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                //success: function (data1) {
                //    if (data1.count == 1) {
                //        option.data = data1.data;
                //        table.render(option);
                //        layer.close(index);
                //    } else {
                //        layer.close(index);
                //        layer.alert(data1.code + data1.Message, { icon: 5 });
                //    }
                //}, error: function () {
                //    layer.close(index);
                //    layer.alert("接口请求失败!", { icon: 5 });
                //}
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        var data = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        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 {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                }
                            }
                        }

                        //在列表左边添加勾选框
                        col.unshift({ type: 'checkbox', fixed: 'left' })
                        //动态显示列名
                        option = {
                            elem: '#mainTable'
                            , toolbar: '#toolbarDemo'
                            , cols: [col]
                            , data: data1.data
                            , height: 550
                            , page: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                        }
                        table.render(option);
                        layer.close(index);

                        //刷新表格数据
                        DisPlay_HideColumn();

                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
@@ -403,7 +457,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["单据ID", "HEmID", "HEmID", "HDeptID", "hsubid", "HMaterID", "HPropertyID", "HSecUnitID", "Hunitid", "源单主内码","源单类型"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["单据ID", "HEmID", "HEmID", "HDeptID", "hsubid", "HMaterID", "HPropertyID", "HSecUnitID", "Hunitid", "源单主内码","源单类型"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');


 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sb_MouldRepairWorkBillList.html

@@ -136,6 +136,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sb_MouldRepairWorkBillList";
            var col = [];
            var titleData = ["hmainid","单据ID", "单据类型", "HMouldID", "HEquipID", "HEmpID", "HManagerID", "HDeptID", "HSupID", "hsubid", "HRepairID", "源单主内码", "源单子内码", "HBillType"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion
     
            //初始化页面加载
@@ -277,26 +279,65 @@
            //查询
            function get_Display(sWhere) {
                var index = layer.load(0);
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },                    
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            layer.close(index);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(index);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }

                });
            }

@@ -587,7 +628,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["单据ID", "单据类型", "HMouldID", "HEquipID", "HEmpID", "HManagerID", "HDeptID", "HSupID", "hsubid", "HRepairID", "源单主内码", "源单子内码", "HBillType"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["单据ID", "单据类型", "HMouldID", "HEquipID", "HEmpID", "HManagerID", "HDeptID", "HSupID", "hsubid", "HRepairID", "源单主内码", "源单子内码", "HBillType"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');


 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldConkBookBillList.html

@@ -121,6 +121,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sc_MouldConkBookBillList";
            var col = [];
            var titleData = ["hmainid","单据ID", "单据类型", "hempid", "HConkTypeID", "HDeptID", "HMouldID", "hsubid", "HConkReasonID", "HManagerID", "表体备注", "源单主内码", "源单子内码","HEmpID","HBillType"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -250,6 +252,7 @@
            //查询
            function get_Display(sWhere) {
                var index = layer.load();//遮罩
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
@@ -257,15 +260,54 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            layer.close(index);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(index);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
@@ -422,7 +464,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["单据ID", "单据类型", "hempid", "HConkTypeID", "HDeptID", "HMouldID", "hsubid", "HConkReasonID", "HManagerID", "表体备注", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•
                           /* var titleData = ["单据ID", "单据类型", "hempid", "HConkTypeID", "HDeptID", "HMouldID", "hsubid", "HConkReasonID", "HManagerID", "表体备注", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');


 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldDotCheckBillList.html

@@ -116,6 +116,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sc_MouldDotCheckBillList";
            var col = [];
            var titleData = ["hmainid","HPlanInterID","HDotCheckItemID","单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码","HBillType"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -416,9 +418,48 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -503,7 +544,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');


 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainBillList.html

@@ -145,6 +145,8 @@
            var option1 = [];
            var option2 = [];
            var HModName = "Sc_MouldMaintainBillList";
            var col = [];
            var titleData = ["hmainid","单据ID", "单据类型", "HMouldID","HEmpID","HBillType"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -355,9 +357,48 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -564,7 +605,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["单据ID", "单据类型","HMouldID"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["单据ID", "单据类型","HMouldID"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');


 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainRuleBillList.html

@@ -137,10 +137,23 @@
            var option1 = [];
            var option2 = [];
            var HModName = "Sc_MouldMaintainRuleBillList";
            var col = [];
            var titleData = ["hmainid", "单据类型", "配件ID", "单位ID", "负责人代码", "行关闭人", "作废日期", "源单主内码","源单子内码","hsubid","负责人ID","保养项目ID"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion


            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //获取页面跳转参数
            var params = get_UrlVars();
            if (typeof (params[params[0]]) != "undefined") {
                sWhere = {
                    HSouceInterID: params[params[0]],
                    HSourceEntryID: params[params[1]],
                    Type: params[params[2]],
                    user: HMaker
                }
                sWhere = JSON.stringify(sWhere);
            }
            //初始化界面
            set_ClearBill();
            //#endregion
@@ -228,61 +241,61 @@
                set_InitGrid2();
                //查询
                get_Display(sWhere);
                //刷新表格数据
                DisPlay_HideColumn();
              
            }
            //初始化主表格
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: '400'
                    , height: '500'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'hmainid', hide: true }
                        , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号', width: 160 }
                        , { field: '单据类型', title: '单据类型', width: 160, hide: true }
                        , { field: '周期单位', title: '周期单位', width: 200 }
                        , { field: '保养周期', title: '保养周期', width: 200 }
                        , { field: '配件ID', title: '配件ID', width: 200, hide: true }
                        , { field: '配件代码', title: '配件代码', width: 200 }
                        , { field: '配件名称', title: '配件名称', width: 200 }
                        , { field: '摘要', title: '摘要', width: 200 }
                        , { field: '内部单据号', title: '内部单据号', width: 200 }
                        , { field: '备注', title: '备注', width: 200 }
                        , { field: '单位ID', title: '单位ID', width: 200, hide: true }
                        , { field: '计量单位名称', title: '计量单位名称', width: 200 }
                        , { field: '用量', title: '用量', width: 200 }
                        , { field: '子备注', title: '子备注', width: 200 }
                        , { field: '保养项目', title: '保养项目', width: 115 }
                        , { field: '保养部位', title: '保养部位', width: 200 }
                        , { field: '具体要求', title: '具体要求', width: 200 }
                        , { field: '负责人代码', title: '负责人代码', width: 200, hide: true }
                        , { field: '负责人名称', title: '负责人名称', width: 200 }
                        , { field: '行关闭人', title: '行关闭人', width: 115, hide: true }
                        , { field: '关闭类型', title: '关闭类型', width: 200 }
                        , { field: '表体备注', title: '表体备注', width: 200 }
                        , { field: '制单人', title: '制单人', width: 115 }
                        , { 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 }
                        , { field: '修改日期', title: '修改日期', width: 115, 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 }
                        , { field: '作废日期', title: '作废日期', width: 115, hide: true }
                        , { field: '源单主内码', title: '源单主内码', width: 200, hide: true }
                        , { field: '源单子内码', title: '源单子内码', width: 200, hide: true }
                        , { field: '源单单号', title: '源单单号', width: 200 }
                        , { field: '源单类型', title: '源单类型', width: 200 }
                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
                    ]]
                    , loading:false
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'hmainid', title: 'hmainid', hide: true }
                    //    , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                    //    , { field: '单据号', title: '单据号', width: 160 }
                    //    , { field: '单据类型', title: '单据类型', width: 160, hide: true }
                    //    , { field: '周期单位', title: '周期单位', width: 200 }
                    //    , { field: '保养周期', title: '保养周期', width: 200 }
                    //    , { field: '配件ID', title: '配件ID', width: 200, hide: true }
                    //    , { field: '配件代码', title: '配件代码', width: 200 }
                    //    , { field: '配件名称', title: '配件名称', width: 200 }
                    //    , { field: '摘要', title: '摘要', width: 200 }
                    //    , { field: '内部单据号', title: '内部单据号', width: 200 }
                    //    , { field: '备注', title: '备注', width: 200 }
                    //    , { field: '单位ID', title: '单位ID', width: 200, hide: true }
                    //    , { field: '计量单位名称', title: '计量单位名称', width: 200 }
                    //    , { field: '用量', title: '用量', width: 200 }
                    //    , { field: '子备注', title: '子备注', width: 200 }
                    //    , { field: '保养项目', title: '保养项目', width: 115 }
                    //    , { field: '保养部位', title: '保养部位', width: 200 }
                    //    , { field: '具体要求', title: '具体要求', width: 200 }
                    //    , { field: '负责人代码', title: '负责人代码', width: 200, hide: true }
                    //    , { field: '负责人名称', title: '负责人名称', width: 200 }
                    //    , { field: '行关闭人', title: '行关闭人', width: 115, hide: true }
                    //    , { field: '关闭类型', title: '关闭类型', width: 200 }
                    //    , { field: '表体备注', title: '表体备注', width: 200 }
                    //    , { field: '制单人', title: '制单人', width: 115 }
                    //    , { 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 }
                    //    , { field: '修改日期', title: '修改日期', width: 115, 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 }
                    //    , { field: '作废日期', title: '作废日期', width: 115, hide: true }
                    //    , { field: '源单主内码', title: '源单主内码', width: 200, hide: true }
                    //    , { field: '源单子内码', title: '源单子内码', width: 200, hide: true }
                    //    , { field: '源单单号', title: '源单单号', width: 200 }
                    //    , { field: '源单类型', title: '源单类型', width: 200 }
                    //    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
                    //]]
                }
            }
            //初始化表格(子表1)
@@ -294,6 +307,7 @@
                    , height: '350'
                    , page: true
                    , cellMinWidth: 90
                    , loading: false
                    , cols: [[
                        //{ type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
@@ -320,6 +334,7 @@
                    , height: '350'
                    , page: true
                    , cellMinWidth: 90
                    , loading: false
                    , cols: [[
                        //{ type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao1', title: '序号', sort: true, fixed: 'left', event: "qwe" }
@@ -340,6 +355,7 @@
            }
            //加载网格
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
@@ -348,24 +364,72 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            layer.close(index);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                            layer.alert(data1.Message, { icon: 5 });
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }

            //获取传递数据
            function get_UrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }

            var index = layer.load(0);
            //var index = layer.load(0);
            //新增
            function set_AddNew() {
                layer.open({
@@ -553,10 +617,9 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid", "单据类型", "配件ID", "单位ID", "负责人代码", "行关闭人", "作废日期", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["hmainid", "单据类型", "配件ID", "单位ID", "负责人代码", "行关闭人", "作废日期", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列

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

@@ -183,7 +183,8 @@
                ]]
            };
            var HModName = "Sb_EqpConkBookBillList";

            var col = [];
            var titleData = ["hmainid", "单据类型", "HEquipID", "HConkTypeID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HConkReasonID", "HManagerID1", "源单主内码", "源单子内码", "HBillType"];//不需要显示的字段 å¯æ‰©å±•
            var index = layer.load(0);

            //初始化表格
@@ -290,6 +291,7 @@
            });

            //进入页面显示的缓存列表
            var ajaxLoad = layer.load();    
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/Sb_EqpRepairWorkBill/GetEqpConkBookBillList',
@@ -297,15 +299,54 @@
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        var data = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        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 {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                }
                            }
                        }

                        //在列表左边添加勾选框
                        col.unshift({ type: 'checkbox', fixed: 'left' })
                        //动态显示列名
                        option = {
                            elem: '#mainTable'
                            , toolbar: '#toolbarDemo'
                            , cols: [col]
                            , data: data1.data
                            , height: 550
                            , page: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                        }
                        table.render(option);
                        layer.close(index);

                        //刷新表格数据
                        DisPlay_HideColumn();

                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
@@ -406,7 +447,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid", "单据类型", "HEquipID", "HConkTypeID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HConkReasonID", "HManagerID1", "源单主内码", "源单子内码","HBillType"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["hmainid", "单据类型", "HEquipID", "HConkTypeID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HConkReasonID", "HManagerID1", "源单主内码", "源单子内码","HBillType"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');


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

@@ -125,6 +125,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sb_EqpMaintenanceBillList";
            var col = [];
            var titleData = ["hmainid","单据ID", "单据类型", "HEquipID", "HRepairID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HRepairID1", "HManagerID1", "源单主内码", "源单子内码", "HBillType","HMainSourceBillType","HMainSourceInterID"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -263,9 +265,48 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -433,7 +474,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["单据ID", "单据类型", "HEquipID", "HRepairID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HRepairID1", "HManagerID1", "源单主内码", "源单子内码","HBillType"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["单据ID", "单据类型", "HEquipID", "HRepairID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HRepairID1", "HManagerID1", "源单主内码", "源单子内码","HBillType"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');


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

@@ -120,14 +120,14 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sb_EquipDotCheckBillList";
            var col = [];
            var titleData = ["hmainid", "hsubid","设备ID","内部单据号","点检项目ID","负责人ID","设备点检规程ID","HBillType"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½

            //初始化界面
            set_ClearBill();
            //初始化表格
            DisPlay_HideColumn();
            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
@@ -238,9 +238,48 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -423,7 +462,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid","hsubid"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["hmainid","hsubid"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');


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

@@ -147,14 +147,14 @@
            var option1 = [];
            var option2 = [];
            var HModName = "Sb_EquipMaintainBillList";
            var col = [];
            var titleData = ["hmainid", "单据类型", "表头备注", "配件代码", "hsubid", "行关闭人", "表体备注", "制单人", "修改人", "作废日期", "源单主内码", "源单子内码","HEquipID","内部单据号","HMaterID","单位ID","负责人ID","HBillType"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion


            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
            set_ClearBill();
            //初始化表格
            DisPlay_HideColumn();
            //#endregion

            //头工具栏事件
@@ -361,6 +361,7 @@
            }
            //加载网格
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();    
                //进入页面显示的缓存列表
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
@@ -369,15 +370,54 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            layer.close(index);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(index);
                            layer.alert("没有数据记录!", { icon: 5 });
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
@@ -571,7 +611,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid", "单据类型", "表头备注", "配件代码", "hsubid", "行关闭人", "表体备注", "制单人", "修改人", "作废日期", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["hmainid", "单据类型", "表头备注", "配件代码", "hsubid", "行关闭人", "表体备注", "制单人", "修改人", "作废日期", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');

@@ -642,7 +682,7 @@
                    }
                })
            }

            layer.close(index);
            //#endregion
        });


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

@@ -102,6 +102,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sb_EquipDotCheckRuleList";
            var col = [];
            var titleData = ["hmainid", "点检项目ID", "负责人ID", "hbilltype", "HMoudType", "hsubid","内部单据号"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -208,6 +210,7 @@
            //查询
            function get_Display(sWhere) {
                var index = layer.load();
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
@@ -215,17 +218,54 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            layer.close(index);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                            layer.alert("暂无记录", { icon: 5 });
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
@@ -473,7 +513,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid", "点检项目ID", "负责人ID", "hbilltype", "HMoudType","hsubid"];//不需要显示的字段 å¯æ‰©å±•
                           /* var titleData = ["hmainid", "点检项目ID", "负责人ID", "hbilltype", "HMoudType","hsubid"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');


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

@@ -137,14 +137,14 @@
            var option1 = [];
            var option2 = [];
            var HModName = "Sb_EquipMaintainRuleList";
            var col = [];
            var titleData = ["hmainid", "单据类型", "配件ID", "单位ID", "负责人代码", "行关闭人", "作废日期", "源单主内码", "源单子内码","内部单据号","hsubid","保养项目ID","负责人ID"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion


            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
            set_ClearBill();
            //初始化表格
            DisPlay_HideColumn();
            //#endregion

            //头工具栏事件
@@ -241,48 +241,48 @@
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'hmainid', hide: true }
                        , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号', width: 160 }
                        , { field: '单据类型', title: '单据类型', width: 160, hide: true }
                        , { field: '周期单位', title: '周期单位', width: 200 }
                        , { field: '保养周期', title: '保养周期', width: 200 }
                        , { field: '配件ID', title: '配件ID', width: 200, hide: true }
                        , { field: '配件代码', title: '配件代码', width: 200 }
                        , { field: '配件名称', title: '配件名称', width: 200 }
                        , { field: '摘要', title: '摘要', width: 200 }
                        , { field: '内部单据号', title: '内部单据号', width: 200 }
                        , { field: '备注', title: '备注', width: 200 }
                        , { field: '单位ID', title: '单位ID', width: 200,hide: true }
                        , { field: '计量单位名称', title: '计量单位名称', width: 200 }
                        , { field: '用量', title: '用量', width: 200 }
                        , { field: '子备注', title: '子备注', width: 200 }
                        , { field: '保养项目', title: '保养项目', width: 115}
                        , { field: '保养部位', title: '保养部位', width: 200 }
                        , { field: '具体要求', title: '具体要求', width: 200 }
                        , { field: '负责人代码', title: '负责人代码', width: 200, hide: true }
                        , { field: '负责人名称', title: '负责人名称', width: 200 }
                        , { field: '行关闭人', title: '行关闭人', width: 115, hide: true }
                        , { field: '关闭类型', title: '关闭类型', width: 200 }
                        , { field: '表体备注', title: '表体备注', width: 200 }
                        , { field: '制单人', title: '制单人', width: 115 }
                        , { 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 }
                        , { field: '修改日期', title: '修改日期', width: 115, 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 }
                        , { field: '作废日期', title: '作废日期', width: 115, hide: true }
                        , { field: '源单主内码', title: '源单主内码', width: 200, hide: true }
                        , { field: '源单子内码', title: '源单子内码', width: 200, hide: true }
                        , { field: '源单单号', title: '源单单号', width: 200 }
                        , { field: '源单类型', title: '源单类型', width: 200 }
                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
                    ]]
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'hmainid', title: 'hmainid', hide: true }
                    //    , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                    //    , { field: '单据号', title: '单据号', width: 160 }
                    //    , { field: '单据类型', title: '单据类型', width: 160, hide: true }
                    //    , { field: '周期单位', title: '周期单位', width: 200 }
                    //    , { field: '保养周期', title: '保养周期', width: 200 }
                    //    , { field: '配件ID', title: '配件ID', width: 200, hide: true }
                    //    , { field: '配件代码', title: '配件代码', width: 200 }
                    //    , { field: '配件名称', title: '配件名称', width: 200 }
                    //    , { field: '摘要', title: '摘要', width: 200 }
                    //    , { field: '内部单据号', title: '内部单据号', width: 200 }
                    //    , { field: '备注', title: '备注', width: 200 }
                    //    , { field: '单位ID', title: '单位ID', width: 200,hide: true }
                    //    , { field: '计量单位名称', title: '计量单位名称', width: 200 }
                    //    , { field: '用量', title: '用量', width: 200 }
                    //    , { field: '子备注', title: '子备注', width: 200 }
                    //    , { field: '保养项目', title: '保养项目', width: 115}
                    //    , { field: '保养部位', title: '保养部位', width: 200 }
                    //    , { field: '具体要求', title: '具体要求', width: 200 }
                    //    , { field: '负责人代码', title: '负责人代码', width: 200, hide: true }
                    //    , { field: '负责人名称', title: '负责人名称', width: 200 }
                    //    , { field: '行关闭人', title: '行关闭人', width: 115, hide: true }
                    //    , { field: '关闭类型', title: '关闭类型', width: 200 }
                    //    , { field: '表体备注', title: '表体备注', width: 200 }
                    //    , { field: '制单人', title: '制单人', width: 115 }
                    //    , { 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 }
                    //    , { field: '修改日期', title: '修改日期', width: 115, 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 }
                    //    , { field: '作废日期', title: '作废日期', width: 115, hide: true }
                    //    , { field: '源单主内码', title: '源单主内码', width: 200, hide: true }
                    //    , { field: '源单子内码', title: '源单子内码', width: 200, hide: true }
                    //    , { field: '源单单号', title: '源单单号', width: 200 }
                    //    , { field: '源单类型', title: '源单类型', width: 200 }
                    //    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
                    //]]
                }
            }
            //初始化表格(子表1)
@@ -296,6 +296,7 @@
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , loading: false
                    , cols: [[
                        //{ type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
@@ -324,6 +325,7 @@
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , loading: false
                    , cols: [[
                        //{ type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao1', title: '序号', sort: true, fixed: 'left', event: "qwe" }
@@ -344,6 +346,7 @@
            }
            //加载网格
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
@@ -352,17 +355,54 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            layer.close(index);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                            layer.alert("没有数据记录!", { icon: 5 });
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
@@ -557,7 +597,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid", "单据类型", "配件ID", "单位ID", "负责人代码", "行关闭人", "作废日期", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["hmainid", "单据类型", "配件ID", "单位ID", "负责人代码", "行关闭人", "作废日期", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');

@@ -628,6 +668,7 @@
                    }
                })
            }
            layer.close(index);

            //#endregion
        });