Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

zzr99

2022-08-08 f0719da71fc0caa65c724ca5392cc3295bf3a9c3

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/App_Data/MssqlReportData.cs

@@ -19,10 +19,11 @@
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井
    //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//雅琪诺测试
    //public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特
    public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪

    //public string sServer;
    //public string sDataBase;

 WebTM/WebTM.csproj

@@ -885,6 +885,7 @@
    <Content Include="views\生产管理\生产装箱单\Sc_PackUnionBill_Fast.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatFormImport.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_ICMOSortBillList.html" />
    <Content Include="views\生产管理\生产退库单\Sc_ProductionReturnList.html" />
    <Content Include="views\生产管理\组托单编辑\Sc_GroupOrderBillEdit_Fast.html" />
    <Content Include="views\生产管理\组装单\Sc_GroupOrderBillList.html" />

 WebTM/views/grf/ÈðÓëì÷½­ËÕ´òÓ¡Ä£°å.grf

@@ -105,6 +105,9 @@
                Item
                    Name='子件规格'
                End
                Item
                    Name='生产数量'
                End
            End
        End
        Items Column
@@ -373,7 +376,7 @@
    Items ReportHeader
        Item
            Name='ReportHeader1'
            Height=4.39208
            Height=5.00063
            Items Control
                Item
                    Type=FreeGrid
@@ -384,6 +387,7 @@
                        Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
                    End
                    ColumnCount=9
                    RowCount=6
                    Items FreeGridColumn
                        Item[1]
                            Width=2.06375
@@ -416,8 +420,8 @@
                                Item
                                    Type=Barcode
                                    Name='Barcode1'
                                    Left=5.21229
                                    Width=3.175
                                    Left=5.60917
                                    Width=3.20146
                                    Height=1.5875
                                    BarcodeType=QRCode
                                    CaptionPosition=None
@@ -426,9 +430,9 @@
                                Item
                                    Type=FieldBox
                                    Name='FieldBox1'
                                    Left=13.9965
                                    Left=10.3981
                                    Top=0.211667
                                    Width=4.39208
                                    Width=3.20146
                                    Height=1.19063
                                    ShrinkFontToFit=T
                                    DataField='单据号'
@@ -438,7 +442,7 @@
                                    Name='StaticBox1'
                                    Left=0.211667
                                    Top=0.211667
                                    Width=4.39208
                                    Width=5.00063
                                    Height=1.19063
                                    Object Font
                                        Name='宋体'
@@ -451,9 +455,9 @@
                                Item
                                    Type=StaticBox
                                    Name='StaticBox2'
                                    Left=12.991
                                    Left=8.99583
                                    Top=0.211667
                                    Width=0.820208
                                    Width=0.79375
                                    Height=1.19063
                                    Object Font
                                        Name='宋体'
@@ -462,6 +466,14 @@
                                        Charset=134
                                    End
                                    Text='ID'
                                End
                                Item
                                    Type=Barcode
                                    Name='Barcode2'
                                    Left=14.3933
                                    Width=4.41854
                                    Height=1.5875
                                    Text='单据号'
                                End
                            End
                            ColSpan=9
@@ -587,6 +599,20 @@
                            End
                            ColSpan=2
                        End
                        Item[6,1]
                            Text='数量'
                        End
                        Item[6,2]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=FieldBox
                                    Name='FieldBox11'
                                    Dock=Fill
                                    DataField='生产数量'
                                End
                            End
                        End
                    End
                End
            End

 WebTM/views/index.html

@@ -378,6 +378,7 @@
                                                <dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">生产计划平台</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">导入</a></dd>
                                                <dd><a lay-href="生产管理/齐套分析/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">齐套分析信息明细列表</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">生产日计划查询</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>

 WebTM/views/index_Mobile.html

@@ -429,12 +429,6 @@
                              åº“存查询
                          </a>
                      </dd>
                      <dd>
                          <a href="领料发货/收料入库/Kf_ReciveBill_Check.html" target="main_self_frame" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              æ”¶æ–™é€šçŸ¥å•å®¡æ ¸
                          </a>
                      </dd>
                  </dl>
              </li>
              <!-- è®¾å¤‡ç®¡ç† -->

 WebTM/views/user/login.html

