MES-WEB-LayUI.git

parent: f3d17d1d | 补丁 | 提交 | show whitespace

yangle

2024-05-17 a20fe0873392f9a8214ebff1c09ac35e6c6e646b

流转卡派工
同步到生产状态临时表

1个文件已添加

3个文件已修改

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html	986 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -364,6 +364,7 @@
    <Content Include="views\è®¾å¤ç®¡ç\è®¾å¤åæºå\Sb_EquipStopBillList.html" />
    <Content Include="views\è®¾å¤ç®¡ç\è®¾å¤å¼æºå\Sb_EquipBeginBill.html" />
    <Content Include="views\è®¾å¤ç®¡ç\è®¾å¤å¼æºå\Sb_EquipBeginBillList.html" />
    <Content Include="views\è½¦é´ç®¡ç\å·¥åºæµè½¬å¡\Sc_ProcessExchangeArrangement_PG.html" />
    <Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\è½¦é´ç®¡ç\é²ééªè¯\Gy_MaterPreventErrMouldBill.html" />
    <Content Include="views\è½¦é´ç®¡ç\é²ééªè¯\Gy_MaterPreventErrMouldBillList.html" />

 WebTM/views/index.html

@@ -501,6 +501,7 @@
                                        <dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/MES_SampleRecordBillList.html">è¯æ ·è®°å½ååè¡¨</a></dd>
                                        <dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/MES_ColorRecordBillList.html">å¯¹è²è®°å½ååè¡¨</a></dd>
                                        <dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeArrangement.html">å·¥åºæµè½¬å¡æç¼¸</a></dd>
                                        <dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeArrangement_PG.html">å·¥åºæµè½¬å¡æ´¾å·¥</a></dd>
                                        <dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeIssueBillList.html">å·¥åºæµè½¬å¡ï¼ä¸è¾¾ï¼</a></dd>
                                        <dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcExchWorkBackBillList.html">å·¥åºè¿å·¥ç³è¯·åè¡¨</a></dd>
                                        <!--<dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcExchWorkBackBillEdit.html">å·¥åºè¿å·¥ç³è¯·</a></dd>-->

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html

@@ -970,7 +970,7 @@
        }

        function save(data) {

            var index = layer.load();
                  var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                if (!AllowLoadData())//æ°æ®éªè¯
@@ -998,6 +998,7 @@
                                    layer.close(index);
                                }
                            });
                        layer.close(index);
                           
                            //layer.confirm(data.Message, {
                            //    btn: ['ç¡®è®¤']
@@ -1014,10 +1015,12 @@
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
                        layer.close(index);
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 })
                    layer.close(index);
                    }
                })
        }

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

New file
@@ -0,0 +1,986 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>å·¥åºæµè½¬å¡æ´¾å·¥</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.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/layui/layui1.js"></script>
    <style>
        /*æ ç¶å¾ç¹å»é«äº®åè²*/
        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
            background: #aef0f7;
        }
    </style>
