MES-WEB-LayUI.git

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

yusijie

2022-11-29 1603ece6f9df9b9c6853a2f2a60b9fda3443b199

产品与器具；工序流转卡；...

8个文件已修改

	WebTM/views/基础资料/公用基础资料/Gy_TechParamByProc.html	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_TechParamByProcList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/基础资料/Gy_MateMould.html	95 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/基础资料/Gy_MateMouldList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBill.html	123 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/报表分析/ProductionPlanReportList.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -243,6 +243,7 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            var sWhere = "";
            var date = new Date();
@@ -373,6 +374,24 @@

            //è¡åäºä»¶
            table.on('tool(mainTable)', function (obj) {

                var data = obj.data;
                if (obj.event == 'Date') {
                    var field = $(this).data('field');
                    laydate.render({
                        elem: this.firstChild
                        , show: true //ç´æ¥æ¾ç¤º
                        , closeStop: this
                        , done: function (nowDate) {
                            //æ¶é´éæ©å®æï¼è¡æ°æ®æ´æ°
                            data[field] = nowDate;
                            obj.update(data);
                            //å·æ°å¤éæ¡
                            //checkRefresh();
                        }
                    });
                }

                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event == 'HProcCheck') {
@@ -844,7 +863,7 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200, event: 'Date' });
                                            break;
                                        default:
                                            if (data[i].name == 'ç©æä»£ç ') {

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

@@ -75,7 +75,7 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MateMould.html

@@ -33,6 +33,7 @@
            margin-left: -15px;
            margin-right: -15px;
        }

    </style>
</head>
<body>
@@ -59,7 +60,7 @@
                                            <label class="layui-form-label">åºå®é¡¹ç®</label>
                                            <div class="layui-input-block">
                                                <input type="radio" name="FixedItems" value="SMater" title="ç©æ">
                                                <input type="radio" name="FixedItems" value="SRelation" title="æ¨¡å·">
                                                <input type="radio" name="FixedItems" value="SMould" title="æ¨¡å·">
                                                <input type="radio" name="FixedItems" value="SUnit" title="åä½" checked>
                                                <input type="radio" name="FixedItems" value="SFree" title="èªç±" checked>
                                            </div>
@@ -93,9 +94,9 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">æ¨¡å·ä»£ç </label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HRelationNumber" id="HRelationNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HRelationID" id="HRelationID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchRelation" id="btnSearchRelation" style="width: 40px;">
                                                <input type="text" class="layui-input" name="HMouldNumber" id="HMouldNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HMouldID" id="HMouldID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMould" id="btnSearchMould" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
@@ -103,13 +104,13 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">æ¨¡å·åç§°</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HRelationName" id="HRelationName" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HMouldName" id="HMouldName" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">è§æ ¼åå·</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HRelationModel" id="HRelationModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HMouldModel" id="HMouldModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -251,7 +252,7 @@
            var option = [];
            var HModName = "Gy_MateMould";
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            var titleData = ["HItemID","HUnitID","HMaterIDCol","HRelationIDCol","HUnitIDCol"];
            var titleData = ["HItemID","HUnitID","HMaterIDCol","HMouldIDCol","HUnitIDCol","HRelationIDCol"];

            //å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
            //if (sessionStorage.login != "login") {
@@ -297,7 +298,7 @@
                    , data = checkStatus.data;
                //æ°å¢è¡è¡¨æ ¼æ°æ®
                var NewRow = {
                    "HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HRelationIDCol": "",
                    "HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HMouldIDCol": "",
                    "æ¨¡å·ä»£ç ": "", "æ¨¡å·åç§°": "", "HUnitIDCol": "", "åä½ä»£ç ": "", "åä½åç§°": "",
                    "å¼å§æ¥æ": "", "ç»ææ¥æ": "", "å¤æ³¨": ""
                };
