MES-WEB-LayUI.git

parent: a108ec73 | 补丁 | 提交 | ignore whitespace

yangle

2023-07-18 a30bcc5d636f04898c6c1fcd40305b5e9a1fc2bb

工厂日历
功能优化

9个文件已修改

2个文件已添加

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html	548 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcExchRecordBackBillList.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillList.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillQuery_Mobile.html	297 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -209,6 +209,7 @@
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
    <Content Include="views\æ¡ç æç»\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\çäº§ç®¡ç\æ¥è®¡ååºç¡èµæ\Cg_PODemandPlanConfigBill_Excel.html" />
    <Content Include="views\çäº§ç®¡ç\çäº§è®¡åå¹³å°\Sc_ShopCalendar.html" />
    <Content Include="views\ç³»ç»ç®¡ç\å¿«æ·æ¹å¼èªå®ä¹\Xt_UserFastMenu.html" />
    <Content Include="views\ç³»ç»ç®¡ç\å¿«æ·æ¹å¼èªå®ä¹\Xt_UserFastMenu_IconSet.html" />
    <Content Include="views\ç³»ç»ç®¡ç\æé®è®¾ç½®\Xt_ModuleButtonSet.html" />

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

@@ -254,6 +254,7 @@
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                        var data = result.data;

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