@@ -121,10 +121,15 @@
                        }
                        $("#Organization").append(Organization);
                        form.render('select');

                        //读取配置文件
                        get_ReadConfigFile();
                    }
                    layer.closeAll("loading");
                }
            })

         

            //form.render();

@@ -152,6 +157,33 @@
                    $("#LAY-user-login-password").focus();
                }
            })


            //读取配置文件
            function get_ReadConfigFile() {
                //获取本地存储的数据
                var data = localStorage.getItem("data");
                if (data != null) {
                    var data2 = JSON.parse(data);
                    $("#LAY-user-login-username").val(data2["UserID"]);
                    $("#Organization").val(data2["OrgID"]);
                    form.render('select');
                }
                console.log(JSON.parse(data));
            }

            //存储配置文件
            function get_WriteConfigFile() {
                //清空本地存储的数据
                localStorage.clear();
                var data = {
                    UserID: sessionStorage["Czybm"]
                    , OrgID: sessionStorage["OrganizationID"]
                }
                //本地存储
                localStorage.setItem("data", JSON.stringify(data));
            }

            //登录
            function loging() {
                if ($("#Organization").val() == 0) {
@@ -211,6 +243,7 @@
                            } else {//PC端
                                window.location.href = '../../views/index.html'
                            }
                            get_WriteConfigFile();
                        }
                        else {
                            // $("#verifycode").click();
@@ -225,6 +258,7 @@
                    }
                })
            }

            function playSound() {
                var audio = document.getElementById("cs");
                if (audio == null)

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_FastList.html

@@ -237,8 +237,16 @@

        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1207'

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂë¿â´æ/KF_ICInventoryByMaterID.html

@@ -174,7 +174,34 @@
                    }
                };
            }

            //扫仓位
            $('#HStockPlaceName').on('keydown', function (event) {
                var HBarCode = $('#HStockPlaceName').val()
                if (event.keyCode == 13) {
                    //判断文本框是否有数据    new
                    $.ajax({
                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
                        type: "GET",
                        data: { "HBarCode": HBarCode },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#HStockPlaceName").val(result.data[0].HName);
                                $("#HStockPlaceID").val(result.data[0].HItemID);
                                $("#HWHID").val(result.data[0].HWHID);
                                $("#HWHNAME").val(result.data[0].HWhName);
                                element.tabChange('tab-POStockInBill', '2');
                            }
                            else {
                                // $("#verifycode").click();
                                //layer.msg(result.Message, { icon: 5 });
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            layer.closeAll("loading");
                        }
                    });
                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
                }
            });

            //选择仓库
            form.on('submit(HWHID-BT)', function () {//选择仓库
@@ -321,6 +348,9 @@
                                for (var i = 0; i < data.length; i++) {
                                    if (data[i].name == '物料ID' || data[i].name == '辅助属性ID' || data[i].name == '仓库ID' || data[i].name == '仓位ID') {
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                    } else if (data[i].name == '数量' || data[i].name == '箱数')
                                    {
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, page: true});
                                    }
                                    else {
                                        switch (data[i].Type) {
@@ -342,6 +372,7 @@
                                    , height: 550
                                    , page: true
                                    , cellMinWidth: 90
                                    , totalRow: true
                                    , limit: 50
                                    , limits: [50, 500, 5000, 20000]
                                });

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

@@ -14,7 +14,7 @@
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            SqlXMLReportData.GenOneRecordset(this, "select  distinct b.流水号,a.任务单号,a.流转卡数量,a.产品代码,a.版本,a.成品编号,a.产品名称,a.日期,a.计划完工日期,a.单据号,a.材质,b.工序名称,b.模具编号,b.工艺参数,a.源单客户编码,a.包装标识,a.包装标识编码 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"]);
            SqlXMLReportData.GenOneRecordset(this, "select  distinct b.流水号,a.任务单号,a.流转卡数量,a.产品代码,a.版本,a.成品编号,a.产品名称,a.日期,a.计划完工日期,a.单据号,a.材质,b.工序名称,b.模具编号,b.工艺参数,a.源单客户编码,a.包装标识,a.包装标识编码,a.销售订单号,a.子件规格 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"]);
        }
    </script>