@@ -318,10 +319,10 @@
                            NewRow.ç©æåç§° = $("#HMaterName").val();
                            NewRow.è§æ ¼åå· = $("#HMaterModel").val();
                        }
                        else if (FixedItems == "SRelation") {
                            NewRow.HRelationIDCol = $("#HRelationID").val();
                            NewRow.æ¨¡å·ä»£ç  = $("#HRelationNumber").val();
                            NewRow.æ¨¡å·åç§° = $("#HRelationName").val();
                        else if (FixedItems == "SMould") {
                            NewRow.HMouldIDCol = $("#HMouldID").val();
                            NewRow.æ¨¡å·ä»£ç  = $("#HMouldNumber").val();
                            NewRow.æ¨¡å·åç§° = $("#HMouldName").val();
                        }
                        NewRow.å¼å§æ¥æ = Format(new Date(), "yyyy-MM-dd");
                        NewRow.ç»ææ¥æ = "2100-01-01";
@@ -363,7 +364,14 @@

            //æ°å¢æé®
            form.on('submit(btn-AddNew)', function (data) {
                window.location.reload();
                //window.location.reload();
                option.data = [{ HItemID: "0", HMaterIDCol: "0", HMouldIDCol: "0", HRelationIDCol: "0", HUnitID: "0", HUnitIDCol: "0", åä½ä»£ç : "", åä½åç§°: "", å¤æ³¨: "", æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç : "", æ¨¡å·ä»£ç : "",æ¨¡å·åç§°: "", ç©æä»£ç : "", ç©æåç§°: "", è§æ ¼åå·: "" }];
                table.render(option)

                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HUpDateDate").val("");
                $("#HUpDater").val("");
                OperationType = 1.1
            });


@@ -400,6 +408,22 @@
                    });
                }

                if (obj.event == 'Date') {
                    var field = $(this).data('field');
                    laydate.render({
                        elem: this.firstChild
                        , show: true //ç´æ¥æ¾ç¤º
                        , closeStop: this
                        , done: function (nowDate) {
                            //æ¶é´éæ©å®æï¼è¡æ°æ®æ´æ°
                            data[field] = nowDate;
                            obj.update(data);
                            //å·æ°å¤éæ¡
                            //checkRefresh();
                        }
                    });
                }

                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event == 'HMaterCheck') {
@@ -426,11 +450,11 @@
                                        , è§æ ¼åå·: checkStatus.data[0].è§æ ¼åå·
                                    });
                                    var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
                                    if (FixedItems == "SRelation") {
                                    if (FixedItems == "SMould") {
                                        obj.update({
                                            HRelationIDCol: $("#HRelationID").val()
                                            , æ¨¡å·ä»£ç : $("#HRelationNumber").val()
                                            , æ¨¡å·åç§°: $("#HRelationName").val()
                                            HMouldIDCol: $("#HMouldID").val()
                                            , æ¨¡å·ä»£ç : $("#HMouldNumber").val()
                                            , æ¨¡å·åç§°: $("#HMouldName").val()
                                        });
                                    }
                                    layer.close(layer.index);
@@ -441,7 +465,7 @@
                                }
                            });
                        }
                        if (obj.event == 'HRelationCheck') {
                        if (obj.event == 'HMouldCheck') {
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim',
@@ -459,9 +483,10 @@
                                        return layer.msg('è¯·éæ©æ°æ®');
                                    }
                                    obj.update({
                                        HRelationIDCol: checkStatus.data[0].HItemID
                                        HMouldIDCol: checkStatus.data[0].HItemID
                                        , æ¨¡å·ä»£ç : checkStatus.data[0].æ¨¡å·ä»£ç 
                                        , æ¨¡å·åç§°: checkStatus.data[0].æ¨¡å·
                                        , HRelationIDCol: checkStatus.data[0].HItemID
                                    });
                                    var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
                                    if (FixedItems == "SMater") {
@@ -502,6 +527,7 @@
                                        , åä½ä»£ç : checkStatus.data[0].HNumber
                                        , åä½åç§°: checkStatus.data[0].HName
                                    });
                                    console.log(obj)
                                    layer.close(layer.index);
                                }
                                , btn2: function (index, layero) {
@@ -526,13 +552,14 @@
            //ä¿å
            function set_SaveBill(data) {
                var sSubTable = table.cache['mainTable'];
                console.log(sSubTable)
                for (var i = 0; i < sSubTable.length; i++) {
                    if (!sSubTable[i].HMaterIDCol) {
                        var indexRow = i + 1;
                        layer.msg("ç¬¬" + indexRow + "è¡ï¼ç©æä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        return;
                    }
                    if (!sSubTable[i].HRelationIDCol) {
                    if (!sSubTable[i].HMouldIDCol) {
                        var indexRow = i + 1;
                        layer.msg("ç¬¬" + indexRow + "è¡ï¼æ¨¡å·ä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        return;
@@ -624,7 +651,7 @@
            });

            //è¡¨å¤´ä¿¡æ¯æ¨¡å·å¼¹çª
            form.on('submit(btnSearchRelation)', function () {
            form.on('submit(btnSearchMould)', function () {
                //é¡µé¢å±-èªå®ä¹
                layer.open({
                    type: 2,
@@ -644,10 +671,10 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HRelationID").val(checkStatus.data[0].HItemID);
                        $("#HRelationNumber").val(checkStatus.data[0].æ¨¡å·ä»£ç );
                        $("#HRelationName").val(checkStatus.data[0].æ¨¡å·);
                        $("#HRelationModel").val(checkStatus.data[0].è§æ ¼åå·);
                        $("#HMouldID").val(checkStatus.data[0].HItemID);
                        $("#HMouldNumber").val(checkStatus.data[0].æ¨¡å·ä»£ç );
                        $("#HMouldName").val(checkStatus.data[0].æ¨¡å·);
                        $("#HMouldModel").val(checkStatus.data[0].è§æ ¼åå·);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) {
@@ -706,7 +733,7 @@
            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                rowdata = [{
                    "HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HRelationIDCol": "",
                    "HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HMouldIDCol": "",
                    "æ¨¡å·ä»£ç ": "", "æ¨¡å·åç§°": "", "HUnitIDCol": "", "åä½ä»£ç ": "", "åä½åç§°": "",
                    "å¼å§æ¥æ": "", "ç»ææ¥æ": "", "å¤æ³¨": ""
                }];
@@ -725,6 +752,7 @@
                //DisPlay_HideColumn();
            }

            // è·åç½æ ¼åè¡¨æ°æ®
            function GetMateMouldValue(HItemID) {
                var ajaxLoad = layer.load();   
                $.ajax({
@@ -750,10 +778,21 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200, event: 'Date' });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, edit: 'text' });
                                            if (data[i].name == 'ç©æä»£ç ') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HMaterCheck", width: 200 });
                                            } else if (data[i].name == 'åä½ä»£ç ') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HUnitCheck", width: 200 });
                                            } else if (data[i].name == 'æ¨¡å·ä»£ç ') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HMouldCheck", width: 200 });                                                
                                            } else if (data[i].name == 'æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç ') {
                                                data[i].name = 'å¨å·äº§åä»£ç '
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, edit: 'text' });
                                            }
                                    }
                                }
                            }

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MateMouldList.html

@@ -100,7 +100,7 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/KF_BarCodeStatusChangeBill.html

@@ -73,10 +73,27 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">ç»ç»</label>
                                            <label class="layui-form-label" style="width: 85px;">åæ®ç¶æ</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
                                                    <!--å¨ææ¸²æç»ç»-->
                                                <select name="HBillStatus" id="HBillStatus" lay-verify="HBillStatus">
                                                    <option style="color:blue;" value="1">æªå®¡</option>
                                                    <option style="color:blue;" value="2">å®¡æ ¸éè¿</option>
                                                    <option style="color:blue;" value="3">å³é</option>
                                                    <option style="color:blue;" value="4">ä½åº</option>
                                                    <option style="color:blue;" value="5">å®¡æ ¸éå</option>
                                                    <option style="color:blue;" value="6">å®¡æ ¸ä¸</option>
                                                    <option style="color:blue;" value="7">å·²é</option>
                                                    <option style="color:blue;" value="8">å·²åå¤</option>
                                                    <option style="color:blue;" value="9">ç»æ¡</option>
                                                    <option style="color:blue;" value="10">éªè¯</option>
                                                    <option style="color:blue;" value="11">ä¸è¾¾</option>
                                                    <option style="color:blue;" value="12">å¼å·¥</option>
                                                    <option style="color:blue;" value="13">ç³è¯·å®¡æ¹</option>
                                                    <!--<option style="color:blue;" value="14">ç³è¯·æ£éª</option>-->
                                                    <option style="color:blue;" value="15">ç³è¯·æ£éª</option>
                                                    <option style="color:blue;" value="16">å¤å®åæ ¼</option>
                                                    <option style="color:blue;" value="17">å¤å®ä¸åæ ¼</option>

                                                </select>
                                            </div>
                                        </div>
@@ -85,9 +102,11 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                        </div>                                       
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">éå®è®¢åå·</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">åæ®</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
@@ -97,42 +116,26 @@
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ä¸å¡å</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">åæ´äºº</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <!--<div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å®¢æ·</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>-->
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å·¥ä½ä¸å¿</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
                                                <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">è®¡åçäº§æ°é</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">è´è´£é¨é¨</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
                                                <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
@@ -491,58 +494,6 @@
                        //è·åæ°æ®
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        $("#HEmpName").val(checkStatus.data[0].èååç§°);

                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //å®¢æ·
            function get_btnHCus() {
                layer.open({
                    type: 2//å¼¹çªç±»å
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'å®¢æ·'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../Baseset/åºç¡èµæ/Gy_CustomerList.html', 'yes']
                    , btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        //è·åæ°æ®
                        $("#HCusID").val(checkStatus.data[0].HItemID);
                        $("#HCusName").val(checkStatus.data[0].HName);

                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //å·¥ä½ä¸å¿
            function get_btnHCenter() {
                layer.open({
                    type: 2//å¼¹çªç±»å
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'å·¥ä½ä¸å¿'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../Baseset/åºç¡èµæ/Gy_WorkCenterList.html', 'yes']
                    , btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        //è·åæ°æ®
                        $("#HCenterID").val(checkStatus.data[0].HItemID);
                        $("#HCenterName").val(checkStatus.data[0].å·¥ä½ä¸å¿);

                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }

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

@@ -136,7 +136,7 @@
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
@@ -144,7 +144,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>å·¥åºåºç«æ±æ¥å</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>å·¥åºè¿ç«æ¥æ¶å</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>å·¥åºè¿ç«æ¥æ¶å</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>æç»åè®¾ç½®</button>
                            </div>
                        </script>
@@ -246,15 +246,15 @@
                    //åè®¾ç½®
                    case 'get_HideColumn1': get_HideColumn1();
                        break;
                    //æç»åè®¾ç½®
                    case 'get_HideColumn2': get_HideColumn2();
                        break;
                    //æç»åè®¾ç½®
                    case 'get_HideColumn3': get_HideColumn3();
                        break;
                    //æç»åè®¾ç½®
                    case 'get_HideColumn4': get_HideColumn4();
                        break;
                    ////æç»åè®¾ç½®
                    //case 'get_HideColumn2': get_HideColumn2();
                    //    break;
                    ////æç»åè®¾ç½®
                    //case 'get_HideColumn3': get_HideColumn3();
                    //    break;
                    ////æç»åè®¾ç½®
                    //case 'get_HideColumn4': get_HideColumn4();
                    //    break;

                };
            });
@@ -297,8 +297,8 @@
                    case 'get_StationIn': get_StationIn();
                        break;
                    //åè®¾ç½®
                    case 'get_HideColumn1': get_HideColumn1();
                        break;
                    //case 'get_HideColumn1': get_HideColumn1();
                    //    break;
                    //æç»åè®¾ç½®
                    case 'get_HideColumn2': get_HideColumn2();
                        break
@@ -544,7 +544,7 @@
                            }

                            //å¨ææ¾ç¤ºåå
                            table.render({
                            option3 = {
                                elem: '#mainTable1'
                                , toolbar: '#toolbarDemo3'
                                , cols: [col]
@@ -554,7 +554,8 @@
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            });
                            }
                            table.render(option3);

                            layer.close(ajaxLoad);
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
@@ -567,6 +568,7 @@
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                DisPlay_HideColumn_Mod();
            }
            //#endregion

@@ -601,8 +603,9 @@
                                    }
                                }
                            }

                            //å¨ææ¾ç¤ºåå
                            table.render({
                            option4 = {
                                elem: '#mainTable3'
                                , toolbar: '#toolbarDemo4'
                                , cols: [col]
@@ -612,8 +615,9 @@
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            });

                            }
                            table.render(option4);
                           
                            layer.close(ajaxLoad);
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
@@ -625,6 +629,7 @@
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                DisPlay_HideColumn_Tech();
            }
            //#endregion           