New file
@@ -0,0 +1,548 @@
ï»¿<!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/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/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <script src="../../../layuiadmin/layui/layui1.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 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" style="width:100px">
                                        <select name="HDate" lay-verify="required" id="HDate">
                                         <!--å¨æè·åæ¥æ-->
                                        </select>
                                    </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>
                        </div>
                        <div class="layui-row" style="padding:10px 0">
                            <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="TreeTable" class="demo-tree demo-tree-box"></div>
                            </div>
                            <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 83%">
                                <div>
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
                                    <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
                                    <table class="layui-hide" id="mainTable5" lay-filter="mainTable5"></table>
                                    <table class="layui-hide" id="mainTable6" lay-filter="mainTable6"></table>
                                    <table class="layui-hide" id="mainTable7" lay-filter="mainTable7"></table>
                                    <table class="layui-hide" id="mainTable8" lay-filter="mainTable8"></table>
                                    <table class="layui-hide" id="mainTable9" lay-filter="mainTable9"></table>
                                    <table class="layui-hide" id="mainTable10" lay-filter="mainTable10"></table>
                                    <table class="layui-hide" id="mainTable11" lay-filter="mainTable11"></table>
                                    <table class="layui-hide" id="mainTable12" lay-filter="mainTable12"></table>
                                </div>
                            </div>
                        </div>
                      
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>
<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
                , util = layui.util
                , tree = layui.tree
            var TagId = "";
            var option1 = [];
            var option2 = [];
            var option3 = [];
            var option4 = [];
            var option5 = [];
            var option6 = [];
            var option7 = [];
            var option8 = [];
            var option9 = [];
            var option10 = [];
            var option11 = [];
            var option12 = [];
            //#endregion

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

            set_ClearBill();

            //#endregion


            //#region ç¹å»äºä»¶åæ¬on formäºä»¶ç

            //è¡åé¼ æ ç¦»å¼äºä»¶
            table.on('edit(mainTable1)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;
              
                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable2)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable3)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable4)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable5)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable6)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable7)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable8)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable9)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable10)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable11)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable12)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

                Save(hdate, hvalue, TagId)
            })


            //å¿«éè¿æ»¤
            form.on('submit(btnSearch)', function (data) {
                var Year = new Date($("#HDate").val()).getFullYear();
                //åå§åè¡¨æ ¼
                set_InitGrid(Year, 1, "");
                set_InitGrid(Year, 2, "");
                set_InitGrid(Year, 3, "");
                set_InitGrid(Year, 4, "");
                set_InitGrid(Year, 5, "");
                set_InitGrid(Year, 6, "");
                set_InitGrid(Year, 7, "");
                set_InitGrid(Year, 8, "");
                set_InitGrid(Year, 9, "");
                set_InitGrid(Year, 10, "");
                set_InitGrid(Year, 11, "");
                set_InitGrid(Year, 12, "");
                get_Display_Tree();
                get_Display("");
            });

            //#endregion

            //#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³
            function set_ClearBill() {
                getDate();
                //è·åå¹´
                var Year = new Date($("#HDate").val()).getFullYear();
                //åå§åè¡¨æ ¼
                set_InitGrid(Year, 1,"");
                set_InitGrid(Year, 2, "");
                set_InitGrid(Year, 3, "");
                set_InitGrid(Year, 4, "");
                set_InitGrid(Year, 5, "");
                set_InitGrid(Year, 6, "");
                set_InitGrid(Year, 7, "");
                set_InitGrid(Year, 8, "");
                set_InitGrid(Year, 9, "");
                set_InitGrid(Year, 10, "");
                set_InitGrid(Year, 11, "");
                set_InitGrid(Year, 12, "");
                get_Display_Tree();
                get_Display("");
            }

            function getDate() {
                var NowDate = new Date().getFullYear();
                var sqlDate = '<option  style="color:blue;" value="' + NowDate + '">' + NowDate +'</option>';
                for (var i = 1; i <= 10; i++) {
                    sqlDate += '<option  style="color:blue;" value="' + (NowDate - i) + '">' + (NowDate - i) + '</option>';
                }
                $("#HDate").empty();
                $("#HDate").append(sqlDate);
                form.render('select');
            }

            //æä»½
            function set_InitGrid(Year,Month,num) {
                var SumMonth = new Date(Year, Month, 0).getDate(); //å¨æè·åæå¤©æ°
                var col = [];
                var colData = "{";
                col.push({ field: "æä»½", title: "æä»½", width: 60 })
                colData += "\"æä»½\":\"" + Month+"æ\",";
                for (var j = 1; j <= SumMonth; j++) {
                    col.push({ field: Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd'), title: Format(Year + '/' + Month + '/' + j, 'dd'), width: 50, edit: 'text' })
                    colData += "\"" + Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd') + "\":\"" + num + "\",";
                }
                colData = colData.substr(0, colData.length - 1);
                colData += "}";
               var option = {
                    elem: '#mainTable' + Month
                    , cellMinWidth: 120
                    , limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
                    , height: 100
                    , cols: [col]
                   , data: [JSON.parse(colData)]
                   , done: function (res, curr, count) {
                       var NowDate = Format(new Date(), "yyyy-MM-dd");
                       var Month = new Date().getMonth() + 1 + "æ";
                       
                       for (var i in res.data) {
                           var item = res.data[i];
                           if (item["æä»½"] == Month) {
                               for (var j = 0; j < option.cols[0].length; j++) {
                                   if (option.cols[0][j].field == NowDate) {
                                       option.cols[0][j]["style"] = "    background-color: #59c5ea";
                                   }
                               }
                           }
                       }
                   }
                };
                table.render(option);

                switch (Month) {
                    case 1 :
                        option1 = option;
                        break;
                    case 2:
                        option2 = option;
                        break;
                    case 3:
                        option3 = option;
                        break;
                    case 4:
                        option4= option;
                        break;
                    case 5:
                        option5= option;
                        break;
                    case 6:
                        option6= option;
                        break;
                    case 7:
                        option7= option;
                        break;
                    case 8:
                        option8= option;
                        break;
                    case 9:
                        option9= option;
                        break;
                    case 10:
                        option10= option;
                        break;
                    case 11:
                        option11= option;
                        break;
                    case 12:
                        option12= option;
                        break;
                }
            }

            //æ¥è¯¢æ°æ®
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/MaterOutEntryReport/Sc_ShopCalendar',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var Year = new Date($("#HDate").val()).getFullYear();
                            var num = "";
                            if (data1.data.length != 0) {
                                set_InitGrid(Year, 1, num);
                                set_InitGrid(Year, 2, num);
                                set_InitGrid(Year, 3, num);
                                set_InitGrid(Year, 4, num);
                                set_InitGrid(Year, 5, num);
                                set_InitGrid(Year, 6, num);
                                set_InitGrid(Year, 7, num);
                                set_InitGrid(Year, 8, num);
                                set_InitGrid(Year, 9, num);
                                set_InitGrid(Year, 10, num);
                                set_InitGrid(Year, 11, num);
                                set_InitGrid(Year, 12, num);
                                for (var i = 0; i < data1.data.length; i++) {
                                    var Month = new Date(data1.data[i]["æ¥æ"]).getMonth() + 1;
                                    switch (Month) {
                                        case 1:
                                            option1.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 2:
                                            option2.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 3:
                                            option3.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 4:
                                            option4.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 5:
                                            option5.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 6:
                                            option6.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 7:
                                            option7.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 8:
                                            option8.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 9:
                                            option9.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 10:
                                            option10.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 11:
                                            option11.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                        case 12:
                                            option12.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
                                            break;
                                    }
                                }
                            } else {
                                num = 8;
                                set_InitGrid(Year, 1, num);
                                set_InitGrid(Year, 2, num);
                                set_InitGrid(Year, 3, num);
                                set_InitGrid(Year, 4, num);
                                set_InitGrid(Year, 5, num);
                                set_InitGrid(Year, 6, num);
                                set_InitGrid(Year, 7, num);
                                set_InitGrid(Year, 8, num);
                                set_InitGrid(Year, 9, num);
                                set_InitGrid(Year, 10, num);
                                set_InitGrid(Year, 11, num);
                                set_InitGrid(Year, 12, num);
                            }
                            table.render(option1);
                            table.render(option2);
                            table.render(option3);
                            table.render(option4);
                            table.render(option5);
                            table.render(option6);
                            table.render(option7);
                            table.render(option8);
                            table.render(option9);
                            table.render(option10);
                            table.render(option11);
                            table.render(option12);
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }

            // æ ç¶å¾æ¥è¯¢
            function get_Display_Tree() {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/MaterOutEntryReport/Gy_SourceList',
                    type: "GET",
                    async: false,
                    data: { "HOrgid": sessionStorage["OrganizationID"] },
                    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) {
                        var data = obj.data;  //è·åå½åç¹å»çèç¹æ°æ®
                        TagId = data.id;
                        var sql = "";
                        var HDate = $("#HDate").val();
                        if (data.id == "0") {
                            sql = " and æ¥æ like'%" + HDate + "%'";
                        } else {
                            sql = " and HSourceID='" + data.id + "' and æ¥æ like'%" + HDate+"%'";
                        }
                        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;
            }

            //ä¿å
            function Save(hdate, hvalue, TagId) {
                if (TagId == "") {
                    return layer.msg("è¯·åéæ©çäº§èµæº!");
                }
                var reg = /^\d+(\.\d+)?$/;
                if (reg.test(hvalue) == false || hvalue == "" || hvalue == "0") {
                    layer.msg("æ°éå¿é¡»ä¸ºæ°éæå°æ°");
                    return false;
                }

                var sMainSub = hdate + ";" + hvalue + ";" + TagId + ";" + sessionStorage["HUserName"];

                $.ajax({
                    url: GetWEBURL() + '/MaterOutEntryReport/Sc_ShopCalendarSave',
                    type: "POST",
                    async: false,
                    data: { "sMainSub": sMainSub },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.msg(data1.Message);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }
            //#endregion
     

          
            //ä»¥ä¸æ¯layuiæ¨¡å
        });




</script>

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò·¢³öµ¥/Cj_StationEntrustInBill.html

@@ -395,7 +395,7 @@
                    <!--éèåæ®µ-->
                    <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
                    <input type="hidden" name="HMaker" id="HMaker"><!--å¶åäºº-->
                    <!--<input type="hidden" name="HMaker" id="HMaker">--><!--å¶åäºº-->
                    <input type="hidden" name="eventType" id="eventType" value="Add">
                </form>
            </div>

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBill.html

@@ -1015,7 +1015,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../../views/åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html', 'yes'],
                    content: ['../../views/åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {
                        //æé®ãæé®ä¸ãçåè°

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

@@ -227,6 +227,7 @@
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                        var data = result.data;

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

@@ -226,6 +226,7 @@
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                        var data = result.data;

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

New file
@@ -0,0 +1,297 @@
ï»¿<!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/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/grwebapp.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 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-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 class="layui-inline">
                                        <label class="layui-form-label">å®¢æ·</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HCurName" id="HCurName">
                                        </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>
                                <div class="layui-colla-content" style="padding: 0px;">
                                    <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">
                                                <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>
                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
    }).extend({
        index: 'lib/index', //ä¸»å¥å£æ¨¡å
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
        var sWhere = "";
        var option = [];

        //#endregion

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

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

        //#endregion

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

        //#region å¤´å·¥å·æ äºä»¶
        table.on('toolbar(mainTable)', function (obj) {
            switch (obj.event) {
                //å·æ°
                case 'get_Refresh': get_Refresh();
                    break;
                //éåºæé®
                case 'get_Exit': Pub_Close(2);
                    break;
                //åè®¾ç½®
                case 'set_HideColumn': get_HideColumn();
                    break;
            };
        });

        //#endregion

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

        //éç½®æé®
        form.on('submit(btnReSearch)', function (data) {

            set_ClearQuery();
        });
        //#endregion

        //#region æ¤é¡µé¢ææçæ¹æ³

        //è·åç»ç»

        //#region åå§åçé¢
        function set_ClearBill() {
            //åå§åè¡¨æ ¼
            set_InitGrid();
            //æ¥è¯¢
            get_FastQuery();
        }
        //#endregion

        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , loading: false
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: 'å®¢æ·', title: 'å®¢æ·', sort: true, width: 120 }
                    , { field: 'äº§åè§æ ¼', title: 'äº§åè§æ ¼', width: 120 }
                    , { field: 'åæ®å·', title: 'åæ®å·', width: 120 }
                    , { field: 'å½åå·¥åº', title: 'å½åå·¥åº', width: 120 }
                    , { field: 'æ¥æ', title: 'æ¥æ', width: 120 }
                    , { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 100 }
                    ]]
            };
        }

        //#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
        function set_ClearQuery() {
            $("#HBillNo").val("");//åæ®å·
            $("#HCurName").val("");
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            form.render('select');
            $("#btnSearch").click();
            sWhere = "";
        }
        //#endregion

        //#region æ¥è¯¢
        function get_Display(sWhere) {
            //sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }
            });
        }
        //#endregion

        //#region å¿«éè¿æ»¤
        function get_FastQuery() {
           
            var HCurName = $("#HCurName").val();
            var HBillNo = $("#HBillNo").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;
            }


            var HOrgID= sessionStorage["OrganizationID"];

            if (HCurName) {
                sWhere += " and å®¢æ· like '%" + HCurName + "%'";
            }
            if (HBillNo) {
                sWhere += " and åæ®å· like '%" + HBillNo + "%'";
            }
            if (HOrgID) {
                sWhere += " and HPRDORGID = '" + HOrgID + "'";
            }
            get_Display(sWhere);
            sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
        }
        //#endregion

        //#endregion

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

        //ä»¥ä¸æ¯layuiæ¨¡å
    });