</head>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -328,6 +328,7 @@
                        , { field: '规格型号', title: '规格型号', width: 215 }
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间', width: 115 }
                        , { field: '生产任务单数量', title: '生产订单数量', width: 115 }
                        , { field: '计量单位代码', title: '计量单位代码', width: 115 }
                        , { field: '计量单位', title: '计量单位' }
                        , { field: '计划开工日期', title: '计划开工日期' }

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList.html

@@ -109,9 +109,6 @@
</body>
</html>
<script>
    var treeCkData = { id: 0 };
    var TagId = "";
    var TagParentId = "";
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/Sc_ICMOSortBillList.html

New file
@@ -0,0 +1,311 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>生产计划查询</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div style="padding: 10px; ">
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">齐料</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">缺料</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">撤销</button>
                        </div>
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">单据号</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">生产组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="Organization" id="Organization" lay-verify="Organization">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产车间</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">查询</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <!--其他条件-->

                                    </div>
                                    <div class="layui-row" style="margin: 10px 0 10px;">

                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
        //#region å…¬ç”¨å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , util = layui.util
            , tree = layui.tree
            , util = layui.util
        var sWhere = "";
        var option = [];
        //#endregion

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

        //初始化界面
        set_ClearBill();

        //#endregion

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

        //#region ç”Ÿäº§è½¦é—´
        form.on('submit(btnHWorkShopID)', function (data) {
            btnHWorkShopID();
        });
        //#endregion

        //#region é‡ç½®æŒ‰é’®
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });
        //#endregion

        //#region æŸ¥è¯¢æŒ‰é’®
        form.on('submit(btnSearch)', function (data) {
            get_FastQuery();
        });
        //#endregion

        //#endregion

        //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法

        //#region åˆå§‹åŒ–界面
        function set_ClearBill() {
            //生产组织加载
            Organ();
            //初始化表格
            set_InitGrid();
            //查询
            get_Display(sWhere);
        }
        //#endregion

        //#region åˆå§‹åŒ–表格方法
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 'full-110'
                , 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: 100 }
                    , { field: '部门名称', title: '部门名称', width: 120 }
                    , { field: '资源代码', title: '资源代码' }
                    , { field: '日期', title: '日期' }
                    , { field: '状态', title: '状态' }
                    , { field: '生产任务单号', title: '生产任务单号' }
                    , { field: '产品代码', title: '产品代码' }
                    , { field: '产品名称', title: '产品名称' }
                    , { field: '单位名称', title: '单位名称' }
                    , { field: '本日计划', title: '本日计划' }
                    , { field: '备料状态', title: '备料状态' }
                    , { field: '仓库确认', title: '仓库确认' }
                    , { field: '仓库确认时间', title: '仓库确认时间' }
                    , { field: '执行确认', title: '执行确认' }
                    , { field: '执行确认时间', title: '执行确认时间' }
                    , { field: '本日完工', title: '本日完工' }
                    , { field: '总计划数', title: '总计划数' }
                    , { field: '完工数', title: '完工数' }
                    , { field: '完工标记', title: '完工标记' }
                    , { field: '优先级0', title: '优先级' }
                ]]
            };
        }
        //#endregion

        //获取组织
        function Organ() {
            //获取登录页组织列
            var Organization = '<option  style="color:blue;" value="">组织</option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Web/GetOrganizations",
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                        }
                        $("#Organization").append(Organization);
                        $("#Organization").val(sessionStorage["OrganizationID"]);
                        form.render('select');
                    }
                    layer.closeAll("loading");
                }
            })
        }

        //#region æŸ¥è¯¢
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/JIT_ICMOSortBill/JIT_ICMOSortBillList',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (result) {
                    if (result.count == 1) {
                        option.data = result.data;
                        table.render(option);
                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(result.code + result.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }

        //#endregion

        //#region å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            var HBillNo = $("#HBillNo").val();
            var Organization = $("#Organization").val();//采购组织
            var HWorkShopIDName = $("#HWorkShopIDName").val();//生产车间
            var HBTimes = $("#HBTimes").val();//日期
            var HETimes = $("#HETimes").val();//至
            var HMaterName = $("#HMaterName").val();//物料名称
            var HMaterNumber = $("#HMaterNumber").val();//物料编码
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号

            if (HBillNo) {
                sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
            }
            if (Organization) {
                sWhere += " and HProdORGID = '" + Organization + "'";
            }
            if (HWorkShopIDName) {
                sWhere += " and ç”Ÿäº§è½¦é—´ = '" + HWorkShopIDName + "'";
            }
            if (HBTimes != "" && HETimes != "") {
                sWhere += " and æ—¥æœŸ between '" + HBTimes + "' and '" + HETimes + "'  ";
            }
            if (HMaterName) {
                sWhere += " and ç‰©æ–™åç§° like'%" + HMaterName + "%'";
            }
            if (HMaterNumber) {
                sWhere += " and ç‰©æ–™ä»£ç  like'%" + HMaterNumber + "%'";
            }
            if (HSeOrderBillNo) {
                sWhere += " and é”€å”®è®¢å•å· like'%" + HSeOrderBillNo + "%'";
            }
            get_Display(sWhere);
            sWhere = "";//调用接口后清空sWhere缓存
        }
        //#endregion

        //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
        function set_ClearQuery() {
            $("#HBillNo").val("");
            $("#Organization").val("");//采购组织
            $("#HWorkShopIDName").val("");//生产车间
            $("#HWorkShopID").val("");//生产车间
            $("#HBTimes").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//日期
            $("#HETimes").val(Format(new Date(), "yyyy-MM-dd"));//至
            $("#HMaterName").val("");//物料名称
            $("#HMaterNumber").val("");//物料编码
            $("#HSeOrderBillNo").val("");//销售订单号
            sWhere = "";
        }
        //#endregion

        //生产车间列表
        function btnHWorkShopID() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '生产车间列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//车间id
                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//车间名称
                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })

        }
        //#endregion
        //以上是layui模块
    });