@@ -1112,11 +1117,11 @@
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + "_Mod" + '&colName=' + colName, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn3();
                        DisPlay_HideColumn_Mod();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
@@ -1124,11 +1129,11 @@
            }

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

@@ -1226,11 +1231,11 @@
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + "_Tech" + '&colName=' + colName, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn4();
                        DisPlay_HideColumn_Tech();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
@@ -1238,11 +1243,11 @@
            }

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


 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/ProductionPlanReportList.html

@@ -275,11 +275,11 @@
                    ]]
                    ,done: function (res) {
                        var count = 0;
                        var HBillNo = "";
                        var OnlyID = -1;
                        for (var i = 0; i < res.data.length; i++) {
                            if (res.data[i]["æµè½¬å¡å·"] != HBillNo) {
                            if (res.data[i]["å¯ä¸ID"] != OnlyID) {
                                count += res.data[i]["æ´æ¹"];
                                HBillNo = res.data[i]["æµè½¬å¡å·"];
                                OnlyID = res.data[i]["å¯ä¸ID"];
                            }
                        }
                        var divArr = $(".layui-table-total div.layui-table-cell");

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html

@@ -361,13 +361,35 @@
            }
            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);

            //å¤ææ¯å¦æ°å¢
            if (linterid == null || linterid == 0) {
                //è·åæå¤§åæ®å· new
                $("#HInterID").val("0");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '1401' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(shijian);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HSSDate").val(shijian);
                    }
                });
            }
            else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
                RoadBillMain(HInterID);
                /* RoadBillSub(linterid);*/
            }
            //#endregion


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

            //éåºæé®
            form.on('submit(Cancel)', function () {
            form.on('submit(Exit)', function () {
                Pub_Close(1);
            })

@@ -420,6 +442,20 @@
                        icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
                    }, function () { window.location.href = "../../user/login.html"; });
                }
            }
            //#endregion

            //#region  æ¶é´è½¬æ¢
            function formatDate(date) {
                var d = new Date(date),
                    month = '' + (d.getMonth() + 1),
                    day = '' + d.getDate(),
                    year = d.getFullYear();

                if (month.length < 2) month = '0' + month;
                if (day.length < 2) day = '0' + day;

                return [year, month, day].join('-');
            }
            //#endregion