</script>

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

@@ -248,6 +248,7 @@
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;

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

@@ -231,6 +231,7 @@
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                        var data = result.data;

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁÏ³ö¿â/Kf_MateOutBill_Fast.html

@@ -1409,8 +1409,8 @@
                            }
                            layer.load(3);
                            element.tabChange('tab-MateOutBill', '2');
                            //æ«æºåæååï¼åæ æ¾ç¤ºå°ä»åºä¸
                            $("#HBarCode").focus();
                            //æ«æºåæååï¼åæ æ¾ç¤ºå°ä»ä½ä¸
                            $("#HStockPlaceName").focus();
                            //æ¾ç¤ºè¡¨ä½æç»
                            DisBillEntryList();
                        }
@@ -1873,7 +1873,7 @@
                            table.render(listOption);
                            FIFOlistOption.data = result.data.FIFOlist;
                            table.render(FIFOlistOption);

                            if (result.data.BarCodeDetailslist[0])
                            $("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
                            $("#HMaterName_B").val(result.data.BarCodeDetailslist[0].HMaterName);
                            $("#HMaterModel_B").val(result.data.BarCodeDetailslist[0].HMaterModel);

			@@ -209,6 +209,7 @@
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
			<Content Include="views\æ¡ç æç»\Kf_BarCodeDetailQuery.html" />
			<Content Include="views\çäº§ç®¡ç\æ¥è®¡ååºç¡èµæ\Cg_PODemandPlanConfigBill_Excel.html" />
			<Content Include="views\çäº§ç®¡ç\çäº§è®¡åå¹³å°\Sc_ShopCalendar.html" />
			<Content Include="views\ç³»ç»ç®¡ç\å¿«æ·æ¹å¼èªå®ä¹\Xt_UserFastMenu.html" />
			<Content Include="views\ç³»ç»ç®¡ç\å¿«æ·æ¹å¼èªå®ä¹\Xt_UserFastMenu_IconSet.html" />
			<Content Include="views\ç³»ç»ç®¡ç\æé®è®¾ç½®\Xt_ModuleButtonSet.html" />

			@@ -254,6 +254,7 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;

New file
			@@ -0,0 +1,548 @@
			ï»¿<!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/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/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/grwebapp.js"></script>
			<script src="../../../layuiadmin/layui/layui1.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 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" style="width:100px">
			<select name="HDate" lay-verify="required" id="HDate">
			<!--å¨æè·åæ¥æ-->
			</select>
			</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>
			</div>
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box"></div>
			</div>
			<div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 83%">
			<div>
			<table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
			<table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
			<table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
			<table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
			<table class="layui-hide" id="mainTable5" lay-filter="mainTable5"></table>
			<table class="layui-hide" id="mainTable6" lay-filter="mainTable6"></table>
			<table class="layui-hide" id="mainTable7" lay-filter="mainTable7"></table>
			<table class="layui-hide" id="mainTable8" lay-filter="mainTable8"></table>
			<table class="layui-hide" id="mainTable9" lay-filter="mainTable9"></table>
			<table class="layui-hide" id="mainTable10" lay-filter="mainTable10"></table>
			<table class="layui-hide" id="mainTable11" lay-filter="mainTable11"></table>
			<table class="layui-hide" id="mainTable12" lay-filter="mainTable12"></table>
			</div>
			</div>
			</div>

			</form>
			</div>
			</div>
			</div>
			</div>
			</body>
			</html>
			<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
			, util = layui.util
			, tree = layui.tree
			var TagId = "";
			var option1 = [];
			var option2 = [];
			var option3 = [];
			var option4 = [];
			var option5 = [];
			var option6 = [];
			var option7 = [];
			var option8 = [];
			var option9 = [];
			var option10 = [];
			var option11 = [];
			var option12 = [];
			//#endregion

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

			set_ClearBill();

			//#endregion


			//#region ç¹å»äºä»¶åæ¬on formäºä»¶ç

			//è¡åé¼ æ ç¦»å¼äºä»¶
			table.on('edit(mainTable1)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable2)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable3)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable4)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable5)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable6)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable7)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable8)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable9)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable10)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable11)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})
			table.on('edit(mainTable12)', function (obj) {
			var hdate = obj.field;
			var hvalue = obj.value;

			Save(hdate, hvalue, TagId)
			})


			//å¿«éè¿æ»¤
			form.on('submit(btnSearch)', function (data) {
			var Year = new Date($("#HDate").val()).getFullYear();
			//åå§åè¡¨æ ¼
			set_InitGrid(Year, 1, "");
			set_InitGrid(Year, 2, "");
			set_InitGrid(Year, 3, "");
			set_InitGrid(Year, 4, "");
			set_InitGrid(Year, 5, "");
			set_InitGrid(Year, 6, "");
			set_InitGrid(Year, 7, "");
			set_InitGrid(Year, 8, "");
			set_InitGrid(Year, 9, "");
			set_InitGrid(Year, 10, "");
			set_InitGrid(Year, 11, "");
			set_InitGrid(Year, 12, "");
			get_Display_Tree();
			get_Display("");
			});

			//#endregion

			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³
			function set_ClearBill() {
			getDate();
			//è·åå¹´
			var Year = new Date($("#HDate").val()).getFullYear();
			//åå§åè¡¨æ ¼
			set_InitGrid(Year, 1,"");
			set_InitGrid(Year, 2, "");
			set_InitGrid(Year, 3, "");
			set_InitGrid(Year, 4, "");
			set_InitGrid(Year, 5, "");
			set_InitGrid(Year, 6, "");
			set_InitGrid(Year, 7, "");
			set_InitGrid(Year, 8, "");
			set_InitGrid(Year, 9, "");
			set_InitGrid(Year, 10, "");
			set_InitGrid(Year, 11, "");
			set_InitGrid(Year, 12, "");
			get_Display_Tree();
			get_Display("");
			}

			function getDate() {
			var NowDate = new Date().getFullYear();
			var sqlDate = '<option style="color:blue;" value="' + NowDate + '">' + NowDate +'</option>';
			for (var i = 1; i <= 10; i++) {
			sqlDate += '<option style="color:blue;" value="' + (NowDate - i) + '">' + (NowDate - i) + '</option>';
			}
			$("#HDate").empty();
			$("#HDate").append(sqlDate);
			form.render('select');
			}

			//æä»½
			function set_InitGrid(Year,Month,num) {
			var SumMonth = new Date(Year, Month, 0).getDate(); //å¨æè·åæå¤©æ°
			var col = [];
			var colData = "{";
			col.push({ field: "æä»½", title: "æä»½", width: 60 })
			colData += "\"æä»½\":\"" + Month+"æ\",";
			for (var j = 1; j <= SumMonth; j++) {
			col.push({ field: Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd'), title: Format(Year + '/' + Month + '/' + j, 'dd'), width: 50, edit: 'text' })
			colData += "\"" + Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd') + "\":\"" + num + "\",";
			}
			colData = colData.substr(0, colData.length - 1);
			colData += "}";
			var option = {
			elem: '#mainTable' + Month
			, cellMinWidth: 120
			, limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
			, height: 100
			, cols: [col]
			, data: [JSON.parse(colData)]
			, done: function (res, curr, count) {
			var NowDate = Format(new Date(), "yyyy-MM-dd");
			var Month = new Date().getMonth() + 1 + "æ";

			for (var i in res.data) {
			var item = res.data[i];
			if (item["æä»½"] == Month) {
			for (var j = 0; j < option.cols[0].length; j++) {
			if (option.cols[0][j].field == NowDate) {
			option.cols[0][j]["style"] = " background-color: #59c5ea";
			}
			}
			}
			}
			}
			};
			table.render(option);

			switch (Month) {
			case 1 :
			option1 = option;
			break;
			case 2:
			option2 = option;
			break;
			case 3:
			option3 = option;
			break;
			case 4:
			option4= option;
			break;
			case 5:
			option5= option;
			break;
			case 6:
			option6= option;
			break;
			case 7:
			option7= option;
			break;
			case 8:
			option8= option;
			break;
			case 9:
			option9= option;
			break;
			case 10:
			option10= option;
			break;
			case 11:
			option11= option;
			break;
			case 12:
			option12= option;
			break;
			}
			}

			//æ¥è¯¢æ°æ®
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/MaterOutEntryReport/Sc_ShopCalendar',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere},
			success: function (data1) {
			if (data1.count == 1) {
			var Year = new Date($("#HDate").val()).getFullYear();
			var num = "";
			if (data1.data.length != 0) {
			set_InitGrid(Year, 1, num);
			set_InitGrid(Year, 2, num);
			set_InitGrid(Year, 3, num);
			set_InitGrid(Year, 4, num);
			set_InitGrid(Year, 5, num);
			set_InitGrid(Year, 6, num);
			set_InitGrid(Year, 7, num);
			set_InitGrid(Year, 8, num);
			set_InitGrid(Year, 9, num);
			set_InitGrid(Year, 10, num);
			set_InitGrid(Year, 11, num);
			set_InitGrid(Year, 12, num);
			for (var i = 0; i < data1.data.length; i++) {
			var Month = new Date(data1.data[i]["æ¥æ"]).getMonth() + 1;
			switch (Month) {
			case 1:
			option1.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 2:
			option2.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 3:
			option3.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 4:
			option4.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 5:
			option5.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 6:
			option6.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 7:
			option7.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 8:
			option8.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 9:
			option9.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 10:
			option10.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 11:
			option11.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			case 12:
			option12.data[0][data1.data[i]["æ¥æ"]] = data1.data[i]["å çå·¥æ¶"];
			break;
			}
			}
			} else {
			num = 8;
			set_InitGrid(Year, 1, num);
			set_InitGrid(Year, 2, num);
			set_InitGrid(Year, 3, num);
			set_InitGrid(Year, 4, num);
			set_InitGrid(Year, 5, num);
			set_InitGrid(Year, 6, num);
			set_InitGrid(Year, 7, num);
			set_InitGrid(Year, 8, num);
			set_InitGrid(Year, 9, num);
			set_InitGrid(Year, 10, num);
			set_InitGrid(Year, 11, num);
			set_InitGrid(Year, 12, num);
			}
			table.render(option1);
			table.render(option2);
			table.render(option3);
			table.render(option4);
			table.render(option5);
			table.render(option6);
			table.render(option7);
			table.render(option8);
			table.render(option9);
			table.render(option10);
			table.render(option11);
			table.render(option12);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			// æ ç¶å¾æ¥è¯¢
			function get_Display_Tree() {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/MaterOutEntryReport/Gy_SourceList',
			type: "GET",
			async: false,
			data: { "HOrgid": sessionStorage["OrganizationID"] },
			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) {
			var data = obj.data; //è·åå½åç¹å»çèç¹æ°æ®
			TagId = data.id;
			var sql = "";
			var HDate = $("#HDate").val();
			if (data.id == "0") {
			sql = " and æ¥æ like'%" + HDate + "%'";
			} else {
			sql = " and HSourceID='" + data.id + "' and æ¥æ like'%" + HDate+"%'";
			}
			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;
			}

			//ä¿å
			function Save(hdate, hvalue, TagId) {
			if (TagId == "") {
			return layer.msg("è¯·åéæ©çäº§èµæº!");
			}
			var reg = /^\d+(\.\d+)?$/;
			if (reg.test(hvalue) == false \|\| hvalue == "" \|\| hvalue == "0") {
			layer.msg("æ°éå¿é¡»ä¸ºæ°éæå°æ°");
			return false;
			}

			var sMainSub = hdate + ";" + hvalue + ";" + TagId + ";" + sessionStorage["HUserName"];

			$.ajax({
			url: GetWEBURL() + '/MaterOutEntryReport/Sc_ShopCalendarSave',
			type: "POST",
			async: false,
			data: { "sMainSub": sMainSub },
			success: function (data1) {
			if (data1.count == 1) {
			layer.msg(data1.Message);
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion



			//ä»¥ä¸æ¯layuiæ¨¡å
			});




			</script>

			@@ -395,7 +395,7 @@
			<!--éèåæ®µ-->
			<input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
			<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
			<input type="hidden" name="HMaker" id="HMaker"><!--å¶åäºº-->
			<!--<input type="hidden" name="HMaker" id="HMaker">--><!--å¶åäºº-->
			<input type="hidden" name="eventType" id="eventType" value="Add">
			</form>
			</div>

			@@ -1015,7 +1015,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../../views/åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html', 'yes'],
			content: ['../../views/åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°

			@@ -227,6 +227,7 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;

			@@ -226,6 +226,7 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;

New file
			@@ -0,0 +1,297 @@
			ï»¿<!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/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/grwebapp.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 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-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 class="layui-inline">
			<label class="layui-form-label">å®¢æ·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HCurName" id="HCurName">
			</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>
			<div class="layui-colla-content" style="padding: 0px;">
			<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">
			<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>
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			</form>
			</div>
			</div>
			</div>
			</div>
			</body>
			</html>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
			var sWhere = "";
			var option = [];

			//#endregion

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

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

			//#endregion

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

			//#region å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			//éåºæé®
			case 'get_Exit': Pub_Close(2);
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			};
			});

			//#endregion

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

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {

			set_ClearQuery();
			});
			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³

			//è·åç»ç»

			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_FastQuery();
			}
			//#endregion

			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, loading: false
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'å®¢æ·', title: 'å®¢æ·', sort: true, width: 120 }
			, { field: 'äº§åè§æ ¼', title: 'äº§åè§æ ¼', width: 120 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 120 }
			, { field: 'å½åå·¥åº', title: 'å½åå·¥åº', width: 120 }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 120 }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 100 }
			]]
			};
			}

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			$("#HBillNo").val("");//åæ®å·
			$("#HCurName").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			form.render('select');
			$("#btnSearch").click();
			sWhere = "";
			}
			//#endregion

			//#region æ¥è¯¢
			function get_Display(sWhere) {
			//sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(ajaxLoad);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {

			var HCurName = $("#HCurName").val();
			var HBillNo = $("#HBillNo").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;
			}


			var HOrgID= sessionStorage["OrganizationID"];

			if (HCurName) {
			sWhere += " and å®¢æ· like '%" + HCurName + "%'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HOrgID) {
			sWhere += " and HPRDORGID = '" + HOrgID + "'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion

			//#endregion

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

			//ä»¥ä¸æ¯layuiæ¨¡å
			});




			</script>

			@@ -248,6 +248,7 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;

			@@ -231,6 +231,7 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;

			@@ -1409,8 +1409,8 @@
			}
			layer.load(3);
			element.tabChange('tab-MateOutBill', '2');
			//æ«æºåæååï¼åæ æ¾ç¤ºå°ä»åºä¸
			$("#HBarCode").focus();
			//æ«æºåæååï¼åæ æ¾ç¤ºå°ä»ä½ä¸
			$("#HStockPlaceName").focus();
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			}
			@@ -1873,7 +1873,7 @@
			table.render(listOption);
			FIFOlistOption.data = result.data.FIFOlist;
			table.render(FIFOlistOption);

			if (result.data.BarCodeDetailslist[0])
			$("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
			$("#HMaterName_B").val(result.data.BarCodeDetailslist[0].HMaterName);
			$("#HMaterModel_B").val(result.data.BarCodeDetailslist[0].HMaterModel);