MES-WEB-LayUI.git

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

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

yangle

2024-06-15 ef2dfcb5bb01a2e79d95453b80357190818025ec

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

2个文件已添加

17个文件已修改

	WebTM/Properties/PublishProfiles/JFTM.pubxml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	4230 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/IpadIndex.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/indexMenu_PDA.html	273 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/indexMenu_PingBan.html	324 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Gy_MouldFileResume.html	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList_PDA.html	61 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBill.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/防错验证/Gy_MaterPreventErrMouldBill.html	60 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/防错验证/Qc_PreventErrMouldCheckBill.html	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/Properties/PublishProfiles/JFTM.pubxml

@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\ç¼ç \åå¸\layui</PublishUrl>
    <PublishUrl>D:\ç½ç«åå¸\æºäºMESWMS\LAYUI</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -206,6 +206,8 @@
    <Content Include="views\home\console_pb.html" />
    <Content Include="views\home\console_QiaoYi.html" />
    <Content Include="views\home\console_Mobile_QiaoYi.html" />
    <Content Include="views\indexMenu_PDA.html" />
    <Content Include="views\indexMenu_PingBan.html" />
    <Content Include="views\index_KaiBeiNaiTe.html" />
    <Content Include="views\index_Mobile_KaiBeiNaiTe.html" />
    <Content Include="views\index_Mobile_QiaoYi.html" />

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,11 +5,11 @@
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    /*var WEBURL = "http://localhost/API/";   */          //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/API/";    //æè´ºæ¬å°éç½®
   // var WEBURL = "http://localhost:81/API/";    //çå½¬æ¬å°éç½®
    var WEBURL = "http://localhost:8082/API/";    //æè´ºæ¬å°éç½®
    //var WEBURL = "http://localhost:81/API/";    //çå½¬æ¬å°éç½®
    /*var WEBURL = "http://localhost:8083/API/";  //éé¯éæ¬å°éç½®*/
   // var WEBURL = "http://localhost:81/API/"    //ç¿æ¶æ¶æ¬å°éç½®
    var WEBURL = "http://localhost:8082/API/";   //å¼ çå¹¿æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/API/";   //å¼ çå¹¿æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ä½ææ°æ¬å°éç½®
    //var WEBURL = "http://localhost:8088/ARAPI/";    //ä½ææ°æ¬å°éç½®(å®ç)
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW

 WebTM/views/IpadIndex.html

@@ -1127,7 +1127,7 @@
                        "HMaterID": HMaterID,
                        "HProcID": HProcID,
                        "HSourceID": HSourceID1,
                        "SCOrder": HICMOBillNo
                        "SCOrder": HSourceBillNo
                    });

                    //éè¿ç´¢å¼è·åå°å½åiframeå¼¹åºå±
@@ -1156,7 +1156,8 @@
                    var data = [];
                    data.push({
                        "HMaterID": HMaterID,
                        "SCOrder": HICMOBillNo
                        "HProcID": HProcID,                     
                        "SCOrder": HSourceBillNo
                    });

                    //éè¿ç´¢å¼è·åå°å½åiframeå¼¹åºå±

 WebTM/views/indexMenu_PDA.html

New file
@@ -0,0 +1,273 @@
ï»¿<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8">
    <title>LMESç®¡çç³»ç»ç§»å¨ç«¯</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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
    <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
    <style>
        .layui-nav-tree .layui-nav-item {
            width: 88%;
        }

        .layui-nav * {
            font-size: 13px;
        }

        .layui-side-menu .layui-nav .layui-nav-item a {
            padding-left: 25px;
        }
    </style>