@@ -487,29 +523,7 @@
            var month = date.getMonth() + 1;
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;

            //å¤ææ¯å¦æ°å¢
            if (linterid == null || linterid == 0) {
                //è·åæå¤§åæ®å· new
                $("#HInterID").val("0");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '1401' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(shijian);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HSSDate").val(shijian);
                    }
                });
            }
            else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
                RoadBillMain(HInterID);
                /* RoadBillSub(linterid);*/
            }
            
            //#region ä¿åæ¹æ³
            function set_SaveBill(data) {

			@@ -243,6 +243,7 @@
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;
			var sWhere = "";
			var date = new Date();
			@@ -373,6 +374,24 @@

			//è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {

			var data = obj.data;
			if (obj.event == 'Date') {
			var field = $(this).data('field');
			laydate.render({
			elem: this.firstChild
			, show: true //ç´æ¥æ¾ç¤º
			, closeStop: this
			, done: function (nowDate) {
			//æ¶é´éæ©å®æï¼è¡æ°æ®æ´æ°
			data[field] = nowDate;
			obj.update(data);
			//å·æ°å¤éæ¡
			//checkRefresh();
			}
			});
			}

			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {
			if (obj.event == 'HProcCheck') {
			@@ -844,7 +863,7 @@
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200, event: 'Date' });
			break;
			default:
			if (data[i].name == 'ç©æä»£ç ') {

			@@ -75,7 +75,7 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>

			@@ -33,6 +33,7 @@
			margin-left: -15px;
			margin-right: -15px;
			}

			</style>
			</head>
			<body>
			@@ -59,7 +60,7 @@
			<label class="layui-form-label">åºå®é¡¹ç®</label>
			<div class="layui-input-block">
			<input type="radio" name="FixedItems" value="SMater" title="ç©æ">
			<input type="radio" name="FixedItems" value="SRelation" title="æ¨¡å·">
			<input type="radio" name="FixedItems" value="SMould" title="æ¨¡å·">
			<input type="radio" name="FixedItems" value="SUnit" title="åä½" checked>
			<input type="radio" name="FixedItems" value="SFree" title="èªç±" checked>
			</div>
			@@ -93,9 +94,9 @@
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æ¨¡å·ä»£ç </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRelationNumber" id="HRelationNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HRelationID" id="HRelationID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchRelation" id="btnSearchRelation" style="width: 40px;">
			<input type="text" class="layui-input" name="HMouldNumber" id="HMouldNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HMouldID" id="HMouldID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMould" id="btnSearchMould" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			@@ -103,13 +104,13 @@
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æ¨¡å·åç§°</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRelationName" id="HRelationName" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HMouldName" id="HMouldName" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è§æ ¼åå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRelationModel" id="HRelationModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HMouldModel" id="HMouldModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -251,7 +252,7 @@
			var option = [];
			var HModName = "Gy_MateMould";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID","HUnitID","HMaterIDCol","HRelationIDCol","HUnitIDCol"];
			var titleData = ["HItemID","HUnitID","HMaterIDCol","HMouldIDCol","HUnitIDCol","HRelationIDCol"];

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			//if (sessionStorage.login != "login") {
			@@ -297,7 +298,7 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HRelationIDCol": "",
			"HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HMouldIDCol": "",
			"æ¨¡å·ä»£ç ": "", "æ¨¡å·åç§°": "", "HUnitIDCol": "", "åä½ä»£ç ": "", "åä½åç§°": "",
			"å¼å§æ¥æ": "", "ç»ææ¥æ": "", "å¤æ³¨": ""
			};
			@@ -318,10 +319,10 @@
			NewRow.ç©æåç§° = $("#HMaterName").val();
			NewRow.è§æ ¼åå· = $("#HMaterModel").val();
			}
			else if (FixedItems == "SRelation") {
			NewRow.HRelationIDCol = $("#HRelationID").val();
			NewRow.æ¨¡å·ä»£ç = $("#HRelationNumber").val();
			NewRow.æ¨¡å·åç§° = $("#HRelationName").val();
			else if (FixedItems == "SMould") {
			NewRow.HMouldIDCol = $("#HMouldID").val();
			NewRow.æ¨¡å·ä»£ç = $("#HMouldNumber").val();
			NewRow.æ¨¡å·åç§° = $("#HMouldName").val();
			}
			NewRow.å¼å§æ¥æ = Format(new Date(), "yyyy-MM-dd");
			NewRow.ç»ææ¥æ = "2100-01-01";
			@@ -363,7 +364,14 @@

			//æ°å¢æé®
			form.on('submit(btn-AddNew)', function (data) {
			window.location.reload();
			//window.location.reload();
			option.data = [{ HItemID: "0", HMaterIDCol: "0", HMouldIDCol: "0", HRelationIDCol: "0", HUnitID: "0", HUnitIDCol: "0", åä½ä»£ç : "", åä½åç§°: "", å¤æ³¨: "", æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç : "", æ¨¡å·ä»£ç : "",æ¨¡å·åç§°: "", ç©æä»£ç : "", ç©æåç§°: "", è§æ ¼åå·: "" }];
			table.render(option)

			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HUpDateDate").val("");
			$("#HUpDater").val("");
			OperationType = 1.1
			});


			@@ -400,6 +408,22 @@
			});
			}

			if (obj.event == 'Date') {
			var field = $(this).data('field');
			laydate.render({
			elem: this.firstChild
			, show: true //ç´æ¥æ¾ç¤º
			, closeStop: this
			, done: function (nowDate) {
			//æ¶é´éæ©å®æï¼è¡æ°æ®æ´æ°
			data[field] = nowDate;
			obj.update(data);
			//å·æ°å¤éæ¡
			//checkRefresh();
			}
			});
			}

			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {
			if (obj.event == 'HMaterCheck') {
			@@ -426,11 +450,11 @@
			, è§æ ¼åå·: checkStatus.data[0].è§æ ¼åå·
			});
			var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
			if (FixedItems == "SRelation") {
			if (FixedItems == "SMould") {
			obj.update({
			HRelationIDCol: $("#HRelationID").val()
			, æ¨¡å·ä»£ç : $("#HRelationNumber").val()
			, æ¨¡å·åç§°: $("#HRelationName").val()
			HMouldIDCol: $("#HMouldID").val()
			, æ¨¡å·ä»£ç : $("#HMouldNumber").val()
			, æ¨¡å·åç§°: $("#HMouldName").val()
			});
			}
			layer.close(layer.index);
			@@ -441,7 +465,7 @@
			}
			});
			}
			if (obj.event == 'HRelationCheck') {
			if (obj.event == 'HMouldCheck') {
			layer.open({
			type: 2,
			skin: 'layui-layer-rim',
			@@ -459,9 +483,10 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			HRelationIDCol: checkStatus.data[0].HItemID
			HMouldIDCol: checkStatus.data[0].HItemID
			, æ¨¡å·ä»£ç : checkStatus.data[0].æ¨¡å·ä»£ç
			, æ¨¡å·åç§°: checkStatus.data[0].æ¨¡å·
			, HRelationIDCol: checkStatus.data[0].HItemID
			});
			var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
			if (FixedItems == "SMater") {
			@@ -502,6 +527,7 @@
			, åä½ä»£ç : checkStatus.data[0].HNumber
			, åä½åç§°: checkStatus.data[0].HName
			});
			console.log(obj)
			layer.close(layer.index);
			}
			, btn2: function (index, layero) {
			@@ -526,13 +552,14 @@
			//ä¿å
			function set_SaveBill(data) {
			var sSubTable = table.cache['mainTable'];
			console.log(sSubTable)
			for (var i = 0; i < sSubTable.length; i++) {
			if (!sSubTable[i].HMaterIDCol) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼ç©æä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!sSubTable[i].HRelationIDCol) {
			if (!sSubTable[i].HMouldIDCol) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼æ¨¡å·ä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			@@ -624,7 +651,7 @@
			});

			//è¡¨å¤´ä¿¡æ¯æ¨¡å·å¼¹çª
			form.on('submit(btnSearchRelation)', function () {
			form.on('submit(btnSearchMould)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -644,10 +671,10 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HRelationID").val(checkStatus.data[0].HItemID);
			$("#HRelationNumber").val(checkStatus.data[0].æ¨¡å·ä»£ç );
			$("#HRelationName").val(checkStatus.data[0].æ¨¡å·);
			$("#HRelationModel").val(checkStatus.data[0].è§æ ¼åå·);
			$("#HMouldID").val(checkStatus.data[0].HItemID);
			$("#HMouldNumber").val(checkStatus.data[0].æ¨¡å·ä»£ç );
			$("#HMouldName").val(checkStatus.data[0].æ¨¡å·);
			$("#HMouldModel").val(checkStatus.data[0].è§æ ¼åå·);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -706,7 +733,7 @@
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			rowdata = [{
			"HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HRelationIDCol": "",
			"HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HMouldIDCol": "",
			"æ¨¡å·ä»£ç ": "", "æ¨¡å·åç§°": "", "HUnitIDCol": "", "åä½ä»£ç ": "", "åä½åç§°": "",
			"å¼å§æ¥æ": "", "ç»ææ¥æ": "", "å¤æ³¨": ""
			}];
			@@ -725,6 +752,7 @@
			//DisPlay_HideColumn();
			}

			// è·åç½æ ¼åè¡¨æ°æ®
			function GetMateMouldValue(HItemID) {
			var ajaxLoad = layer.load();
			$.ajax({
			@@ -750,10 +778,21 @@
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200, event: 'Date' });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, edit: 'text' });
			if (data[i].name == 'ç©æä»£ç ') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HMaterCheck", width: 200 });
			} else if (data[i].name == 'åä½ä»£ç ') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HUnitCheck", width: 200 });
			} else if (data[i].name == 'æ¨¡å·ä»£ç ') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HMouldCheck", width: 200 });
			} else if (data[i].name == 'æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç ') {
			data[i].name = 'å¨å·äº§åä»£ç '
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, edit: 'text' });
			}
			}
			}
			}

			@@ -100,7 +100,7 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>

			@@ -73,10 +73,27 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<label class="layui-form-label" style="width: 85px;">åæ®ç¶æ</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
			<!--å¨ææ¸²æç»ç»-->
			<select name="HBillStatus" id="HBillStatus" lay-verify="HBillStatus">
			<option style="color:blue;" value="1">æªå®¡</option>
			<option style="color:blue;" value="2">å®¡æ ¸éè¿</option>
			<option style="color:blue;" value="3">å³é</option>
			<option style="color:blue;" value="4">ä½åº</option>
			<option style="color:blue;" value="5">å®¡æ ¸éå</option>
			<option style="color:blue;" value="6">å®¡æ ¸ä¸</option>
			<option style="color:blue;" value="7">å·²é</option>
			<option style="color:blue;" value="8">å·²åå¤</option>
			<option style="color:blue;" value="9">ç»æ¡</option>
			<option style="color:blue;" value="10">éªè¯</option>
			<option style="color:blue;" value="11">ä¸è¾¾</option>
			<option style="color:blue;" value="12">å¼å·¥</option>
			<option style="color:blue;" value="13">ç³è¯·å®¡æ¹</option>
			<!--<option style="color:blue;" value="14">ç³è¯·æ£éª</option>-->
			<option style="color:blue;" value="15">ç³è¯·æ£éª</option>
			<option style="color:blue;" value="16">å¤å®åæ ¼</option>
			<option style="color:blue;" value="17">å¤å®ä¸åæ ¼</option>

			</select>
			</div>
			</div>
			@@ -85,9 +102,11 @@
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
			</div>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">éå®è®¢åå·</label>
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">åæ®</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
			@@ -97,42 +116,26 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ä¸å¡å</label>
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">åæ´äºº</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å®¢æ·</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å·¥ä½ä¸å¿</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
			<input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
			<input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è®¡åçäº§æ°é</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">è´è´£é¨é¨</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
			<input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			</div>
			@@ -491,58 +494,6 @@
			//è·åæ°æ®
			$("#HEmpID").val(checkStatus.data[0].HItemID);
			$("#HEmpName").val(checkStatus.data[0].èååç§°);

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}

			//å®¢æ·
			function get_btnHCus() {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'å®¢æ·'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_CustomerList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			//è·åæ°æ®
			$("#HCusID").val(checkStatus.data[0].HItemID);
			$("#HCusName").val(checkStatus.data[0].HName);

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}

			//å·¥ä½ä¸å¿
			function get_btnHCenter() {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'å·¥ä½ä¸å¿'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_WorkCenterList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			//è·åæ°æ®
			$("#HCenterID").val(checkStatus.data[0].HItemID);
			$("#HCenterName").val(checkStatus.data[0].å·¥ä½ä¸å¿);

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}

			@@ -136,7 +136,7 @@
			</script>
			<script type="text/html" id="toolbarDemo2">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			@@ -144,7 +144,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>å·¥åºåºç«æ±æ¥å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>å·¥åºè¿ç«æ¥æ¶å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>å·¥åºè¿ç«æ¥æ¶å</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>æç»åè®¾ç½®</button>
			</div>
			</script>
			@@ -246,15 +246,15 @@
			//åè®¾ç½®
			case 'get_HideColumn1': get_HideColumn1();
			break;
			//æç»åè®¾ç½®
			case 'get_HideColumn2': get_HideColumn2();
			break;
			//æç»åè®¾ç½®
			case 'get_HideColumn3': get_HideColumn3();
			break;
			//æç»åè®¾ç½®
			case 'get_HideColumn4': get_HideColumn4();
			break;
			////æç»åè®¾ç½®
			//case 'get_HideColumn2': get_HideColumn2();
			// break;
			////æç»åè®¾ç½®
			//case 'get_HideColumn3': get_HideColumn3();
			// break;
			////æç»åè®¾ç½®
			//case 'get_HideColumn4': get_HideColumn4();
			// break;

			};
			});
			@@ -297,8 +297,8 @@
			case 'get_StationIn': get_StationIn();
			break;
			//åè®¾ç½®
			case 'get_HideColumn1': get_HideColumn1();
			break;
			//case 'get_HideColumn1': get_HideColumn1();
			// break;
			//æç»åè®¾ç½®
			case 'get_HideColumn2': get_HideColumn2();
			break
			@@ -544,7 +544,7 @@
			}

			//å¨ææ¾ç¤ºåå
			table.render({
			option3 = {
			elem: '#mainTable1'
			, toolbar: '#toolbarDemo3'
			, cols: [col]
			@@ -554,7 +554,8 @@
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			});
			}
			table.render(option3);

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			@@ -567,6 +568,7 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			DisPlay_HideColumn_Mod();
			}
			//#endregion

			@@ -601,8 +603,9 @@
			}
			}
			}

			//å¨ææ¾ç¤ºåå
			table.render({
			option4 = {
			elem: '#mainTable3'
			, toolbar: '#toolbarDemo4'
			, cols: [col]
			@@ -612,8 +615,9 @@
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			});

			}
			table.render(option4);

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			@@ -625,6 +629,7 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			DisPlay_HideColumn_Tech();
			}
			//#endregion

			@@ -1112,11 +1117,11 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + "_Mod" + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn3();
			DisPlay_HideColumn_Mod();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			@@ -1124,11 +1129,11 @@
			}

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

			@@ -1226,11 +1231,11 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + "_Tech" + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn4();
			DisPlay_HideColumn_Tech();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			@@ -1238,11 +1243,11 @@
			}

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

			@@ -275,11 +275,11 @@
			]]
			,done: function (res) {
			var count = 0;
			var HBillNo = "";
			var OnlyID = -1;
			for (var i = 0; i < res.data.length; i++) {
			if (res.data[i]["æµè½¬å¡å·"] != HBillNo) {
			if (res.data[i]["å¯ä¸ID"] != OnlyID) {
			count += res.data[i]["æ´æ¹"];
			HBillNo = res.data[i]["æµè½¬å¡å·"];
			OnlyID = res.data[i]["å¯ä¸ID"];
			}
			}
			var divArr = $(".layui-table-total div.layui-table-cell");

			@@ -361,13 +361,35 @@
			}
			$("#HUSEORGID").val(sessionStorage["OrganizationID"]);

			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//è·åæå¤§åæ®å· new
			$("#HInterID").val("0");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '1401' },
			success: function (d) {
			//console.log(d.data);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(shijian);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HSSDate").val(shijian);
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(HInterID);
			/* RoadBillSub(linterid);*/
			}
			//#endregion


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

			//éåºæé®
			form.on('submit(Cancel)', function () {
			form.on('submit(Exit)', function () {
			Pub_Close(1);
			})

			@@ -420,6 +442,20 @@
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "../../user/login.html"; });
			}
			}
			//#endregion

			//#region æ¶é´è½¬æ¢
			function formatDate(date) {
			var d = new Date(date),
			month = '' + (d.getMonth() + 1),
			day = '' + d.getDate(),
			year = d.getFullYear();

			if (month.length < 2) month = '0' + month;
			if (day.length < 2) day = '0' + day;

			return [year, month, day].join('-');
			}
			//#endregion

			@@ -487,29 +523,7 @@
			var month = date.getMonth() + 1;
			var year = date.getFullYear();
			var shijian = year + "-" + month + "-" + day;

			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//è·åæå¤§åæ®å· new
			$("#HInterID").val("0");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '1401' },
			success: function (d) {
			//console.log(d.data);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(shijian);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HSSDate").val(shijian);
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(HInterID);
			/* RoadBillSub(linterid);*/
			}

			//#region ä¿åæ¹æ³
			function set_SaveBill(data) {