</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 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">ç©æä»£ç </label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </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="HProcExchBillNo">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <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" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ç©æåç§°</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HName" id="HName">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è§æ ¼åå·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HModel" id="HModel">
                                            </div>
                                        </div>
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è¿æ»¤</label>
                                                <div class="layui-input-block">
                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                    <option value="0" selected="selected"></option>
                                                    <option value="=">=</option>
                                                    <option value=">=">>=</option>
                                                    <option value=">">></option>
                                                    <option value="<="><=</option>
                                                    <option value="<"><</option>
                                                    <option value="<>"><></option>
                                                    <option value="7">åå«</option>
                                                    <option value="8">å·¦åå«</option>
                                                    <option value="9">å³åå«</option>
                                                    <option value="10">ä¸åå«</option>
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row" style="padding:10px 0">
                            <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="TreeTable" class="demo-tree demo-tree-box" style="height: 400px; overflow: scroll;"></div>
                            </div>
                            <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
                                <div>
                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row" style="padding:10px 0">
                            <div class="layui-col-xs12 layui-inline" style="padding-left: 10px;">
                                <div>
                                    <table class="" id="mainTable2" lay-filter="mainTable2"></table>
                                </div>
                            </div>
                        </div>

                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AdutArrangement"><i class="layui-icon layuiiconform"></i>åæ¶æå</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_print"><i class="layui-icon layuiiconform"></i>æå°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>æå</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','tree'], 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
                , tree = layui.tree
            var sWhere = "";

            var option = [];
            var option2 = [];
            var Organization = sessionStorage["Organization"];
            var HModName = "Sc_ProcessExchangeArrangement_PG";
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            var titleData = [];
            //#endregion

            //#region è¿å¥é¡µé¢å³å è½½

            //åå§åçé¢
            set_ClearBill();

            //#endregion

            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //#region å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //åæ¶æç¼¸
                    case 'set_AdutArrangement':
                        set_AdutArrangement();
                        break;
                    //æå°
                    case 'get_print':
                        get_print();
                        break;
                    //éåºæé®
                    case 'btn-Close':
                        parent.layui.admin.events.closeThisTabs();
                        break;
                    //åè®¾ç½®
                    case 'set_HideColumn':
                        get_HideColumn();
                        break;
                };
            });

            table.on('toolbar(mainTable2)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //æç¼¸
                    case 'set_Arrangement':
                        set_Arrangement();
                        break;
                    //éåºæé®
                    case 'btn-Close':
                        parent.layui.admin.events.closeThisTabs();
                        break;
                    //åè®¾ç½®
                    case 'set_HideColumn2':
                        get_HideColumn2();
                        break;
                };
            });
            //#endregion

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

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

            //æ¡å½¢ç åè½¦æ¹æ³
            $('#HProcExchBillNo').on('keydown', function (event) {
                var HBarCode = $('#HProcExchBillNo').val();
                if (event.keyCode == 13) {
                    if (!HBarCode) {
                        layer.msg("æµè½¬å¡å·ä¸è½ä¸ºç©ºï¼")
                        return;
                    }
                    get_FastQuery();
                }
            });

            table.on('row(mainTable)', function (obj) {
                 //éä¸è¡æ¹åé¢è²
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //è®¾ç½®å¤éæ¡éä¸æ ·å¼
                    //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
                    //$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })

            table.on('row(mainTable2)', function (obj) {
                //éä¸è¡æ¹åé¢è²
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //è®¾ç½®å¤éæ¡éä¸æ ·å¼
                    //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
                    //$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
                }
                //mainTable2 ä¸ºè¡¨æ ¼ID   æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
                layui.each(table.cache.mainTable2, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })

            //#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³

            //#region åå§åçé¢
            function set_ClearBill() {
                //æ¥è¯¢
                get_Display(sWhere);
                get_Display2(sWhere);
                get_Display_Tree();
            }
            //#endregion


            //#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HModel").val("");
                $("#HProcExchBillNo").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
                sWhere = "";
            }
            //#endregion
            //#region æ¥è¯¢å·²æ´¾å·¥çæ°æ®
            function get_Display(sWhere) {
                sWhere += "and HSourceID<>0  order by å·¥åºæµè½¬å¡ desc ";
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_ProcessExchangeBillList_PG',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "OperationType": 2},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var totalArray=["æ°é"]
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                }
                                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: 120 });
                                            break;
                                      
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }

                            //å¨ææ¾ç¤ºåå
                             option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 400
                                 , page: true
                                 , totalRow: true
                                , limits: [50, 500, 5000, 50000]
                                 , limit: 50
                                 , cellMinWidth: 90
                                 , done: function (res, curr, count) {
                                     //resä¸ºè¡¨æ ¼çæææ°æ®ï¼currä¸ºå½åé¡µç ï¼countä¸ºæ°æ®æ»æ¡æ°
                                     //éåæ¬é¡µææè¡¨æ ¼æ°æ®çå¼ï¼ä¾æ¬¡å¤ææ¯å¦ä¸ºç©ºé²ä¸ç¶æï¼è¥ä¸æ¯åéè¿data-indexæ¹åè¯¥è¡æ ·å¼
                                     //è¿éitemåindexåå«å¯¹åºæ¯è¡çæ°æ®ådata-indexç´¢å¼å¼
                                     res.data.forEach(function (item, index) {
                                         // console.log(item);
                                         //è¿éçentity_status_id ä¸ºè¡¨æ ¼æ°æ®ä¸çä¸åæ°æ®ï¼ç¨äºå¤æç¹å®è¡
                                         if (item.é¢è²è²å· != null && item.é¢è²è²å· != "") {
                                             //ç¦ç¨å¤éæ¡ï¼è®¾ç½®ä¸å¯éä¸æ è¯ï¼å°è¯¥è¡è®¾ç½®ä¸ºé´å½±è²
                                             var tr = $(".layui-table tr[data-index=" + index + "]");
                                             var td = tr.children('td'); //è·åträ¸ææçtd
                                             td.eq(11).css("background-color", item.é¢è²è²å·);
                                             // tr.find("input[type='checkbox']").next().addClass('layui-btn-disabled');
                                         }
                                     })
                                 }
                            }
                            table.render(option);

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();
                            layer.close(ajaxLoad);
                            //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            //    ColFilter();
                            //}
                            //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 });
                    }
                });
            }
            //#endregion

            //æ¥è¯¢æªæ´¾å·¥çæµè½¬å¡
            function get_Display2(sWhere) {
                sWhere += " and çäº§èµæº is null  and HBillSubType<>'SUB'";
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_ProcessExchangeBillList_PG',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "OperationType": 1 },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var totalArray = ["çææ°é", "ä»»å¡åæ°é", "è®¡åæ°é", "æµè½¬å¡æ°é", "å¼å·¥ä½éå¤©æ°", "å¼å·¥ä½éåºæ°", "ä¸éåºå®å¤©æ°", "å å·¥åä»·", "å å·¥è´¹ç¨éé¢", "æåæ°é", "å©ä½æ°é", "ä¸è¯åå³èæ°é", "è¿ç«å³èæ°é", "åºç«å³èæ°é", "åºç«æ¥åºå³èæ°é"];
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                }
                                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: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }

                            //å¨ææ¾ç¤ºåå
                             option2 = {
                                elem: '#mainTable2'
                                , toolbar: '#toolbarDemo2'
                                , cols: [col]
                                , data: data1.data
                                , height: 400
                                 , page: true
                                 , totalRow: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option2);

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn2();

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            //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 });
                    }
                });
            }


            //æå°
            function get_print() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length == 1) {
                    var linterid = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: 'æå°æ¨¡çéæ©'
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: false //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=Sc_ProcessExchangeArrangement', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
                }
            }

            //#region å¿«éè¿æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                var HModel = $("#HModel").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var ColName = $("#ColName").val();//å¤éæ¡
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (HNumber) {
                    sWhere += " and äº§åä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and äº§ååç§° like '%" + HName + "%'";
                }
                if (HModel) {
                    sWhere += " and è§æ ¼åå· like '%" + HModel + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and å·¥åºæµè½¬å¡ like '%" + HProcExchBillNo + "%'";
                }
                get_Display2(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }
            //#endregion

            var DataSourceID = "";
            //æç¼¸åè½
            function set_Arrangement() {
                var checkStatus = table.checkStatus('mainTable2')
                    , data = checkStatus.data;
                if (checkStatus.data.length > 0) {

                    if (DataSourceID == "" || DataSourceID == "100") {
                       return layer.msg("è¯·éæ©éè¦æ´¾å·¥ççäº§èµæº!");
                    }

                    var HInterID_S = [];
                    for (var i = 0; i < checkStatus.data.length; i++) {
                        HInterID_S.push(data[i].hmainid + "|" + data[i].hsubid);
                    }

                    var wait = layer.load();
                    //é»è¾æ¹æ³
                    $.ajax({
                        url: GetWEBURL() + '/LEMS/ProcessExchangeArrangement_Add_PG',
                        type: "GET",
                        data: { "HInterID_S": HInterID_S.toString(), "HSourceID": DataSourceID, "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            console.log('gouba' + result);
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 }, function () {
                                    // å¾å°frameç´¢å¼
                                    var index = layer.getFrameIndex(window.name);
                                    //å³éå½åframe
                                    layer.close(wait);
                                    get_Display("  and HSourceID=" + DataSourceID);
                                    //ä¿®æ¹ä¸ºååå·æ°çé¢
                                    get_FastQuery();
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                }
                else {
                    layer.msg('è¯·éæ©æ°æ®ï¼');
                }
            }

            //åæ¶æç¼¸
            function set_AdutArrangement() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length > 0) {
                    if (DataSourceID == "" || DataSourceID == "100") {
                        return layer.msg("è¯·éæ©éè¦æ´¾å·¥ççäº§èµæº!");
                    }

                    var HInterID_S = [];
                    for (var i = 0; i < checkStatus.data.length; i++) {
                        HInterID_S.push(data[i].hmainid + "|" + data[i].hsubid);
                    }

                    var wait = layer.load();
                    //é»è¾æ¹æ³
                    $.ajax({
                        url: GetWEBURL() + '/LEMS/ProcessExchangeArrangementDel_PG',
                        type: "GET",
                        data: { "HInterID_S": HInterID_S.toString(), "HSourceID": DataSourceID, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            console.log('gouba' + result);
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 }, function () {
                                    // å¾å°frameç´¢å¼
                                    var index = layer.getFrameIndex(window.name);
                                    //å³éå½åframe
                                    layer.close(wait);
                                    get_Display("  and HSourceID=" + DataSourceID);
                                    //ä¿®æ¹ä¸ºååå·æ°çé¢
                                    get_FastQuery();
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                }
                else {
                    layer.msg('è¯·éæ©æ°æ®ï¼');
                }
            }

            // æ ç¶å¾æ¥è¯¢
            function get_Display_Tree() {
                var sql = " where 1=1 and HUSEORGID=" + sessionStorage["OrganizationID"];
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_Source/Gy_SourceTreeList',
                    type: "GET",
                    data: { "sWhere": sql},
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.close(ajaxLoad);
                            var data = JSON.parse(data1.data);
                            MenuMain(data);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }

            //éåçæä¸»èå
            function MenuMain(data) {
                var liStr = '[';
                //éåçæä¸»èå
                for (var i = 0; i < data.length; i++) {
                    // å¤ææ¯å¦åå¨åèå
                    if (data[i].children != null && data[i].children.length > 0) {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
                        // éåè·ååèå
                        for (var k = 0; k < data[i].children.length; k++) {
                            liStr += getChildMenu(data[i].children[k], 0);
                        }
                        liStr = liStr.substring(0, liStr.length - 1);
                        liStr += ']},';
                    } else {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
                    }
                };
                liStr = liStr.substring(0, liStr.length - 1);
                liStr += "]";
                var treeTable = JSON.parse(liStr);
                tree.render({
                    elem: '#TreeTable' //é»è®¤æ¯ç¹å»èç¹å¯è¿è¡æ¶ç¼©
                    , data: treeTable
                    , click: function (obj) {
                        //é«äº®åè²
                        $(".layui-tree-set").removeClass('layui-tree-set-active');
                        obj.elem.addClass('layui-tree-set-active');

                        var data = obj.data;  //è·åå½åç¹å»çèç¹æ°æ®
                        DataSourceID = data.id;
                        var sql = "";
                        if (data.id == "100") {
                            sql = "  ";
                        } else if (data.id == "0") {
                            sql = "";
                        } else {
                            sql = " and HSourceID='" + data.id + "' ";
                        }
                        get_Display(sql);
                    }
                });
            }

            // éå½çæåèå
            function getChildMenu(subMenu, num) {
                num++;
                var subStr = '';
                if (subMenu.children != null && subMenu.children.length > 0) {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
                    for (var j = 0; j < subMenu.children.length; j++) {
                        subStr += getChildMenu(subMenu.children[j], num);
                        if (j + 1 == subMenu.children.length) {
                            subStr = subStr.substring(0, subStr.length - 1);
                        }
                    }
                    subStr += ']},';
                } else {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
                }
                return subStr;
            }

            //#region éèåè®¾ç½®
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length ; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç 

                contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                    , title: "éèåè®¾ç½®"  //æ é¢
                    , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: [contentUrl, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
                })
            }

            function get_HideColumn2() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option2.cols[0].length; i++) {
                    colName += option2.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç 

                contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName+"Main" + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                    , title: "éèåè®¾ç½®"  //æ é¢
                    , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: [contentUrl, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn2();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
                })
            }
            //#endregion

            //#region æ¾ç¤ºåæ°æ®
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {


                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                           /* var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±*/

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

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //éèå
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //è®¾ç½®åå®½
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //è®¾ç½®åå®¹åä½å¤§å°
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //è®¾ç½®åå®½
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //æ¾ç¤ºå
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //åæ¶å»ç»å
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //å»ç»å
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                })
            }
            //#endregion


            function DisPlay_HideColumn2() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName+"Main", "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {


                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                            /* var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±*/

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

                            for (var i = 0; i < option2.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //éèå
                                if (dataCols[1] == 1) {
                                    option2.cols[0][i + 1]["hide"] = true;
                                }
                                //è®¾ç½®åå®½
                                if (dataCols[3] > 0) {
                                    option2.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //è®¾ç½®åå®¹åä½å¤§å°
                                if (data1.data[0].HFontSize != 0) {
                                    option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option2.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //è®¾ç½®åå®½
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //æ¾ç¤ºå
                                if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
                                    option2.cols[0][i + 1]["hide"] = false;
                                }
                                //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option2.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option2.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option2.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //åæ¶å»ç»å
                            for (var i = 1; i < option2.cols[0].length - 1; i++) {
                                if (option2.cols[0][i]["fixed"] != null) {
                                    option2.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //å»ç»å
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option2.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option2);
                        } else {
                            table.render(option2);
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                })
            }

            //#region åææ¾ç¤ºä¸ææ¡
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option2.cols[0].length; i++) {
                    if (option2.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option2.cols[0][i].field + '">' + option2.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }
            //#endregion
        });
            //#endregion
    </script>