</head>
<body class="layui-layout-body">
    <div id="LAY_app">
        <div class="layui-layout layui-layout-admin">
            <div class="layui-header">
                <!-- å¤´é¨åºå -->
                <ul class="layui-nav layui-layout-left">
                    <li class="layui-nav-item layadmin-flexible" lay-unselect>
                        <a href="javascript:;" layadmin-event="flexible" title="ä¾§è¾¹ä¼¸ç¼©">
                            <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item" lay-unselect>
                        <a href="javascript:;" layadmin-event="refresh" title="å·æ°">
                            <i class="layui-icon layui-icon-refresh-3"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item" lay-unselect>
                        <a href="javascript:void(0);">
                            <i id="MenuDefineID" class="layui-icon layui-icon-app"></i>
                        </a>
                    </li>
                </ul>
                <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <a href="javascript:;" layadmin-event="theme">
                            <i class="layui-icon layui-icon-theme"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <a href="javascript:;" layadmin-event="note">
                            <i class="layui-icon layui-icon-note"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <a href="javascript:;" layadmin-event="fullscreen">
                            <i class="layui-icon layui-icon-screen-full"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item" lay-unselect>
                        <a href="javascript:;">
                            <cite>
                                <label name="UserName" id="UserName"></label>
                            </cite>
                        </a>
                    </li>
                    <li class="layui-nav-item" lay-unselect>
                        <dd layadmin-event="logout" style="text-align: center;background-color:red"><a>éåº</a></dd>
                    </li>
                </ul>
            </div>

            <!-- ä¾§è¾¹èå -->
            <div class="layui-side layui-side-menu">
                <div class="layui-side-scroll">
                    <div class="layui-logo" lay-href="home/console_Mobile_KaiBeiNaiTe.html">
                        <img src="../layuiadmin/myicon/yidongduan.svg" alt="ç§»å¨ç«¯" style="width:25px;height:25px;margin-right: 5px;" />
                        <span>LMESç®¡çç³»ç»</span>
                    </div>
                    <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu" style="width:260px">
                    </ul>
                </div>
            </div>

            <!-- é¡µé¢æ ç¾ -->
            <div class="layadmin-pagetabs" id="LAY_app_tabs">
                <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
                <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
                <div class="layui-icon layadmin-tabs-control layui-icon-down">
                    <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
                        <li class="layui-nav-item" lay-unselect>
                            <a href="javascript:;"></a>
                            <dl class="layui-nav-child layui-anim-fadein">
                                <dd layadmin-event="closeThisTabs"><a href="javascript:;">å³éå½åæ ç¾é¡µ</a></dd>
                                <dd layadmin-event="closeOtherTabs"><a href="javascript:;">å³éå¶å®æ ç¾é¡µ</a></dd>
                                <dd layadmin-event="closeAllTabs"><a href="javascript:;">å³éå¨é¨æ ç¾é¡µ</a></dd>
                            </dl>
                        </li>
                    </ul>
                </div>
                <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
                    <ul class="layui-tab-title" id="LAY_app_tabsheader">
                        <li lay-id="home/console_Mobile_KaiBeiNaiTe.html" lay-attr="home/console_Mobile_KaiBeiNaiTe.html" class="layui-this"><i class="layui-icon layui-icon-home"></i></li>
                    </ul>
                </div>
            </div>


            <!-- ä¸»ä½åå®¹ -->
            <div class="layui-body" id="LAY_app_body">
                <div class="layadmin-tabsbody-item layui-show">
                    <iframe src="home/console_Mobile_KaiBeiNaiTe.html" frameborder="0" class="layadmin-iframe"></iframe>
                </div>
            </div>

            <!-- è¾å©åç´ ï¼ä¸è¬ç¨äºç§»å¨è®¾å¤ä¸é®ç½© -->
            <div class="layadmin-body-shade" layadmin-event="shade"></div>
        </div>
    </div>

    <script src="../layuiadmin/layui/layui.js"></script>
    <script src="../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../layuiadmin/PubCustom.js"></script>
    <script>
        layui.config({
            base: '../layuiadmin/'
        }).extend({
            index: 'lib/index'
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            var $ = layui.$;
            var element = layui.element;
            var $ = layui.jquery;

            var HType = "mobile";   //ç»å½å¹³å°ï¼PCç«¯ãææºç«¯
            //#region é¡µé¢åå§å
            set_ClearBill();
            //#endregion




            //#region é¡µé¢å¶å®æ¹æ³
            //#region é¡µé¢åå§åæ¹æ³
            function set_ClearBill() {
                //å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
                if (sessionStorage.login != "login") {
                    layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
                        icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
                    }, function () { window.location.href = "user/login.html"; });
                }
                //å è½½ä¾§è¾¹èåæ 
                set_sideMenuDisPlay();
            }
            //#endregion

            //#region æ¾ç¤ºä¾§è¾¹èå
            function set_sideMenuDisPlay() {
                ////å¤æç¨æ·æ¯ç§»å¨ç«¯è¿æ¯PCç«¯
                //var judgeMorPCflag = judgeMorPC();
                //if (judgeMorPCflag) {//PCç«¯
                //    window.location.href = 'indexMenu.html'
                //}

                var ajaxLoad = layer.load();
                //è·åèååè¡¨æ°æ®
                $.ajax({
                    url: GetWEBURL() + "/Web/MenuList",
                    type: "GET",
                    async: false,
                    data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
                    success: function (data) {
                        var data = JSON.parse(data.data);
                        console.log(data);
                        MenuMain(data);
                        layer.close(ajaxLoad);
                    },
                    error: function (data) {
                        layer.close(ajaxLoad);
                        layer.alert("åçéè¯¯!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region éåçæä¸»èå
            function MenuMain(data) {

                var liStr = '';
                //éåçæä¸»èå
                for (var i = 0; i < data.length; i++) {
                    // å¤ææ¯å¦åå¨åèå
                    if (data[i].childMenus != null && data[i].childMenus.length > 0) {
                        liStr += '<li data-name="set" class="layui-nav-item">';
                        //è®¾ç½®ä¸çº§èåå¾æ 
                        if (data[i].HLevel == 1 && data[i].HPicNum != null && data[i].HPicNum != "") {
                            liStr += '<a><i class="' + data[i].HPicNum + '"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
                        } else {
                            liStr += '<a><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
                        }

                        liStr += '<dl class="layui-nav-child">';
                        // éåè·ååèå
                        for (var k = 0; k < data[i].childMenus.length; k++) {
                            liStr += getChildMenu(data[i].childMenus[k], 0);
                        }
                        liStr += '</dl></li>';
                    } else {
                        liStr += '<li class="layui-nav-item"><a class="" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
                    }
                };
                $(".layui-nav-tree").html(liStr);
                element.init();
            }
            //#endregion

            //#region éå½çæåèå
            function getChildMenu(subMenu, num) {
                num++;
                var subStr = '';
                if (subMenu.childMenus != null && subMenu.childMenus.length > 0) {
                    subStr += '<dd>';
                    subStr += '<a>' + subMenu.HName + '</a>';
                    subStr += '<dl class="layui-nav-child">';
                    for (var j = 0; j < subMenu.childMenus.length; j++) {
                        subStr += getChildMenu(subMenu.childMenus[j], num);
                    }
                    subStr += '</dl>';
                    subStr += '</dd>';
                } else {
                    subStr += '<dd><a lay-href="' + subMenu.Hurl + '">' + subMenu.HName + '</a></dd>';
                }
                return subStr;
            }
            //#endregion

            //#region èåèªå®ä¹ï¼å¼¹åºèåèªå®ä¹åé¡µé¢
            Ul = document.getElementById("MenuDefineID");
            Ul.addEventListener("click", function (event) {
                layer.open({
                    type: 2
                    , area: ['90%', '90%']
                    , title: 'èåèªå®ä¹'
                    , closeBtn: 1
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
                    , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                    , content: 'ç³»ç»ç®¡ç/èåèªå®ä¹/Xt_DefineMenuDisplay.html'
                    , resize: false
                    , btn: ["ç¡®å®"]
                    , end: function () {
                        //å·æ°é¡µé¢,
                        location.reload();
                    }
                })
            }, false);
            //#endregion
            //#endregion

        });

        document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
    </script>

</body>
</html>



 WebTM/views/indexMenu_PingBan.html

New file
@@ -0,0 +1,324 @@
ï»¿

<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8">
    <title>LMESç®¡çç³»ç»</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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
    <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
    <script language="JavaScript">
    //å±è½åéæé®
        history.pushState(null, null, document.URL);
        window.addEventListener('popstate', function () {
            history.pushState(null, null, document.URL);
        });
    </script>
    <script>
        /^http(s*):\/\//.test(location.href) || alert('è¯·åé¨ç½²å° localhost ä¸åè®¿é®');
    </script>

</head>
<body class="layui-layout-body">

    <div id="LAY_app">
        <div class="layui-layout layui-layout-admin">
            <div class="layui-header">
                <!-- å¤´é¨åºå -->
                <ul class="layui-nav">
                    <li class="layui-nav-item layadmin-flexible" lay-unselect>
                        <a href="javascript:;" layadmin-event="flexible" title="ä¾§è¾¹ä¼¸ç¼©">
                            <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <a href="http://www.layui.com/admin/" target="_blank" title="åå°">
                            <i class="layui-icon layui-icon-website"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item" lay-unselect>
                        <a href="javascript:;" layadmin-event="refresh" title="å·æ°">
                            <i class="layui-icon layui-icon-refresh-3"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <input type="text" placeholder="æç´¢..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="https://www.baidu.com/s?ie=UTF-8&wd=">
                    </li>
                    <li class="layui-nav-item" lay-unselect style="color: black;">
                        <span>ç»å½ç»ç»ï¼</span>
                        <label id="Organization"></label>
                    </li>
                </ul>
                <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
                    <li class="layui-nav-item" lay-unselect>
                        <a href="javascript:void(0);">
                            <i id="MenuDefineID" class="layui-icon layui-icon-app"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item" lay-unselect>
                        <a href="javascript:void(0);">
                            <!--<a lay-href="app/message/index.html" layadmin-event="message" lay-text="æ¶æ¯ä¸å¿">-->
                            <i class="layui-icon layui-icon-notice"></i>

                            <!--å¦æææ°æ¶æ¯ï¼åæ¾ç¤ºå°åç¹-->
                            <span class="layui-badge-dot"></span>
                        </a>
                    </li>
                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <a href="javascript:;" layadmin-event="theme">
                            <i class="layui-icon layui-icon-theme"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <a href="javascript:;" layadmin-event="note">
                            <i class="layui-icon layui-icon-note"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <a href="javascript:;" layadmin-event="fullscreen">
                            <i class="layui-icon layui-icon-screen-full"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item" lay-unselect style="margin-right:15px;">
                        <a href="javascript:;">
                            <cite>
                                <label name="UserName" id="UserName"></label>
                            </cite>
                        </a>
                        <dl class="layui-nav-child">
                            <dd><a lay-href="set/user/info.html">åºæ¬èµæ</a></dd>
                            <dd><a lay-href="set/user/password.html">ä¿®æ¹å¯ç </a></dd>
                            <dd layadmin-event="logout" style="text-align: center;"><a>éåº</a></dd>
                        </dl>
                    </li>

                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
                    </li>-->
                    <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
                        <a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
                    </li>
                </ul>
            </div>

            <!-- ä¾§è¾¹èå -->
            <!--<div class="layui-side layui-side-menu" style="display:none;">
                <div class="layui-side-scroll">
                    <div class="layui-logo" lay-href="home/console.html">
                        <img src="../layuiadmin/myicon/win.svg" alt="PCç«¯" style="width:25px;height:25px;margin-right: 5px;" />
                        <span>LMESç®¡çç³»ç»</span>
                    </div>
                    <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">-->
                        <!-- éè´ç®¡ç -->
                        <!--<li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>éè´ç®¡ç</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
                                    <a>å§å¤è®¢å</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="éè´ç®¡ç/å§å¤è®¢å/WW_EntrustOrderBillList.html">å§å¤è®¢åç»´æ¤</a></dd>
                                    </dl>
                                </dd>
                            </dl>
                        </li>-->

                    <!--</ul>
                </div>
            </div>-->

            <!-- é¡µé¢æ ç¾ -->
            <div class="layadmin-pagetabs" id="LAY_app_tabs" style="position:fixed;left:0px;">
                <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
                <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
                <div class="layui-icon layadmin-tabs-control layui-icon-down">
                    <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
                        <li class="layui-nav-item" lay-unselect>
                            <a href="javascript:;"></a>
                            <dl class="layui-nav-child layui-anim-fadein">
                                <dd layadmin-event="closeThisTabs"><a href="javascript:;">å³éå½åæ ç¾é¡µ</a></dd>
                                <dd layadmin-event="closeOtherTabs"><a href="javascript:;">å³éå¶å®æ ç¾é¡µ</a></dd>
                                <dd layadmin-event="closeAllTabs"><a href="javascript:;">å³éå¨é¨æ ç¾é¡µ</a></dd>
                            </dl>
                        </li>
                    </ul>
                </div>
                <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
                    <ul class="layui-tab-title" id="LAY_app_tabsheader">
                        <li lay-id="home/console.html" lay-attr="home/console.html" class="layui-this"><i class="layui-icon layui-icon-home"></i></li>
                    </ul>
                </div>
            </div>


            <!-- ä¸»ä½åå®¹ -->
            <div class="layui-body" id="LAY_app_body" style="position:fixed;left:0px;">
                <div class="layadmin-tabsbody-item layui-show">
                    <iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>
                </div>
            </div>

            <!-- è¾å©åç´ ï¼ä¸è¬ç¨äºç§»å¨è®¾å¤ä¸é®ç½© -->
            <div class="layadmin-body-shade" layadmin-event="shade"></div>
        </div>
    </div>

    <script src="../layuiadmin/layui/layui.js"></script>
    <script src="../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../layuiadmin/PubCustom.js"></script>
    <script>
        // å¯¼èªèåçé´éåç´ 
        var menuCell = 5;

        layui.config({
            base: '../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index' //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            var $ = layui.$;
            var element = layui.element;
            var $ = layui.jquery;

            var HType = "PC";   //ç»å½å¹³å°ï¼PCç«¯ãææºç«¯
            //å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
            //if (sessionStorage.login != "login") {
            //    layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
            //        icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
            //    }, function () { window.location.href = "user/login.html"; });
            //}


            //#region é¡µé¢åå§å
            //set_sideMenuDisPlay();
            //#endregion


            //#region

            //#endregion

            //#region é¡µé¢å¶å®æ¹æ³
            //æ¾ç¤ºä¾§è¾¹èå
            function set_sideMenuDisPlay() {
                //å¤æç¨æ·æ¯ç§»å¨ç«¯è¿æ¯PCç«¯
                //var judgeMorPCflag = judgeMorPC();
                //if (!judgeMorPCflag) {//ç§»å¨ç«¯
                //    var dd = '<dd><a href="è½¦é´ç®¡ç/å·¥åºæµè½¬/MES_StationInBill_PDA.html">å·¥åºè¿ç«æ¥æ¶åPDA</a ></dd > <dd><a href="è½¦é´ç®¡ç/å·¥åºæµè½¬/MES_StationOutBill_PDA.html">å·¥åºåºç«æ±æ¥åPDA</a></dd>';
                //    $("#append").prepend(dd);
                //}
                //if (!judgeMorPCflag) {//ç§»å¨ç«¯
                //    window.location.href = 'index_Mobile.html'
                //}

                var ajaxLoad = layer.load();
                //è·åèååè¡¨æ°æ®
                $.ajax({
                    url: GetWEBURL() + "/Web/MenuList",
                    type: "GET",
                    async: false,
                    data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
                    success: function (data) {
                        var data = JSON.parse(data.data);
                        console.log(data);
                        MenuMain(data);
                        layer.close(ajaxLoad);
                    },
                    error: function (data) {
                        layer.close(ajaxLoad);
                        layer.alert("åçéè¯¯!", { icon: 5 });
                    }
                });
            }
            //éåçæä¸»èå
            function MenuMain(data) {

                var liStr = '';
                //éåçæä¸»èå
                for (var i = 0; i < data.length; i++) {
                    // å¤ææ¯å¦åå¨åèå
                    if (data[i].childMenus != null && data[i].childMenus.length > 0) {
                        liStr += '<li data-name="set" class="layui-nav-item">';
                        //è®¾ç½®ä¸çº§èåå¾æ 
                        if (data[i].HLevel == 1 && data[i].HPicNum != null && data[i].HPicNum != "") {
                            liStr += '<a><i class="' + data[i].HPicNum + '"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
                        } else {
                            liStr += '<a><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
                        }

                        liStr += '<dl class="layui-nav-child">';
                        // éåè·ååèå
                        for (var k = 0; k < data[i].childMenus.length; k++) {
                            liStr += getChildMenu(data[i].childMenus[k], 0);
                        }
                        liStr += '</dl></li>';
                    } else {
                        liStr += '<li class="layui-nav-item"><a class="" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
                    }
                };
                $(".layui-nav-tree").html(liStr);
                element.init();
            }

            // éå½çæåèå
            function getChildMenu(subMenu, num) {
                num++;
                var subStr = '';
                if (subMenu.childMenus != null && subMenu.childMenus.length > 0) {
                    subStr += '<dd>';
                    subStr += '<a>' + subMenu.HName + '</a>';
                    subStr += '<dl class="layui-nav-child">';
                    for (var j = 0; j < subMenu.childMenus.length; j++) {
                        subStr += getChildMenu(subMenu.childMenus[j], num);
                    }
                    subStr += '</dl>';
                    subStr += '</dd>';
                } else {
                    subStr += '<dd><a lay-href="' + subMenu.Hurl + '">' + subMenu.HName + '</a></dd>';
                }
                return subStr;
            }



            //èåèªå®ä¹ï¼å¼¹åºèåèªå®ä¹åé¡µé¢
            Ul = document.getElementById("MenuDefineID");
            Ul.addEventListener("click", function (event) {
                layer.open({
                    type: 2
                    , area: ['90%', '90%']
                    , title: 'èåèªå®ä¹'
                    , closeBtn: 1
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
                    , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                    , content: 'ç³»ç»ç®¡ç/èåèªå®ä¹/Xt_DefineMenuDisplay.html'
                    , resize: false
                    , btn: ["ç¡®å®"]
                    , end: function () {
                        //å·æ°é¡µé¢,
                        location.reload();
                    }
                })
            }, false);
            //#endregion
        });

        document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
        document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
    </script>

    <!--<script>
    var _hmt = _hmt || [];
    (function() {
      var hm = document.createElement("script");
      hm.src = "https://hm.baidu.com/hm.js?d214947968792b839fd669a4decaaffc";
      var s = document.getElementsByTagName("script")[0];
      s.parentNode.insertBefore(hm, s);
    })();
    </script>-->
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Source.html

@@ -411,7 +411,7 @@
                                , "HRemark": data.å¤æ³¨
                                , "HUSEORGID": data.HUSEORGID
                                , "HMacAddr": data.macå°å
                                , "HEmpID": data.HEmpID
                                , "HEmpID": data.HEmpID == undefined ? 0 : data.HEmpID
                                , "HEmpName": data.è´è´£äºº
                                
                            });

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

@@ -184,7 +184,29 @@
            });

            //ç¹å»ä¸»è¡¨å¸¦åºä»è¡¨æ°æ®
            table.on('row(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
            //table.on('row(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
             
            //});

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

                var datas = obj.data; //è·å¾å½åè¡æ°æ®
                var linterid = datas.hmainid;
                $.ajax({
@@ -206,26 +228,6 @@
                        }
                    }, error: function () {
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
                    }
                });
            });

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

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