</script>

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -479,11 +479,11 @@
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•ç±»åž‹
            var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«
            //var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«

            //判断是否新增
            if (linterid == null || linterid == 0) {
                linteridSub = -1;
                //linteridSub = -1;
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -500,7 +500,7 @@
            else {//如果修改则走下面 new
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                RoadBillMain(linterid, linteridSub);
                RoadBillMain(linterid);
                //RoadBillSub(linterid);
            }

@@ -1326,9 +1326,9 @@
            }

            //编辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid, linteridSub)//加载表头
            function RoadBillMain(linterid)//加载表头
            {
                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
                var sWhere = " and hmainid='" + linterid + "'";
                $.ajax({
                    url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
                    type: "GET",
@@ -1350,7 +1350,7 @@
                            , "HName": d.data[0].工艺名称
                            , "HMaterNumber": d.data[0].物料代码
                            , "HMaterName": d.data[0].物料名称
                            , "HMaterID": d.data[0].hmaterid
                            , "HMaterID": d.data[0].HMaterID
                            , "HUnitName": d.data[0].计量单位
                            , "HUnitID": d.data[0].hunitid
                            , "HMainTimeUnit": d.data[0].运行时间单位
@@ -1377,40 +1377,47 @@
                            , "HOrgID": d.data[0].HOrgID
                        });

                        //子表  èµ‹å€¼
                        var rowdata = [{
                            "HProcNo": d.data[0].工序号, "HProcID_S": d.data[0].工段, "HProcType": d.data[0].工序类型, "HCenterID_S": d.data[0].HCenterID_S, "HCenterID_SName": d.data[0].产线中心
                            , "HWorkQty_S": d.data[0].产线产能, "HSubStdEmpQty_S": d.data[0].产线人数, "HMouldNo": d.data[0].模具编号, "HChangeMould": d.data[0].换模时间, "HPackStd": d.data[0].周转箱标准
                            , "HPack": d.data[0].周转箱, "HPutArea": d.data[0].暂放区, "HMyWorkDays": d.data[0].生产周期, "HMyFixWorkDays": d.data[0].固定生产天数, "工序": d.data[0].工序
                            , "HProcID": d.data[0].hprocid, "工作中心代码": d.data[0].工作中心代码, "HCenterID": d.data[0].HCenterID, "工作中心": d.data[0].工作中心名称, "HSupID": d.data[0].HSupID
                            , "供应商代码": d.data[0].供应商代码, "供应商": d.data[0].供应商, "HSupFlag": d.data[0].委外标记 == 0 ? false : true, "HTimeUnit": d.data[0].时间单位, "HUnitTime": d.data[0].运行时间
                            , "HWorkQty": d.data[0].加工数量, "HPassRate": d.data[0].良率, "HOverRate": d.data[0].超额比例, "HReadyTime": d.data[0].准备时间, "HQueueTime": d.data[0].排队时间
                            , "HMoveTime": d.data[0].转移时间, "HNextProcFlag": d.data[0].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[0].流转工序 == 0 ? false : true, "HSubStdEmpQty": d.data[0].标准人数, "HSubCanUseSourceQty": d.data[0].可操作设备数
                            , "HFixPrice": d.data[0].班产定额, "HProcPrice": d.data[0].加工单价, "HBadPrice": d.data[0].不合格单价, "HWasterPrice": d.data[0].报废单价, "HStdFlag": d.data[0].标准定额
                            , "HBeginDayQty": d.data[0].开工余量天数, "HBeginFixQty": d.data[0].开工余量固数, "HFixWorkDays": d.data[0].上道固定天数, "HTrunWorkDays": d.data[0].上道循环周期, "HReadyTimes": d.data[0].本道准备时间
                            , "HICMOReadyTimes": d.data[0].换单准备时间, "HAutoTrunFlag": d.data[0].自动移转, "HTechnologyParameter": d.data[0].工艺参数, "HPicNum": d.data[0].图纸编号, "HProcCheckNote": d.data[0].本工序确认记录
                            , "HProcWorkNum": d.data[0].程序号
                        }];
                         //子表  èµ‹å€¼
                        var rowdata = [];
                        for (var i = 0; i < d.data.length; i++) {
                            rowdata.push(
                                {
                                    "HProcNo": d.data[i].工序号, "HProcID_S": d.data[i].工段, "HProcType": d.data[i].工序类型, "HCenterID_S": d.data[i].HCenterID_S, "HCenterID_SName": d.data[i].产线中心
                                    , "HWorkQty_S": d.data[i].产线产能, "HSubStdEmpQty_S": d.data[i].产线人数, "HMouldNo": d.data[i].模具编号, "HChangeMould": d.data[i].换模时间, "HPackStd": d.data[i].周转箱标准
                                    , "HPack": d.data[i].周转箱, "HPutArea": d.data[i].暂放区, "HMyWorkDays": d.data[i].生产周期, "HMyFixWorkDays": d.data[i].固定生产天数, "工序": d.data[i].工序
                                    , "HProcID": d.data[i].hprocid, "工作中心代码": d.data[i].工作中心代码, "HCenterID": d.data[i].HCenterID, "工作中心": d.data[i].工作中心名称, "HSupID": d.data[i].HSupID
                                    , "供应商代码": d.data[i].供应商代码, "供应商": d.data[i].供应商, "HSupFlag": d.data[i].委外标记 == 0 ? false : true, "HTimeUnit": d.data[i].时间单位, "HUnitTime": d.data[i].运行时间
                                    , "HWorkQty": d.data[i].加工数量, "HPassRate": d.data[i].良率, "HOverRate": d.data[i].超额比例, "HReadyTime": d.data[i].准备时间, "HQueueTime": d.data[i].排队时间
                                    , "HMoveTime": d.data[i].转移时间, "HNextProcFlag": d.data[i].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[i].流转工序 == 0 ? false : true, "HSubStdEmpQty": d.data[i].标准人数, "HSubCanUseSourceQty": d.data[i].可操作设备数
                                    , "HFixPrice": d.data[i].班产定额, "HProcPrice": d.data[i].加工单价, "HBadPrice": d.data[i].不合格单价, "HWasterPrice": d.data[i].报废单价, "HStdFlag": d.data[i].标准定额
                                    , "HBeginDayQty": d.data[i].开工余量天数, "HBeginFixQty": d.data[i].开工余量固数, "HFixWorkDays": d.data[i].上道固定天数, "HTrunWorkDays": d.data[i].上道循环周期, "HReadyTimes": d.data[i].本道准备时间
                                    , "HICMOReadyTimes": d.data[i].换单准备时间, "HAutoTrunFlag": d.data[i].自动移转, "HTechnologyParameter": d.data[i].工艺参数, "HPicNum": d.data[i].图纸编号, "HProcCheckNote": d.data[i].本工序确认记录
                                    , "HProcWorkNum": d.data[i].程序号
                                }
                            )
                        }
                        option.data = rowdata;
                        table.render(option);
                      
                        if (d.data[0].委外标记) {
                            $('#HSupFlag1').attr("checked", true);
                        }
                        if (d.data[0].HNextProcFlag) {
                            $('#HNextProcFlag1').attr("checked", true);
                        }
                        if (d.data[0].流转工序) {
                            $('#HFlowProc1').attr("checked", true);
                        }
                        if (d.data[0].标准定额) {
                            $('#HStdFlag1').attr("checked", true);
                        }
                        if (d.data[0].自动移转) {
                            $('#HAutoTrunFlag1').attr("checked", true);

                        for (var i = 0; i < d.data.length; i++) {
                            if (d.data[i].委外标记) {
                                $('#HSupFlag' + (i + 1)).attr("checked", true);
                            }
                            if (d.data[i].HNextProcFlag) {
                                $('#HNextProcFlag' + (i + 1)).attr("checked", true);
                            }
                            if (d.data[i].流转工序) {
                                $('#HFlowProc' + (i + 1)).attr("checked", true);
                            }
                            if (d.data[i].标准定额) {
                                $('#HStdFlag' + (i + 1)).attr("checked", true);
                            }
                            if (d.data[i].自动移转) {
                                $('#HAutoTrunFlag' + (i + 1)).attr("checked", true);
                            }
                            $('#HProcType' + (i + 1)).find("option[value='" + d.data[i].工序类型 + "']").attr("selected", true);
                        }
                        form.render('checkbox');
                        $('#HProcType1').find("option[value='" + d.data[0].工序类型+ "']").attr("selected", true);
                        form.render('select');
                    }
                })