</body>
</html>

			@@ -364,6 +364,7 @@
			<Content Include="views\è®¾å¤ç®¡ç\è®¾å¤åæºå\Sb_EquipStopBillList.html" />
			<Content Include="views\è®¾å¤ç®¡ç\è®¾å¤å¼æºå\Sb_EquipBeginBill.html" />
			<Content Include="views\è®¾å¤ç®¡ç\è®¾å¤å¼æºå\Sb_EquipBeginBillList.html" />
			<Content Include="views\è½¦é´ç®¡ç\å·¥åºæµè½¬å¡\Sc_ProcessExchangeArrangement_PG.html" />
			<Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\Kf_PressurizedWaterNoOutReport.html" />
			<Content Include="views\è½¦é´ç®¡ç\é²ééªè¯\Gy_MaterPreventErrMouldBill.html" />
			<Content Include="views\è½¦é´ç®¡ç\é²ééªè¯\Gy_MaterPreventErrMouldBillList.html" />

			@@ -501,6 +501,7 @@
			<dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/MES_SampleRecordBillList.html">è¯æ ·è®°å½ååè¡¨</a></dd>
			<dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/MES_ColorRecordBillList.html">å¯¹è²è®°å½ååè¡¨</a></dd>
			<dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeArrangement.html">å·¥åºæµè½¬å¡æç¼¸</a></dd>
			<dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeArrangement_PG.html">å·¥åºæµè½¬å¡æ´¾å·¥</a></dd>
			<dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeIssueBillList.html">å·¥åºæµè½¬å¡ï¼ä¸è¾¾ï¼</a></dd>
			<dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcExchWorkBackBillList.html">å·¥åºè¿å·¥ç³è¯·åè¡¨</a></dd>
			<!--<dd><a lay-href="è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcExchWorkBackBillEdit.html">å·¥åºè¿å·¥ç³è¯·</a></dd>-->

			@@ -970,7 +970,7 @@
			}

			function save(data) {

			var index = layer.load();
			var sMainStr = JSON.stringify(data.field);
			var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
			if (!AllowLoadData())//æ°æ®éªè¯
			@@ -998,6 +998,7 @@
			layer.close(index);
			}
			});
			layer.close(index);

			//layer.confirm(data.Message, {
			// btn: ['ç¡®è®¤']
			@@ -1014,10 +1015,12 @@
			}
			else {
			layer.alert(data.Message, { icon: 5 })
			layer.close(index);
			}
			},
			error: function (err) {
			layer.alert(err, { icon: 5 })
			layer.close(index);
			}
			})
			}