@@ -68,7 +68,7 @@
                                                <label class="layui-form-label">äº§åå¨å·<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -86,7 +86,7 @@
                                                <label class="layui-form-label">ç¹æ£è®¡åç¼å·<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanInterList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -108,7 +108,7 @@
                                                <label class="layui-form-label" style="width:95px;">å¨å·ç¹æ£è§ç¨<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -897,15 +897,15 @@
                                , "HExplanation": data.æè¦
                                , "HRemark": data.å¤æ³¨
                                //, "HPlanNo": data.ç¹æ£è®¡åç¼å·
                                , "HPlanInterID": data.HPlanInterID
                                , "HPlanInterID": data.HPlanInterID == undefined ? 0 : data.HPlanInterID
                                , "HPlanNo": data.ç¹æ£è®¡ååç 
                                , "HMouldID": data.HMouldID
                                , "HMouldID": data.HMouldID == undefined ? 0 : data.HPlanInterID
                                , "HMouldDotCheckRuleName": data.å¨å·ç¹æ£è§ç¨åæ®å·
                                , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
                                , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID == undefined ? 0 : data.HPlanInterID
                                , "HErrNote": data.å¼å¸¸æåµè®°å½ //å¼å¸¸æåµè®°å½
                                , "HBigSafeNote": data.éå¤§å®å¨éæ£è®°å½ //éå¤§å®å¨éæ£è®°å½
                                , "HDotCheckNote": data.ç¹æ£æ°æ® //ç¹æ£æ°æ®
                                , "HShiftsID": data.HShiftsID //
                                , "HShiftsID": data.HShiftsID == undefined ? 0 : data.HPlanInterID
                                , "HShiftsName": data.çæ¬¡åç§° //çæ¬¡åç§°
                            });
                            if (data.æç»ç»è®º == "ä¸åæ ¼") {

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ£¹¤µ¥/Sc_Add_MESStopWorkBillList.html

@@ -618,13 +618,14 @@

            //ä¿åæäº¤
            form.on('submit(Saver)', function (data) {
                var index = layer.load();
               
                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                if (!AllowLoadData())//æ°æ®éªè¯
                {
                    return false;
                }
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESStopWorkBill/SaveGetMESStopFrom", //æ¹æ³æå¨é¡µé¢åæ¹æ³å

 WebTM/views/Éè±¸¹ÜÀí/Sb_EquipDotCheckBill_PDA.html

@@ -623,6 +623,10 @@

            //è¡¨å¤´ä¿¡æ¯è®¾å¤ä¿å»è§ç¨
            form.on('submit(HEquipDotCheckRuleInterist)', function () {
                if ($("#HEquipID").val() == 0 || $("#HEquipID").val() == null || $("#HEquipID").val() == "") {
                    layer.alert("è¯·åæ«æè®¾å¤äºç»´ç å¸¦åºè®¾å¤ä¿¡æ¯");
                    return;
                }
                //é¡µé¢å±-èªå®ä¹
                layer.open({
                    type: 2,
@@ -632,7 +636,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList_PDA.html', 'yes'],
                    content: ['../è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList_PDA.html?HEquipID=' + $("#HEquipID").val(), 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {
                        //æé®ãæé®ä¸ãçåè°

 WebTM/views/Éè±¸¹ÜÀí/Éè±¸¹æ³Ìµ¥/Sb_EquipDotCheckRuleList_PDA.html

@@ -92,6 +92,10 @@
            , laypage = layui.laypage
            , laydate = layui.laydate
            , soulTable = layui.soulTable

            var params = getUrlVars();
            var HEquipID = params[params[0]]; //è®¾å¤ID

            var sWhere = "";
            var option = [];
            var HModName = "Sb_EquipDotCheckRuleList_PDA";
@@ -228,11 +232,12 @@

            //æ¥è¯¢
            function get_Display(sWhere) {
                sWhere += "";
                var index = layer.load();
                var ajaxLoad = layer.load();
                //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
                $.ajax({
                    url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
                    url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleListPDA',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
@@ -313,27 +318,27 @@
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                //if (ColName != 0 && Comparator != 0) {
                //    var com = "";
                //    switch (Comparator) {
                //        case "7":
                //            com = "like'%" + ColContent + "%'";
                //            break;
                //        case "8":
                //            com = "like'%" + ColContent + "'";
                //            break;
                //        case "9":
                //            com = "like'" + ColContent + "%'";
                //            break;
                //        case "10":
                //            com = "not like'%" + ColContent + "%'";
                //            break;
                //        default:
                //            com = "" + Comparator + "'" + ColContent + "'";
                //            break;
                //    }
                //    sWhere += " and " + ColName + " " + com;
                //}
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
@@ -643,6 +648,18 @@
                form.render('select');
            }

            //è·ååæ°
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }

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


 WebTM/views/³µ¼ä¹ÜÀí/Æô¶¯µã¼ìµ¥/Gy_WorkBeginDotCheckListBill.html

@@ -469,6 +469,7 @@
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 400
                    , limit: 100
                    , cols: [[
                        { type: 'checkbox', totalRowText: 'åè®¡è¡' }
                        , { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }

 WebTM/views/³µ¼ä¹ÜÀí/Æô¶¯µã¼ìµ¥/Sc_WorkBeginDotCheckBill.html

@@ -309,13 +309,13 @@
        var HMaterID = "";  //ç©æ
        var HSourceID = ""; //çäº§èµæº
        var HProcID = "";  //å·¥åº
        var SCOrde = "";//çäº§è®¢åå·
        var SCOrder = "";//å·¥åºæµè½¬å¡å·

        var edit = function (data) {
            HMaterID = data[0].HMaterID;
            HSourceID = data[0].HSourceID;
            HProcID = data[0].HProcID;
            SCOrde = data[0].SCOrde;
            SCOrder = data[0].SCOrder;
        }

        layui.config({
@@ -411,7 +411,7 @@
                //åå§ååè¡¨
                get_InitGrid();
                //è·åæ¥å·¥å°è·³è½¬æ°æ®
                RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrde);
                RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrder);
                //ç¦ç¨ç»ç»éé¡¹
                $('#HOrgID').attr("disabled", true);
            }
@@ -590,6 +590,7 @@
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 400
                    ,limit:100
                    , cols: [[
                        { type: 'checkbox', totalRowText: 'åè®¡è¡' }
                        , { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
@@ -1200,13 +1201,13 @@
            //#endregion

            //#region  æ¥å·¥å¹³å°è·³è½¬èµå¼
            function RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrde)//å è½½è¡¨å¤´
            function RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrder)//å è½½è¡¨å¤´
            {
                $.ajax({
                    url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/ï»¿Sc_WorkBeginDotCheckBillList",
                    type: "GET",
                    async: false,
                    data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID, "SCOrde": SCOrde,"user": sessionStorage["HUserName"] },
                    data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID, "SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var tableMain = result.data;
                        var tableSub = result.data;

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

@@ -140,6 +140,12 @@
                                                <input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">é¡¹ç®ç¼å·</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">æ»è£å¾å·</label>
                                            <div class="layui-input-inline">
@@ -462,12 +468,12 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                        <!--<div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">é¡¹ç®ç¼å·</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        </div>-->

                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">å§å¤å å·¥åä½</label>
@@ -1479,7 +1485,7 @@
                        $('#HSNCtrl' + (i + 1)).attr("checked", true);
                    }
                }
              

                form.render('select');
                form.render('checkbox');

@@ -2274,7 +2280,7 @@


                                , "HName": data.è®¢åççº§
                                , "HSplitNo": data.æåå·
                                , "HSplitNo": data.æåå· == undefined ? 0 : data.æåå·
                                , "HRemark2": data.ç½å¯è¦æ±
                                , "HRemark3": data.åºé¨å¤æ³¨
                                , "HEmpID": data.HEmpID
@@ -2282,8 +2288,8 @@
                                , "HCusID": data.HCusID
                                , "HCusNames": data.å®¢æ·
                                , "HColorRemark": data.æè²è¦æ±
                                , "HSplitSumQty": data.æåæ»é
                                , "HSplitColorQty": data.åç¼¸å·
                                , "HSplitSumQty": data.æåæ»é == undefined ? 0 : data.æåå·
                                , "HSplitColorQty": data.åç¼¸å· == undefined ? 0 : data.æåå·

                                , "HProjectNum": data.é¡¹ç®ç¼å·
                                , "HVerNum": data.çæ¬
@@ -2300,7 +2306,7 @@
                                , "HWorkShopID": data.HWorkShopID
                                , "textBox2": data.ä»»å¡åå·
                                , "HWorkBillSortNo": data.æ¥è®¡åå·¥åå·
                                , "HSupName": data.å§å¤å å·¥åä½
                                , "HSupName": data.å§å¤å å·¥åä½ == undefined ? 0 : data.æåå·
                                , "HSupID": data.HSupID
                                , "HMaterName": data.åä»¶åç§°
                                , "HMaterID": data.HMaterID

 WebTM/views/³µ¼ä¹ÜÀí/·À´íÑéÖ¤/Gy_MaterPreventErrMouldBill.html

@@ -40,7 +40,7 @@
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">åæ®å·<label style="color:red"> * </label></label>
                                            <div class="layui-input-block"  style="margin-left: 120px;">
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                            </div>
@@ -62,7 +62,18 @@
                                            </div>
                                        </div>
                                    </div>
                                 
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">å·¥åº<label style="color:red"> * </label></label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>                                      
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">å¤æ³¨</label>
@@ -288,6 +299,14 @@
            });
            //#endregion


            //#region éæ©å·¥åºæé®
            form.on('submit(btnSearchHProc)', function () {
                get_checkSearchHProc();
            });
            //#endregion


            //#endregion


@@ -399,6 +418,7 @@
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 400
                    , limit: 100
                    , cols: [[
                        { type: 'checkbox', totalRowText: 'åè®¡è¡' }
                        , { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
@@ -489,6 +509,33 @@
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion

            //#region å·¥åºéæ©é¡µé¢
            function get_checkSearchHProc() {
                layer.open({
                    type: 2//å¼¹çªç±»å
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'å·¥åºåè¡¨'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.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('è¯·éæ©æ°æ®');
                        }
                        $("#HProcName").val(checkStatus.data[0].å·¥åºåç§°);
                        $("#HProcID").val(checkStatus.data[0].HItemID);


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

                            , "HMaterID": tableMain[0]["HMaterID"]
                            , "HMaterName": tableMain[0]["ç©æåç§°"]
                          
                            , "HProcID": tableMain[0]["HProcID"]
                            , "HProcName": tableMain[0]["å·¥åºåç§°"]

                            , "HRemark": tableMain[0]["è¡¨å¤´å¤æ³¨"]
                            , "HMaker": tableMain[0]["å¶åäºº"]
@@ -741,7 +789,11 @@
            $("#HMaterID").val(obj.HItemID);
            $("#HMaterName").val(obj.ç©æåç§°);
        }

        //å·¥åº
        function GetProcessValue(obj) {
            $("#HProcName").val(obj[0].å·¥åºåç§°);
            $("#HProcID").val(obj[0].HItemID);
        }
        //é²éè£ç½®
        function GetPreventErrMouldValue(obj) {
            OptionData = obj;

 WebTM/views/³µ¼ä¹ÜÀí/·À´íÑéÖ¤/Qc_PreventErrMouldCheckBill.html

@@ -253,11 +253,15 @@

    <script>
        var HMaterID = "";  //ç©æ
        var SCOrder = "";//çæè®¢åå·
        var HProcID = "";  //å·¥åº
        var SCOrder = "";//å·¥åºæµè½¬å¡å·

        var edit = function (data) {
            HMaterID = data[0].HMaterID;
            HProcID = data[0].HProcID;
            SCOrder = data[0].SCOrder;
        }


        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
@@ -351,7 +355,7 @@
                //åå§ååè¡¨
                get_InitGrid();
                //è·åæ¥å·¥å°è·³è½¬æ°æ®
                RoadBillEdit(HMaterID, SCOrder);
                RoadBillEdit(HMaterID, HProcID, SCOrder);
                //ç¦ç¨ç»ç»éé¡¹
                $('#HOrgID').attr("disabled", true);
            }
@@ -500,6 +504,7 @@
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 400
                    , limit: 100
                    , cols: [[
                        { type: 'checkbox', totalRowText: 'åè®¡è¡' }
                        , { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
@@ -927,14 +932,14 @@
             //#endregion

            //#region  æ¥å·¥å¹³å°è·³è½¬èµå¼
            function RoadBillEdit(HMaterID, SCOrder)//å è½½è¡¨å¤´
            function RoadBillEdit(HMaterID, HProcID, SCOrder)//å è½½è¡¨å¤´
            {
                $.ajax({
                    url: GetWEBURL() + "/Qc_PreventErrMouldCheckBill/ï»¿Qc_PreventErrMouldCheckBillList",
                    type: "GET",
                    async: false,
                    data: {
                        "HMaterID": HMaterID, "SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
                        "HMaterID": HMaterID, "HProcID": HProcID,"SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var tableMain = result.data;
                        var tableSub = result.data;

			@@ -10,7 +10,7 @@
			<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
			<LastUsedPlatform>Any CPU</LastUsedPlatform>
			<PublishProvider>FileSystem</PublishProvider>
			<PublishUrl>D:\ç¼ç \åå¸\layui</PublishUrl>
			<PublishUrl>D:\ç½ç«åå¸\æºäºMESWMS\LAYUI</PublishUrl>
			<WebPublishMethod>FileSystem</WebPublishMethod>
			<SiteUrlToLaunchAfterPublish />
			</PropertyGroup>

			@@ -206,6 +206,8 @@
			<Content Include="views\home\console_pb.html" />
			<Content Include="views\home\console_QiaoYi.html" />
			<Content Include="views\home\console_Mobile_QiaoYi.html" />
			<Content Include="views\indexMenu_PDA.html" />
			<Content Include="views\indexMenu_PingBan.html" />
			<Content Include="views\index_KaiBeiNaiTe.html" />
			<Content Include="views\index_Mobile_KaiBeiNaiTe.html" />
			<Content Include="views\index_Mobile_QiaoYi.html" />

			@@ -3,7 +3,7 @@
			<PropertyGroup>
			<NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			<IISExpressSSLPort />

			@@ -5,11 +5,11 @@
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
			/var WEBURL = "http://localhost/API/"; / //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®
			// var WEBURL = "http://localhost:81/API/"; //çå½¬æ¬å°éç½®
			var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®
			//var WEBURL = "http://localhost:81/API/"; //çå½¬æ¬å°éç½®
			/var WEBURL = "http://localhost:8083/API/"; //éé¯éæ¬å°éç½®/
			// var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®
			var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°éç½®
			//var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°éç½®(å®ç)
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW

			@@ -1127,7 +1127,7 @@
			"HMaterID": HMaterID,
			"HProcID": HProcID,
			"HSourceID": HSourceID1,
			"SCOrder": HICMOBillNo
			"SCOrder": HSourceBillNo
			});

			//éè¿ç´¢å¼è·åå°å½åiframeå¼¹åºå±
			@@ -1156,7 +1156,8 @@
			var data = [];
			data.push({
			"HMaterID": HMaterID,
			"SCOrder": HICMOBillNo
			"HProcID": HProcID,
			"SCOrder": HSourceBillNo
			});

			//éè¿ç´¢å¼è·åå°å½åiframeå¼¹åºå±

New file
			@@ -0,0 +1,273 @@
			ï»¿<!DOCTYPE html>
			<html>
			<head>
			<meta charset="utf-8">
			<title>LMESç®¡çç³»ç»ç§»å¨ç«¯</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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
			<script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
			<style>
			.layui-nav-tree .layui-nav-item {
			width: 88%;
			}

			.layui-nav * {
			font-size: 13px;
			}

			.layui-side-menu .layui-nav .layui-nav-item a {
			padding-left: 25px;
			}
			</style>
			</head>
			<body class="layui-layout-body">
			<div id="LAY_app">
			<div class="layui-layout layui-layout-admin">
			<div class="layui-header">
			<!-- å¤´é¨åºå -->
			<ul class="layui-nav layui-layout-left">
			<li class="layui-nav-item layadmin-flexible" lay-unselect>
			<a href="javascript:;" layadmin-event="flexible" title="ä¾§è¾¹ä¼¸ç¼©">
			<i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
			</a>
			</li>
			<li class="layui-nav-item" lay-unselect>
			<a href="javascript:;" layadmin-event="refresh" title="å·æ°">
			<i class="layui-icon layui-icon-refresh-3"></i>
			</a>
			</li>
			<li class="layui-nav-item" lay-unselect>
			<a href="javascript:void(0);">
			<i id="MenuDefineID" class="layui-icon layui-icon-app"></i>
			</a>
			</li>
			</ul>
			<ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
			<li class="layui-nav-item layui-hide-xs" lay-unselect>
			<a href="javascript:;" layadmin-event="theme">
			<i class="layui-icon layui-icon-theme"></i>
			</a>
			</li>
			<li class="layui-nav-item layui-hide-xs" lay-unselect>
			<a href="javascript:;" layadmin-event="note">
			<i class="layui-icon layui-icon-note"></i>
			</a>
			</li>
			<li class="layui-nav-item layui-hide-xs" lay-unselect>
			<a href="javascript:;" layadmin-event="fullscreen">
			<i class="layui-icon layui-icon-screen-full"></i>
			</a>
			</li>
			<li class="layui-nav-item" lay-unselect>
			<a href="javascript:;">
			<cite>
			<label name="UserName" id="UserName"></label>
			</cite>
			</a>
			</li>
			<li class="layui-nav-item" lay-unselect>
			<dd layadmin-event="logout" style="text-align: center;background-color:red"><a>éåº</a></dd>
			</li>
			</ul>
			</div>

			<!-- ä¾§è¾¹èå -->
			<div class="layui-side layui-side-menu">
			<div class="layui-side-scroll">
			<div class="layui-logo" lay-href="home/console_Mobile_KaiBeiNaiTe.html">
			<img src="../layuiadmin/myicon/yidongduan.svg" alt="ç§»å¨ç«¯" style="width:25px;height:25px;margin-right: 5px;" />
			<span>LMESç®¡çç³»ç»</span>
			</div>
			<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu" style="width:260px">
			</ul>
			</div>
			</div>

			<!-- é¡µé¢æ ç¾ -->
			<div class="layadmin-pagetabs" id="LAY_app_tabs">
			<div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
			<div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
			<div class="layui-icon layadmin-tabs-control layui-icon-down">
			<ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
			<li class="layui-nav-item" lay-unselect>
			<a href="javascript:;"></a>
			<dl class="layui-nav-child layui-anim-fadein">
			<dd layadmin-event="closeThisTabs"><a href="javascript:;">å³éå½åæ ç¾é¡µ</a></dd>
			<dd layadmin-event="closeOtherTabs"><a href="javascript:;">å³éå¶å®æ ç¾é¡µ</a></dd>
			<dd layadmin-event="closeAllTabs"><a href="javascript:;">å³éå¨é¨æ ç¾é¡µ</a></dd>
			</dl>
			</li>
			</ul>
			</div>
			<div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
			<ul class="layui-tab-title" id="LAY_app_tabsheader">
			<li lay-id="home/console_Mobile_KaiBeiNaiTe.html" lay-attr="home/console_Mobile_KaiBeiNaiTe.html" class="layui-this"><i class="layui-icon layui-icon-home"></i></li>
			</ul>
			</div>
			</div>


			<!-- ä¸»ä½åå®¹ -->
			<div class="layui-body" id="LAY_app_body">
			<div class="layadmin-tabsbody-item layui-show">
			<iframe src="home/console_Mobile_KaiBeiNaiTe.html" frameborder="0" class="layadmin-iframe"></iframe>
			</div>
			</div>

			<!-- è¾å©åç´ ï¼ä¸è¬ç¨äºç§»å¨è®¾å¤ä¸é®ç½© -->
			<div class="layadmin-body-shade" layadmin-event="shade"></div>
			</div>
			</div>

			<script src="../layuiadmin/layui/layui.js"></script>
			<script src="../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../layuiadmin/PubCustom.js"></script>
			<script>
			layui.config({
			base: '../layuiadmin/'
			}).extend({
			index: 'lib/index'
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
			var $ = layui.$;
			var element = layui.element;
			var $ = layui.jquery;

			var HType = "mobile"; //ç»å½å¹³å°ï¼PCç«¯ãææºç«¯
			//#region é¡µé¢åå§å
			set_ClearBill();
			//#endregion




			//#region é¡µé¢å¶å®æ¹æ³
			//#region é¡µé¢åå§åæ¹æ³
			function set_ClearBill() {
			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "user/login.html"; });
			}
			//å è½½ä¾§è¾¹èåæ
			set_sideMenuDisPlay();
			}
			//#endregion

			//#region æ¾ç¤ºä¾§è¾¹èå
			function set_sideMenuDisPlay() {
			////å¤æç¨æ·æ¯ç§»å¨ç«¯è¿æ¯PCç«¯
			//var judgeMorPCflag = judgeMorPC();
			//if (judgeMorPCflag) {//PCç«¯
			// window.location.href = 'indexMenu.html'
			//}

			var ajaxLoad = layer.load();
			//è·åèååè¡¨æ°æ®
			$.ajax({
			url: GetWEBURL() + "/Web/MenuList",
			type: "GET",
			async: false,
			data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
			success: function (data) {
			var data = JSON.parse(data.data);
			console.log(data);
			MenuMain(data);
			layer.close(ajaxLoad);
			},
			error: function (data) {
			layer.close(ajaxLoad);
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region éåçæä¸»èå
			function MenuMain(data) {

			var liStr = '';
			//éåçæä¸»èå
			for (var i = 0; i < data.length; i++) {
			// å¤ææ¯å¦åå¨åèå
			if (data[i].childMenus != null && data[i].childMenus.length > 0) {
			liStr += '<li data-name="set" class="layui-nav-item">';
			//è®¾ç½®ä¸çº§èåå¾æ
			if (data[i].HLevel == 1 && data[i].HPicNum != null && data[i].HPicNum != "") {
			liStr += '<a><i class="' + data[i].HPicNum + '"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
			} else {
			liStr += '<a><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
			}

			liStr += '<dl class="layui-nav-child">';
			// éåè·ååèå
			for (var k = 0; k < data[i].childMenus.length; k++) {
			liStr += getChildMenu(data[i].childMenus[k], 0);
			}
			liStr += '</dl></li>';
			} else {
			liStr += '<li class="layui-nav-item"><a class="" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
			}
			};
			$(".layui-nav-tree").html(liStr);
			element.init();
			}
			//#endregion

			//#region éå½çæåèå
			function getChildMenu(subMenu, num) {
			num++;
			var subStr = '';
			if (subMenu.childMenus != null && subMenu.childMenus.length > 0) {
			subStr += '<dd>';
			subStr += '<a>' + subMenu.HName + '</a>';
			subStr += '<dl class="layui-nav-child">';
			for (var j = 0; j < subMenu.childMenus.length; j++) {
			subStr += getChildMenu(subMenu.childMenus[j], num);
			}
			subStr += '</dl>';
			subStr += '</dd>';
			} else {
			subStr += '<dd><a lay-href="' + subMenu.Hurl + '">' + subMenu.HName + '</a></dd>';
			}
			return subStr;
			}
			//#endregion

			//#region èåèªå®ä¹ï¼å¼¹åºèåèªå®ä¹åé¡µé¢
			Ul = document.getElementById("MenuDefineID");
			Ul.addEventListener("click", function (event) {
			layer.open({
			type: 2
			, area: ['90%', '90%']
			, title: 'èåèªå®ä¹'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: 'ç³»ç»ç®¡ç/èåèªå®ä¹/Xt_DefineMenuDisplay.html'
			, resize: false
			, btn: ["ç¡®å®"]
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			}
			})
			}, false);
			//#endregion
			//#endregion

			});

			document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
			</script>

			</body>
			</html>

New file
			@@ -0,0 +1,324 @@
			ï»¿

			<!DOCTYPE html>
			<html>
			<head>
			<meta charset="utf-8">
			<title>LMESç®¡çç³»ç»</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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
			<script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
			<script language="JavaScript">
			//å±è½åéæé®
			history.pushState(null, null, document.URL);
			window.addEventListener('popstate', function () {
			history.pushState(null, null, document.URL);
			});
			</script>
			<script>
			/^http(s*):\/\//.test(location.href) \|\| alert('è¯·åé¨ç½²å° localhost ä¸åè®¿é®');
			</script>

			</head>
			<body class="layui-layout-body">

			<div id="LAY_app">
			<div class="layui-layout layui-layout-admin">
			<div class="layui-header">
			<!-- å¤´é¨åºå -->
			<ul class="layui-nav">
			<li class="layui-nav-item layadmin-flexible" lay-unselect>
			<a href="javascript:;" layadmin-event="flexible" title="ä¾§è¾¹ä¼¸ç¼©">
			<i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
			</a>
			</li>
			<li class="layui-nav-item layui-hide-xs" lay-unselect>
			<a href="http://www.layui.com/admin/" target="_blank" title="åå°">
			<i class="layui-icon layui-icon-website"></i>
			</a>
			</li>
			<li class="layui-nav-item" lay-unselect>
			<a href="javascript:;" layadmin-event="refresh" title="å·æ°">
			<i class="layui-icon layui-icon-refresh-3"></i>
			</a>
			</li>
			<li class="layui-nav-item layui-hide-xs" lay-unselect>
			<input type="text" placeholder="æç´¢..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="https://www.baidu.com/s?ie=UTF-8&wd=">
			</li>
			<li class="layui-nav-item" lay-unselect style="color: black;">
			<span>ç»å½ç»ç»ï¼</span>
			<label id="Organization"></label>
			</li>
			</ul>
			<ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
			<li class="layui-nav-item" lay-unselect>
			<a href="javascript:void(0);">
			<i id="MenuDefineID" class="layui-icon layui-icon-app"></i>
			</a>
			</li>
			<li class="layui-nav-item" lay-unselect>
			<a href="javascript:void(0);">
			<!--<a lay-href="app/message/index.html" layadmin-event="message" lay-text="æ¶æ¯ä¸å¿">-->
			<i class="layui-icon layui-icon-notice"></i>

			<!--å¦æææ°æ¶æ¯ï¼åæ¾ç¤ºå°åç¹-->
			<span class="layui-badge-dot"></span>
			</a>
			</li>
			<li class="layui-nav-item layui-hide-xs" lay-unselect>
			<a href="javascript:;" layadmin-event="theme">
			<i class="layui-icon layui-icon-theme"></i>
			</a>
			</li>
			<li class="layui-nav-item layui-hide-xs" lay-unselect>
			<a href="javascript:;" layadmin-event="note">
			<i class="layui-icon layui-icon-note"></i>
			</a>
			</li>
			<li class="layui-nav-item layui-hide-xs" lay-unselect>
			<a href="javascript:;" layadmin-event="fullscreen">
			<i class="layui-icon layui-icon-screen-full"></i>
			</a>
			</li>
			<li class="layui-nav-item" lay-unselect style="margin-right:15px;">
			<a href="javascript:;">
			<cite>
			<label name="UserName" id="UserName"></label>
			</cite>
			</a>
			<dl class="layui-nav-child">
			<dd><a lay-href="set/user/info.html">åºæ¬èµæ</a></dd>
			<dd><a lay-href="set/user/password.html">ä¿®æ¹å¯ç </a></dd>
			<dd layadmin-event="logout" style="text-align: center;"><a>éåº</a></dd>
			</dl>
			</li>

			<!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
			<a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
			</li>-->
			<li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
			<a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
			</li>
			</ul>
			</div>

			<!-- ä¾§è¾¹èå -->
			<!--<div class="layui-side layui-side-menu" style="display:none;">
			<div class="layui-side-scroll">
			<div class="layui-logo" lay-href="home/console.html">
			<img src="../layuiadmin/myicon/win.svg" alt="PCç«¯" style="width:25px;height:25px;margin-right: 5px;" />
			<span>LMESç®¡çç³»ç»</span>
			</div>
			<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">-->
			<!-- éè´ç®¡ç -->
			<!--<li data-name="set" class="layui-nav-item">
			<a><i class="layui-icon layui-icon-set"></i><cite>éè´ç®¡ç</cite></a>
			<dl class="layui-nav-child">
			<dd>
			<a>å§å¤è®¢å</a>
			<dl class="layui-nav-child">
			<dd><a lay-href="éè´ç®¡ç/å§å¤è®¢å/WW_EntrustOrderBillList.html">å§å¤è®¢åç»´æ¤</a></dd>
			</dl>
			</dd>
			</dl>
			</li>-->

			<!--</ul>
			</div>
			</div>-->

			<!-- é¡µé¢æ ç¾ -->
			<div class="layadmin-pagetabs" id="LAY_app_tabs" style="position:fixed;left:0px;">
			<div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
			<div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
			<div class="layui-icon layadmin-tabs-control layui-icon-down">
			<ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
			<li class="layui-nav-item" lay-unselect>
			<a href="javascript:;"></a>
			<dl class="layui-nav-child layui-anim-fadein">
			<dd layadmin-event="closeThisTabs"><a href="javascript:;">å³éå½åæ ç¾é¡µ</a></dd>
			<dd layadmin-event="closeOtherTabs"><a href="javascript:;">å³éå¶å®æ ç¾é¡µ</a></dd>
			<dd layadmin-event="closeAllTabs"><a href="javascript:;">å³éå¨é¨æ ç¾é¡µ</a></dd>
			</dl>
			</li>
			</ul>
			</div>
			<div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
			<ul class="layui-tab-title" id="LAY_app_tabsheader">
			<li lay-id="home/console.html" lay-attr="home/console.html" class="layui-this"><i class="layui-icon layui-icon-home"></i></li>
			</ul>
			</div>
			</div>


			<!-- ä¸»ä½åå®¹ -->
			<div class="layui-body" id="LAY_app_body" style="position:fixed;left:0px;">
			<div class="layadmin-tabsbody-item layui-show">
			<iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>
			</div>
			</div>

			<!-- è¾å©åç´ ï¼ä¸è¬ç¨äºç§»å¨è®¾å¤ä¸é®ç½© -->
			<div class="layadmin-body-shade" layadmin-event="shade"></div>
			</div>
			</div>

			<script src="../layuiadmin/layui/layui.js"></script>
			<script src="../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../layuiadmin/PubCustom.js"></script>
			<script>
			// å¯¼èªèåçé´éåç´
			var menuCell = 5;

			layui.config({
			base: '../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
			var $ = layui.$;
			var element = layui.element;
			var $ = layui.jquery;

			var HType = "PC"; //ç»å½å¹³å°ï¼PCç«¯ãææºç«¯
			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			//if (sessionStorage.login != "login") {
			// layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			// icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			// }, function () { window.location.href = "user/login.html"; });
			//}


			//#region é¡µé¢åå§å
			//set_sideMenuDisPlay();
			//#endregion


			//#region

			//#endregion

			//#region é¡µé¢å¶å®æ¹æ³
			//æ¾ç¤ºä¾§è¾¹èå
			function set_sideMenuDisPlay() {
			//å¤æç¨æ·æ¯ç§»å¨ç«¯è¿æ¯PCç«¯
			//var judgeMorPCflag = judgeMorPC();
			//if (!judgeMorPCflag) {//ç§»å¨ç«¯
			// var dd = '<dd><a href="è½¦é´ç®¡ç/å·¥åºæµè½¬/MES_StationInBill_PDA.html">å·¥åºè¿ç«æ¥æ¶åPDA</a ></dd > <dd><a href="è½¦é´ç®¡ç/å·¥åºæµè½¬/MES_StationOutBill_PDA.html">å·¥åºåºç«æ±æ¥åPDA</a></dd>';
			// $("#append").prepend(dd);
			//}
			//if (!judgeMorPCflag) {//ç§»å¨ç«¯
			// window.location.href = 'index_Mobile.html'
			//}

			var ajaxLoad = layer.load();
			//è·åèååè¡¨æ°æ®
			$.ajax({
			url: GetWEBURL() + "/Web/MenuList",
			type: "GET",
			async: false,
			data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
			success: function (data) {
			var data = JSON.parse(data.data);
			console.log(data);
			MenuMain(data);
			layer.close(ajaxLoad);
			},
			error: function (data) {
			layer.close(ajaxLoad);
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			}
			//éåçæä¸»èå
			function MenuMain(data) {

			var liStr = '';
			//éåçæä¸»èå
			for (var i = 0; i < data.length; i++) {
			// å¤ææ¯å¦åå¨åèå
			if (data[i].childMenus != null && data[i].childMenus.length > 0) {
			liStr += '<li data-name="set" class="layui-nav-item">';
			//è®¾ç½®ä¸çº§èåå¾æ
			if (data[i].HLevel == 1 && data[i].HPicNum != null && data[i].HPicNum != "") {
			liStr += '<a><i class="' + data[i].HPicNum + '"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
			} else {
			liStr += '<a><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
			}

			liStr += '<dl class="layui-nav-child">';
			// éåè·ååèå
			for (var k = 0; k < data[i].childMenus.length; k++) {
			liStr += getChildMenu(data[i].childMenus[k], 0);
			}
			liStr += '</dl></li>';
			} else {
			liStr += '<li class="layui-nav-item"><a class="" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
			}
			};
			$(".layui-nav-tree").html(liStr);
			element.init();
			}

			// éå½çæåèå
			function getChildMenu(subMenu, num) {
			num++;
			var subStr = '';
			if (subMenu.childMenus != null && subMenu.childMenus.length > 0) {
			subStr += '<dd>';
			subStr += '<a>' + subMenu.HName + '</a>';
			subStr += '<dl class="layui-nav-child">';
			for (var j = 0; j < subMenu.childMenus.length; j++) {
			subStr += getChildMenu(subMenu.childMenus[j], num);
			}
			subStr += '</dl>';
			subStr += '</dd>';
			} else {
			subStr += '<dd><a lay-href="' + subMenu.Hurl + '">' + subMenu.HName + '</a></dd>';
			}
			return subStr;
			}



			//èåèªå®ä¹ï¼å¼¹åºèåèªå®ä¹åé¡µé¢
			Ul = document.getElementById("MenuDefineID");
			Ul.addEventListener("click", function (event) {
			layer.open({
			type: 2
			, area: ['90%', '90%']
			, title: 'èåèªå®ä¹'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: 'ç³»ç»ç®¡ç/èåèªå®ä¹/Xt_DefineMenuDisplay.html'
			, resize: false
			, btn: ["ç¡®å®"]
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			}
			})
			}, false);
			//#endregion
			});

			document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
			document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
			</script>

			<!--<script>
			var _hmt = _hmt \|\| [];
			(function() {
			var hm = document.createElement("script");
			hm.src = "https://hm.baidu.com/hm.js?d214947968792b839fd669a4decaaffc";
			var s = document.getElementsByTagName("script")[0];
			s.parentNode.insertBefore(hm, s);
			})();
			</script>-->
			</body>
			</html>

			@@ -411,7 +411,7 @@
			, "HRemark": data.å¤æ³¨
			, "HUSEORGID": data.HUSEORGID
			, "HMacAddr": data.macå°å
			, "HEmpID": data.HEmpID
			, "HEmpID": data.HEmpID == undefined ? 0 : data.HEmpID
			, "HEmpName": data.è´è´£äºº

			});

			@@ -184,7 +184,29 @@
			});

			//ç¹å»ä¸»è¡¨å¸¦åºä»è¡¨æ°æ®
			table.on('row(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			//table.on('row(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"

			//});

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

			var datas = obj.data; //è·å¾å½åè¡æ°æ®
			var linterid = datas.hmainid;
			$.ajax({
			@@ -206,26 +228,6 @@
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			});

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

			@@ -68,7 +68,7 @@
			<label class="layui-form-label">äº§åå¨å·<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -86,7 +86,7 @@
			<label class="layui-form-label">ç¹æ£è®¡åç¼å·<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanInterList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -108,7 +108,7 @@
			<label class="layui-form-label" style="width:95px;">å¨å·ç¹æ£è§ç¨<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -897,15 +897,15 @@
			, "HExplanation": data.æè¦
			, "HRemark": data.å¤æ³¨
			//, "HPlanNo": data.ç¹æ£è®¡åç¼å·
			, "HPlanInterID": data.HPlanInterID
			, "HPlanInterID": data.HPlanInterID == undefined ? 0 : data.HPlanInterID
			, "HPlanNo": data.ç¹æ£è®¡ååç
			, "HMouldID": data.HMouldID
			, "HMouldID": data.HMouldID == undefined ? 0 : data.HPlanInterID
			, "HMouldDotCheckRuleName": data.å¨å·ç¹æ£è§ç¨åæ®å·
			, "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
			, "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID == undefined ? 0 : data.HPlanInterID
			, "HErrNote": data.å¼å¸¸æåµè®°å½ //å¼å¸¸æåµè®°å½
			, "HBigSafeNote": data.éå¤§å®å¨éæ£è®°å½ //éå¤§å®å¨éæ£è®°å½
			, "HDotCheckNote": data.ç¹æ£æ°æ® //ç¹æ£æ°æ®
			, "HShiftsID": data.HShiftsID //
			, "HShiftsID": data.HShiftsID == undefined ? 0 : data.HPlanInterID
			, "HShiftsName": data.çæ¬¡åç§° //çæ¬¡åç§°
			});
			if (data.æç»ç»è®º == "ä¸åæ ¼") {

			@@ -618,13 +618,14 @@

			//ä¿åæäº¤
			form.on('submit(Saver)', function (data) {
			var index = layer.load();

			var sMainStr = JSON.stringify(data.field);
			var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
			if (!AllowLoadData())//æ°æ®éªè¯
			{
			return false;
			}
			var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Sc_MESStopWorkBill/SaveGetMESStopFrom", //æ¹æ³æå¨é¡µé¢åæ¹æ³å

			@@ -623,6 +623,10 @@

			//è¡¨å¤´ä¿¡æ¯è®¾å¤ä¿å»è§ç¨
			form.on('submit(HEquipDotCheckRuleInterist)', function () {
			if ($("#HEquipID").val() == 0 \|\| $("#HEquipID").val() == null \|\| $("#HEquipID").val() == "") {
			layer.alert("è¯·åæ«æè®¾å¤äºç»´ç å¸¦åºè®¾å¤ä¿¡æ¯");
			return;
			}
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -632,7 +636,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList_PDA.html', 'yes'],
			content: ['../è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList_PDA.html?HEquipID=' + $("#HEquipID").val(), 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°

			@@ -92,6 +92,10 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, soulTable = layui.soulTable

			var params = getUrlVars();
			var HEquipID = params[params[0]]; //è®¾å¤ID

			var sWhere = "";
			var option = [];
			var HModName = "Sb_EquipDotCheckRuleList_PDA";
			@@ -228,11 +232,12 @@

			//æ¥è¯¢
			function get_Display(sWhere) {
			sWhere += "";
			var index = layer.load();
			var ajaxLoad = layer.load();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
			url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleListPDA',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (data1) {
			@@ -313,27 +318,27 @@
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}
			//if (ColName != 0 && Comparator != 0) {
			// var com = "";
			// switch (Comparator) {
			// case "7":
			// com = "like'%" + ColContent + "%'";
			// break;
			// case "8":
			// com = "like'%" + ColContent + "'";
			// break;
			// case "9":
			// com = "like'" + ColContent + "%'";
			// break;
			// case "10":
			// com = "not like'%" + ColContent + "%'";
			// break;
			// default:
			// com = "" + Comparator + "'" + ColContent + "'";
			// break;
			// }
			// sWhere += " and " + ColName + " " + com;
			//}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			@@ -643,6 +648,18 @@
			form.render('select');
			}

			//è·ååæ°
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			for (var i = 0; i < hashes.length; i++) {
			hash = hashes[i].split('=');
			vars.push(hash[0]);
			vars[hash[0]] = hash[1];
			}
			return vars;
			}

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

			@@ -469,6 +469,7 @@
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			, limit: 100
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }

			@@ -309,13 +309,13 @@
			var HMaterID = ""; //ç©æ
			var HSourceID = ""; //çäº§èµæº
			var HProcID = ""; //å·¥åº
			var SCOrde = "";//çäº§è®¢åå·
			var SCOrder = "";//å·¥åºæµè½¬å¡å·

			var edit = function (data) {
			HMaterID = data[0].HMaterID;
			HSourceID = data[0].HSourceID;
			HProcID = data[0].HProcID;
			SCOrde = data[0].SCOrde;
			SCOrder = data[0].SCOrder;
			}

			layui.config({
			@@ -411,7 +411,7 @@
			//åå§ååè¡¨
			get_InitGrid();
			//è·åæ¥å·¥å°è·³è½¬æ°æ®
			RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrde);
			RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrder);
			//ç¦ç¨ç»ç»éé¡¹
			$('#HOrgID').attr("disabled", true);
			}
			@@ -590,6 +590,7 @@
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			,limit:100
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
			@@ -1200,13 +1201,13 @@
			//#endregion

			//#region æ¥å·¥å¹³å°è·³è½¬èµå¼
			function RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrde)//å è½½è¡¨å¤´
			function RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrder)//å è½½è¡¨å¤´
			{
			$.ajax({
			url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/ï»¿Sc_WorkBeginDotCheckBillList",
			type: "GET",
			async: false,
			data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID, "SCOrde": SCOrde,"user": sessionStorage["HUserName"] },
			data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID, "SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
			success: function (result) {
			var tableMain = result.data;
			var tableSub = result.data;

			@@ -140,6 +140,12 @@
			<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">é¡¹ç®ç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProjectNum" id="HProjectNum">
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ»è£å¾å·</label>
			<div class="layui-input-inline">
			@@ -462,12 +468,12 @@
			</button>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">é¡¹ç®ç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>-->

			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">å§å¤å å·¥åä½</label>
			@@ -1479,7 +1485,7 @@
			$('#HSNCtrl' + (i + 1)).attr("checked", true);
			}
			}


			form.render('select');
			form.render('checkbox');

			@@ -2274,7 +2280,7 @@


			, "HName": data.è®¢åççº§
			, "HSplitNo": data.æåå·
			, "HSplitNo": data.æåå· == undefined ? 0 : data.æåå·
			, "HRemark2": data.ç½å¯è¦æ±
			, "HRemark3": data.åºé¨å¤æ³¨
			, "HEmpID": data.HEmpID
			@@ -2282,8 +2288,8 @@
			, "HCusID": data.HCusID
			, "HCusNames": data.å®¢æ·
			, "HColorRemark": data.æè²è¦æ±
			, "HSplitSumQty": data.æåæ»é
			, "HSplitColorQty": data.åç¼¸å·
			, "HSplitSumQty": data.æåæ»é == undefined ? 0 : data.æåå·
			, "HSplitColorQty": data.åç¼¸å· == undefined ? 0 : data.æåå·

			, "HProjectNum": data.é¡¹ç®ç¼å·
			, "HVerNum": data.çæ¬
			@@ -2300,7 +2306,7 @@
			, "HWorkShopID": data.HWorkShopID
			, "textBox2": data.ä»»å¡åå·
			, "HWorkBillSortNo": data.æ¥è®¡åå·¥åå·
			, "HSupName": data.å§å¤å å·¥åä½
			, "HSupName": data.å§å¤å å·¥åä½ == undefined ? 0 : data.æåå·
			, "HSupID": data.HSupID
			, "HMaterName": data.åä»¶åç§°
			, "HMaterID": data.HMaterID

			@@ -40,7 +40,7 @@
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
			</div>
			@@ -62,7 +62,18 @@
			</div>
			</div>
			</div>

			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">å·¥åº<label style="color:red"> * </label></label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
			<input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
			<button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¤æ³¨</label>
			@@ -288,6 +299,14 @@
			});
			//#endregion


			//#region éæ©å·¥åºæé®
			form.on('submit(btnSearchHProc)', function () {
			get_checkSearchHProc();
			});
			//#endregion


			//#endregion


			@@ -399,6 +418,7 @@
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			, limit: 100
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
			@@ -489,6 +509,33 @@
			}
			, btn2: function (index, layero) { }
			, end: function () { }
			})
			}
			//#endregion

			//#region å·¥åºéæ©é¡µé¢
			function get_checkSearchHProc() {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'å·¥åºåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.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('è¯·éæ©æ°æ®');
			}
			$("#HProcName").val(checkStatus.data[0].å·¥åºåç§°);
			$("#HProcID").val(checkStatus.data[0].HItemID);


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

			, "HMaterID": tableMain[0]["HMaterID"]
			, "HMaterName": tableMain[0]["ç©æåç§°"]

			, "HProcID": tableMain[0]["HProcID"]
			, "HProcName": tableMain[0]["å·¥åºåç§°"]

			, "HRemark": tableMain[0]["è¡¨å¤´å¤æ³¨"]
			, "HMaker": tableMain[0]["å¶åäºº"]
			@@ -741,7 +789,11 @@
			$("#HMaterID").val(obj.HItemID);
			$("#HMaterName").val(obj.ç©æåç§°);
			}

			//å·¥åº
			function GetProcessValue(obj) {
			$("#HProcName").val(obj[0].å·¥åºåç§°);
			$("#HProcID").val(obj[0].HItemID);
			}
			//é²éè£ç½®
			function GetPreventErrMouldValue(obj) {
			OptionData = obj;

			@@ -253,11 +253,15 @@

			<script>
			var HMaterID = ""; //ç©æ
			var SCOrder = "";//çæè®¢åå·
			var HProcID = ""; //å·¥åº
			var SCOrder = "";//å·¥åºæµè½¬å¡å·

			var edit = function (data) {
			HMaterID = data[0].HMaterID;
			HProcID = data[0].HProcID;
			SCOrder = data[0].SCOrder;
			}


			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -351,7 +355,7 @@
			//åå§ååè¡¨
			get_InitGrid();
			//è·åæ¥å·¥å°è·³è½¬æ°æ®
			RoadBillEdit(HMaterID, SCOrder);
			RoadBillEdit(HMaterID, HProcID, SCOrder);
			//ç¦ç¨ç»ç»éé¡¹
			$('#HOrgID').attr("disabled", true);
			}
			@@ -500,6 +504,7 @@
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			, limit: 100
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
			@@ -927,14 +932,14 @@
			//#endregion

			//#region æ¥å·¥å¹³å°è·³è½¬èµå¼
			function RoadBillEdit(HMaterID, SCOrder)//å è½½è¡¨å¤´
			function RoadBillEdit(HMaterID, HProcID, SCOrder)//å è½½è¡¨å¤´
			{
			$.ajax({
			url: GetWEBURL() + "/Qc_PreventErrMouldCheckBill/ï»¿Qc_PreventErrMouldCheckBillList",
			type: "GET",
			async: false,
			data: {
			"HMaterID": HMaterID, "SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
			"HMaterID": HMaterID, "HProcID": HProcID,"SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
			success: function (result) {
			var tableMain = result.data;
			var tableSub = result.data;