@@ -1429,8 +1436,8 @@
                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
                var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
                //var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];

                var index = layer.load();
                $.ajax({

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -341,7 +341,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HItemID;
                    var linteridSub = data[0].hsubid;
                    //var linteridSub = data[0].hsubid;
                   
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
@@ -349,7 +349,7 @@
                        , area: ['100%', '100%']
                        , title: '工艺路线-编辑'
                        , shift: 0//弹出动画
                        , content: '../工艺路线/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                        , content: '../工艺路线/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            //刷新页面,
                            location.reload();

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -56,29 +56,33 @@
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>

                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                            <label class="layui-form-label">订单跟踪号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">物料</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="SHname">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">任务单号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">订单跟踪号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HProcExchBillNo" id="SHname">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">任务单号</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                            </div>
                                        </div>
                                    </div>
                                </div>
@@ -207,10 +211,11 @@
                $("#SHPrintQty").val("");//打印状态
                $("input[type='checkbox'][name='wybj']").prop('checked', false);
                form.render("checkbox");//委外标记
                $("#HDate").val("");//开始日期
                $("#HDate1").val("");//结束日期
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#SHname").val("");//物料|子件名称|子件规格
                $("#HBillNo").val("");//单据号
                //$("#btnSearch").click();
                sWhere = "";
                get_Display(sWhere);
@@ -225,6 +230,7 @@
                var HOrderProcNO = $("#HOrderProcNO").val();//订单跟踪号
                var HWorkBillNo = $("#HWorkBillNo").val();
                var SHname = $("#SHname").val();//物料|子件名称|子件规格
                var HBillNo = $("#HBillNo").val();//单据号
                if (SHPrintQty) {//判断打印状态
                    if (SHPrintQty == "全部") {
                        sWhere = " and æ‰“印次数 >= 0 ";
@@ -254,6 +260,9 @@
                if (SHname) {
                    sWhere += " and å­ä»¶åç§° like '%" + SHname + "%' or å­ä»¶è§„æ ¼ like '%" + SHname + "%'"
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'"
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

 WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_FastList.html

@@ -307,6 +307,7 @@
        form.on('submit(cmdQuery)', function () {
            var HBillNo = $("#HBillNo").val();
            var HSourceBillNo = $("#HSourceBillNo").val();
            var index = layer.load();
            //进入页面显示的缓存列表
            $.ajax({
                url: GetWEBURL() + '/Gy_Mould/list1',

 WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Fast.html

@@ -116,7 +116,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;">源单单号:</label>
                                            <label class="layui-form-label" style="width: 75px;">单据号:</label>
                                            <div class="layui-input-block" style="margin-left: 85px;">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" disabled="disabled">
                                                <input type="text" class="layui-input" name="HInterID" id="HInterID" disabled="disabled" style="width:100px">
@@ -193,11 +193,11 @@
            form.on('submit(btn_Check)', function (data) {//审核
                var index = layer.load();
                var HInterID = $('#HInterID').val();
                var HBillNo = $('#HBarCode').val();
                var HBillNo = $('#HBillNo').val();
                $.ajax({
                    url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBill",
                    type: "Get",
                    data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": "" },
                    data: { "HInterID": HInterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": HBillNo},
                    success: function (result) {
                        if (result.code == "1") {
                            layer.msg("审核成功", { icon: 1, btn: ['确认'], time: 1000000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -270,15 +270,15 @@
                }
                var index = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillCheckDate",
                    url: GetWEBURL() + "/POStockInBillList/Get_ReciveBill",
                    type: "GET",
                    data: { "HBarCode": HBarCode },
                    data: { "HBillno": HBarCode },
                    success: function (result) {
                        if (result.code == "1") {
                            var data = result.data[0];
                            $("#HSupName").val(data.供应商);
                            $("#HDeptName").val(data.部门);
                            $("#HBillNo").val(data.源单单号);
                            $("#HBillNo").val(data.单据号);
                            $("#HInterID").val(data.hmainid);
                            option.data = result.data;
                            table.render(option);

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_Fast.html

@@ -207,7 +207,7 @@
                        </div>
                    </div>
                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">提交</button>
                        <button type="button" lay-submit="" class="layui-btn" id="Saver" lay-filter="Saver">提交</button>
                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">编辑</button>
                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">刷新</button>
                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">删除</button>

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_FastList.html

@@ -262,8 +262,16 @@
        
        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1203'
@@ -399,60 +407,60 @@


        //加载缓存列表数据
        //function get_Display() {
        //    var ajaxLoad = layer.load();
        //    $.ajax({
        //        url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
        //        type: "GET",
        //        data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
        //        success: function (data1) {
        //            if (data1.count == 1) {
        //                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 });
        //                }
        function get_Display() {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
                type: "GET",
                data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
                success: function (data1) {
                    if (data1.count == 1) {
                        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 (data[i].name == '单据内码' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
        //                        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 });
        //                        }
        //                    }
        //                }
                        for (var i = 0; i < data.length; i++) {
                            if (data[i].name == '单据内码' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                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 });
                                }
                            }
                        }

        //                //动态显示列名
        //                table.render({
        //                    elem: '#dj-table'
        //                    , cols: [col]
        //                    , data: data1.data
        //                    , height: 550
        //                    , page: true
        //                    , cellMinWidth: 90
        //                    , limit: 50
        //                    , limits: [50, 500, 5000, 20000]
        //                });
                        //动态显示列名
                        table.render({
                            elem: '#dj-table'
                            , cols: [col]
                            , data: data1.data
                            , height: 550
                            , page: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                        });

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

        //刷新明细页签
        table.render({