MES-WEB-LayUI.git

parent: 0e72054c | 补丁 | 提交 | ignore whitespace

chenhaozhe

2025-06-12 28ca4459d80039a98577233fcc1d4ec9c4ca121a

器具管理 添加模具状态分析页面

7个文件已修改

1个文件已删除

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/common.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模具状态分析/Sc_MouldStatusAnalysis.html	537 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模具状态分析/Sc_MouldStatusAnalysis_Card.js	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -587,6 +587,7 @@
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·æéç»´ä¿®åPDA\Sc_MouldConkBookBill_PDAEdit.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·æéç»´ä¿®åPDA\Sc_MouldConkBookBillList_PDA.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·æéç»´ä¿®åPDA\Sc_MouldConkBookBill_PDA.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·ç¶æåæ\Sc_MouldStatusAnalysis.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·çäº§éåºå\Sc_MouldProdBackBillList_PDA.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·çäº§éåºå\Sc_MouldProdBackBill_PDA_old.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·çäº§é¢ç¨å\Sc_MouldProdOutBillList_PDA.html" />

 WebTM/WebTM.csproj.user

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

 WebTM/layuiadmin/common.js

@@ -79,4 +79,4 @@
// å¤ææ¯å¦å¨æ¯æ°å
function isAllDigits(str) {
  return /^\d+$/.test(str);
}
}

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

@@ -265,8 +265,8 @@
                //ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
                RoadBillMain(linterid);
                $("#HItemID").val(0);
                $("#HNumber").val('');
                $("#HName").val('');
                //$("#HNumber").val('');
                //$("#HName").val('');
                //åå§åå¶åäººåå¶åæ¶é´
                $("#HMakeEmp").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -401,7 +401,7 @@
                //æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "Gy_Warehouse/cx",
                    url: GetWEBURL() + "/Gy_Warehouse/cx",
                    type: "GET",
                    async: false,
                    data: {
@@ -520,7 +520,7 @@
                //}
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    url: GetWEBURL() + "/Gy_Warehouse/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: true,
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                    dataType: "json",

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

@@ -15,6 +15,7 @@
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/common.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -770,13 +771,14 @@
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1 && data[0].å®¡æ ¸äºº==="") {
                debugger
                if (checkStatus.data.length === 1 && isEmpty(data[0]["å®¡æ ¸äºº"]) === true) { // å·²å®¡æ ¸è¿çæ°æ®ä¸è½å é¤
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
                        var wait = layer.load();
                        //é»è¾å é¤æ¹æ³
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_Warehouse',
                            url: GetWEBURL() + '/DeltetGy_Warehouse',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£¾ß×´Ì¬·ÖÎö/Sc_MouldStatusAnalysis.html

@@ -13,7 +13,98 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/layui/layui1.js"></script>
    <script src="../../../layuiadmin/echarts.min.js"></script>
    <script src="../../../layuiadmin/common.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <link href="../../../layuiadmin/layui/css/ReportPlatform.css" rel="stylesheet" />

    <style>
        /*æ ç¶å¾ç¹å»é«äº®åè²*/
        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
            background: #aef0f7;
        }

        .cnt {
            border: 1px solid #5FB878;
            height: 50px;
            border-radius: 5px;
            /*background: -webkit-gradient(linear, 0% 0%, 0% 50%,from(#262525), to(#262525));*/ /*è°·æ*/
        }

        .bottomright {
            cursor: pointer; /*é¼ æ åææææ ·å¼*/
            transition: all 0.1s; /*ææå±æ§ååå¨0.6ç§åæ§è¡å¨ç»*/
        }

            .bottomright:hover {
                transform: scale(1.3); /*é¼ æ æ¾ä¸ä¹ååç´ åæ1.4åå¤§å°*/
            }

        .imgtitle {
            width: 70%;
            height: 50px;
            text-align: center;
            display: block;
            font-size: 15px;
            float: left;
            line-height: 50px;
        }

        .cns {
            border: 1px solid #5FB878;
            height: auto;
            border-radius: 5px;
        }

            .cns p {
                font-size: 12px;
                line-height: 18px;
                margin: 0 5px;
                white-space: nowrap;
                text-overflow: ellipsis;
                overflow: hidden;
            }

        .check1 {
            cursor: pointer; /*é¼ æ åææææ ·å¼*/
            -webkit-transition: border linear .1s,-webkit-box-shadow linear .5s;
            border-color: rgba(0,148, 255,.75);
            -webkit-box-shadow: 0 0 18px rgba(0,148,255);
        }

        .prs {
            font-family: "å¾®è½¯éé»";
            font-weight: bold;
            line-height: 30px;
            margin: 0 0px 0px 10px;
            float: left;
        }

        .layui-progress {
            width: 45%;
            float: left;
            top: 6px;
        }

        .tr1-1, .tr1-2, .tr1-3, .tr1-4 {
            margin-left: 3%;
            margin-top: 4%;
            height: 310px;
            border: 1px solid rgb(0 0 0 / 10%);
            width: 95%;
        }

        .btnM {
            width: 30%;
            height: 50px;
            line-height: 50px;
            float: left;
            text-align: right;
        }

        .layui-icon {
            font-size: 20px;
        }
    </style>
</head>

<body>
@@ -23,132 +114,67 @@
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-row">
                            <!-- æ¨¡å·ä»åºç¶ç±»éæ© -->
                            <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="TreeTable" class="demo-tree demo-tree-box"
                                    style="height: 600px; overflow: scroll;"></div>
                                     style="height: 500px; overflow: scroll;"></div>
                            </div>
                            <div class="layui-col-xs9 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="btomleft" style="height:600px;display:block;overflow-y:auto;">
                            <!-- å¡çæ¾ç¤ºé¢æ¿ -->
                            <div class="layui-col-xs10 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="btomleft" style="height:500px;display:block;overflow-y:auto;">
                                </div>
                            </div>
                            <div class="layui-col-xs1 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <fieldset
                                    style="border: 1px solid #eee; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%); height: 585px;">
                                    <legend style="color: #5FB878">æä½å°</legend>
                                    <div class="content4">
                                        <div class="layui-row layui-col-space10">
                                            <div class="layui-col-sm12 " onclick="PowerOn(event,this)">
                                                <div class="cnt bottomright">
                                                    <div class="btnM">
                                                        <span class="layui-icon layui-icon-pause imgicon"></span>
                                                    </div>
                                                    <span class="imgtitle">å¼æº</span>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row layui-col-space10">
                                            <div class="layui-col-sm12 " onclick="PowerOff(event,this)">
                                                <div class="cnt bottomright">
                                                    <div class="btnM">
                                                        <span class="layui-icon layui-icon-logout imgicon"></span>
                                                    </div>
                                                    <span class="imgtitle">åæº</span>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row layui-col-space10">
                                            <div class="layui-col-sm12 " onclick="DotCheck(event,this)">
                                                <div class="cnt bottomright">
                                                    <div class="btnM">
                                                        <span class="layui-icon layui-icon-list imgicon"></span>
                                                    </div>
                                                    <span class="imgtitle">ç¹æ£è®°å½</span>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row layui-col-space10">
                                            <div class="layui-col-sm12 " onclick="FaultRegistration(event,this)">
                                                <div class="cnt bottomright">
                                                    <div class="btnM">
                                                        <span class="layui-icon layui-icon-list imgicon"></span>
                                                    </div>
                                                    <span class="imgtitle">æéç»è®°</span>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row layui-col-space10">
                                            <div class="layui-col-sm12 " onclick="Maintenance(event,this)">
                                                <div class="cnt bottomright">
                                                    <div class="btnM">
                                                        <span class="layui-icon layui-icon-form imgicon"></span>
                                                    </div>
                                                    <span class="imgtitle">ç»´ä¿®</span>
                                                </div>
                                            </div>
                                        </div>

                                        <div class="layui-row layui-col-space10">
                                            <div class="layui-col-sm12 " onclick="Resume(event,this)">
                                                <div class="cnt bottomright">
                                                    <div class="btnM">
                                                        <span class="layui-icon layui-icon-table imgicon"></span>
                                                    </div>
                                                    <span class="imgtitle">å±¥å</span>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row layui-col-space10">
                                            <div class="layui-col-sm12 " onclick="Process(event,this)">
                                                <div class="cnt bottomright">
                                                    <div class="btnM">
                                                        <span class="layui-icon layui-icon-file imgicon"></span>
                                                    </div>
                                                    <span class="imgtitle">å·¥èº</span>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row layui-col-space10">
                                            <div class="layui-col-sm12 " onclick="HStatus(event,this)">
                                                <div class="cnt bottomright">
                                                    <div class="btnM">
                                                        <span class="layui-icon layui-icon-set imgicon"></span>
                                                    </div>
                                                    <span class="imgtitle">ç¶æ</span>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </fieldset>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs3 layui-inline">
                                <div class="tr1-1" id="mychart11"> </div>
                            <div class="layui-tab">
                                <ul class="layui-tab-title">
                                    <li class="layui-this">å±¥å</li>
                                </ul>
                                <div class="layui-tab-content">
                                    <div class="layui-tab-item layui-show">
                                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                                    </div>
                                    
                                </div>
                            </div>
                            <div class="layui-col-xs3 layui-inline">
                                <div class="tr1-2" id="mychart22"> </div>
                            </div>
                            <div class="layui-col-xs3 layui-inline">
                                <div class="tr1-3" id="mychart3"> </div>
                            </div>
                            <div class="layui-col-xs3 layui-inline">
                                <div class="tr1-4" id="mychart4"> </div>
                            </div>
                            <!--<div class="layui-col-xs3 layui-inline">
        <div class="tr1-1" id="mychart11"> </div>
    </div>
    <div class="layui-col-xs3 layui-inline">
        <div class="tr1-2" id="mychart22"> </div>
    </div>
    <div class="layui-col-xs3 layui-inline">
        <div class="tr1-3" id="mychart3"> </div>
    </div>
    <div class="layui-col-xs3 layui-inline">
        <div class="tr1-4" id="mychart4"> </div>
    </div>-->
                            <!-- åè¡¨æ¥è¯¢ -->
                        </div>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script type="text/html" id="toolbarDemo">
        <div class="layui-btn-container my-btn-container">
            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Search"><i class="layui-icon layui-icon-search"></i>åè®¾ç½®</button>-->
        </div>
    </script>
</body>

</html>
<script>
    var selectedMouldId = -1
    var params = get_UrlVars();
    layui.config({
        base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
    }).extend({
        index: 'lib/index', //ä¸»å¥å£æ¨¡å
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree'], function () {
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree', 'soulTable'], function () {
        //#region å¬ç¨åé
        var $ = layui.$
            , admin = layui.admin
@@ -159,6 +185,9 @@
            , laypage = layui.laypage
            , laydate = layui.laydate
            , tree = layui.tree
            , soulTable = layui.soulTable

        var titleData = ["HInterID", "HBillType"];
        //#endregion

        //#region è¿å¥é¡µé¢å³å è½½
@@ -170,17 +199,311 @@

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

        $('#btomleft').on('click', function () {  // çå¬å¡çå®¹å¨ç¹å»äºä»¶

        })
        //#endregion

        //#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³
        function set_ClearBill() {

            //åå§åè¡¨æ ¼
            set_InitGrid();

            get_Display_Tree()

            get_DisplayResume(selectedMouldId)
        }

        //æ¥è¯¢æ¨¡å·æ¸å çæå¡ç
        function Check(HWHID) {
            wktag = 0;
            debugger
            $("#btomleft").html("");
            $.ajax({
                url: GetWEBURL() + '/Web/Get_Sc_MouldStatusAnalysisList',
                type: "GET",
                data: { "sWhere": " and HWHID = " + HWHID , "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
                dataType: "json",//æ°æ®ç±»åå¯ä»¥ä¸º text xml json  script  jsonp
                success: function (data) {
                    var LoadData1 = data.data;
                    if (LoadData1.length > 0)  //å·¥ååè¡¨æ°æ®
                    {

                        for (var i = 0; i < LoadData1.length; i++) {
                            var html1 = '';
                            html1 += '<div class="layui-col-sm12 layui-col-md2"  style="margin: 6px;width: 180px;">';
                            html1 += '<div class="cns" data-index=' + (i + 1) + ' id="bs' + (i + 1) + '">';
                            html1 += '<dl>';
                            html1 += '<dd class="tcenter">';
                            html1 += '<h1 style="display:none;"><span>æ¨¡å·IDï¼</span><span id="md' + (i + 1) + '">' + LoadData1[i].HInterID + '</span></h1>';
                            //html1 += '<h1 style="display:none;"><span>çäº§è®¢ååIDï¼</span><span id="ds' + (i + 1) + '">' + LoadData1[i].çäº§è®¢åååç  + '</span></h1>';
                            //html1 += '<h1 style="display:none;"><span>äº§çº¿IDï¼</span><span id="cs' + (i + 1) + '">' + LoadData1[i].HSourceID + '</span></h1>';
                            html1 += '<h1 style="display:none;"><span>ä»åºIDï¼</span><span id="wh' + (i + 1) + '">' + LoadData1[i].HWHID + '</span></h1>';

                            html1 += '<p><span>æ¨¡å·ç¼å·ï¼</span><span id="mdno' + (i + 1) + '">' + LoadData1[i].æ¨¡å·ç¼å· + '</span></p>';
                            html1 += '<p><span>æ¨¡å·åç§°ï¼</span><span id="mdname' + (i + 1) + '">' + LoadData1[i].æ¨¡å·åç§° + '</span></p>';
                            html1 += '<p><span>ä»åºï¼</span><span id="whname' + (i + 1) + '">' + LoadData1[i].ä»åº + '</span></p>';
                            html1 += '<p><span>ä½¿ç¨ç¶æï¼</span><span id="ustatus' + (i + 1) + '">' + LoadData1[i].ä½¿ç¨ç¶æ + '</span></p>';
                            html1 += '<p><span>è®¾è®¡å¯¿å½ï¼</span><span id="dlife' + (i + 1) + '">' + LoadData1[i].è®¾è®¡å¯¿å½ + '</span></p>';
                            html1 += '<p><span>ä½¿ç¨å¯¿å½ï¼</span><span id="ulife' + (i + 1) + '">' + LoadData1[i].ä½¿ç¨å¯¿å½ + '</span></p>';
                            html1 += '<p><span>å©ä½å¯¿å½ï¼</span><span id="rlife' + (i + 1) + '">' + (LoadData1[i].è®¾è®¡å¯¿å½ - LoadData1[i].ä½¿ç¨å¯¿å½) + '</span></p>';
                            switch (LoadData1[i].æ¨¡å·ç¶æ) {
                                case "å¨åº":
                                    html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border6"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
                                    break;
                                case "æéç»´ä¿®":
                                    html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
                                    break;
                                case "é¢åº":
                                    html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
                                    break;
                                case "ä¿å»":
                                    html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
                                    break;
                                case "ç»´ä¿®ä¸":
                                    html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border5"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
                                    break;
                                case "æé":
                                    html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
                                    break;
                                case "ç»´ä¿®å®æ":
                                    html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border7"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
                                    break;
                                default:
                                    html1 += '<p><span>å½åç¶æï¼</span><span></span><span>' + LoadData1[i].æ¨¡å·ç¶æ +'</span></p>';
                                    break;
                                    
                            }
                            html1 += '</dd>';
                            html1 += '</dl>';
                            html1 += '</div>';
                            html1 += '</div>';
                            $("#btomleft").append(html1);
                        }
                    }
                },
                error: function (err) {
                    layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
                    return false;
                }
            });
        }

        function set_InitGrid() {
            optionResume = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-130'
                , page: true
                , totalRow: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cellMinWidth: 100
                , done: function (res, curr, count) {
                    soulTable.render(this);
                }
            }
        }

        table.on('toolbar(mainTable)', function (obj) {
            switch (obj.event) {
                case "get_Refresh": set_Refresh(); break;
                case "get_Exit": set_Exit(); break;
            }
        })

        //#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;
                }
            });
        })
        //#endregion


        //#region æ¥è¯¢æ¨¡å·å±¥å
        function get_DisplayResume(HInterID) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Gy_MouldFileMain/GetMouldResumeList',
                type: "GET",
                data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.code == 1) {
                        var data = [];
                        var col = [];
                        var totalArray = ["æ°é", "å³èæ°é", "æªå³èæ°é", "æå°æ¡ç æ°é", "æªæå°æ¡ç æ°é", "å®æ¶æ°é", "éé¢", "è®¡åéé¢"];
                        //ç»ç©ºçæ°ç»èµå¼
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                        col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                            }
                            else if ($.inArray(data[i].name, totalArray) > -1) {  //æ·»å è®¡ç®å
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                            } else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                }
                            }
                        }
                        optionResume.cols = [col];
                        optionResume.data = data1.data;

                        table.render(optionResume);
                        layer.close(ajaxLoad);
                        //layer.alert("æ¥è¯¢æå", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }
            });

        }

        function get_Display_Tree() {
            //var sWhere = " and ä»åºç±»å=N'æ¨¡å·ä»åº'";
            let sWhere = ""
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Gy_Warehouse/listTree',
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
                type: "GET",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(ajaxLoad);
                        var data = JSON.parse(data1.data);
                        MenuMain(data);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }
            });
        }

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

                    var data = obj.data;  //è·åå½åç¹å»çèç¹æ°æ®
                    HWHID = 0;
                    if (data.id == "0") {

                    } else {
                        HWHID = data.id;
                    }
                    Check(HWHID); // æ¥è¯¢ä»åºä¸çæ¸å
                }
            });
        }

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

        function set_Exit() {
            layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
                let exitMode = isEmpty(params[params['openType']]) === false ? 1 : 2;
                debugger
                Pub_Close(exitMode);
            });
        }

        function set_Refresh() {
            get_DisplayResume(selectedMouldId)
        }

        $("#btomleft").on("click", function (e) {

            let tar = e.target
            let ct = $(tar).closest(".cns ")
            if (ct.length > 0) {
                let i = $(ct[0]).data('index');

                selectedMouldId = $("#md" + i)[0].innerText

                // æ·»å æ ·å¼
                $('.cns').removeClass('check1');  //å é¤ä¸åç¶çº§clssæ ·å¼ç¸åçææåç´ 
                $("#bs" + i + "").addClass('check1'); // æ·»å å½ååç´ çæ ·å¼

                get_DisplayResume(selectedMouldId);
            }
        })



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

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£¾ß×´Ì¬·ÖÎö/Sc_MouldStatusAnalysis_Card.js

File was deleted

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdInBillEdit.html

@@ -427,7 +427,7 @@
            if (OperationType == 1) {//æ æºæ°å¢
                set_AddFNew();
            }
            if (OperationType == 2) {//æ æºæ°å¢
            else if (OperationType == 2) {//æ æºæ°å¢
                set_EditFromGrid(linterid);

                get_MAXNum();
@@ -604,7 +604,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true
                    , content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2', 'yes']
                    , content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
                    , btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {

@@ -947,6 +947,7 @@
            //#region æ¤é¡µé¢æææ¹æ³
            //åå§åè¡¨åæä»¶
            function set_InitFrom() {
                Organ();
                laydate.render({
                    elem: '#HDate'
                });
@@ -1064,7 +1065,6 @@
            //ç¼è¾è·åè¡¨å¤´
            function set_EditForm(linterid) {
                //åå§åç»ç»
                Organ();
                $.ajax({
                    url: GetWEBURL() + "/Sc_MouldProdInBill/Sc_MouldProdInHouseBillListCheckDetai",
                    type: "GET",

			@@ -587,6 +587,7 @@
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·æéç»´ä¿®åPDA\Sc_MouldConkBookBill_PDAEdit.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·æéç»´ä¿®åPDA\Sc_MouldConkBookBillList_PDA.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·æéç»´ä¿®åPDA\Sc_MouldConkBookBill_PDA.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·ç¶æåæ\Sc_MouldStatusAnalysis.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·çäº§éåºå\Sc_MouldProdBackBillList_PDA.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·çäº§éåºå\Sc_MouldProdBackBill_PDA_old.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·çäº§é¢ç¨å\Sc_MouldProdOutBillList_PDA.html" />

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

			@@ -79,4 +79,4 @@
			// å¤ææ¯å¦å¨æ¯æ°å
			function isAllDigits(str) {
			return /^\d+$/.test(str);
			}
			}

			@@ -265,8 +265,8 @@
			//ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
			RoadBillMain(linterid);
			$("#HItemID").val(0);
			$("#HNumber").val('');
			$("#HName").val('');
			//$("#HNumber").val('');
			//$("#HName").val('');
			//åå§åå¶åäººåå¶åæ¶é´
			$("#HMakeEmp").val(sessionStorage["HUserName"]);
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			@@ -401,7 +401,7 @@
			//æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "Gy_Warehouse/cx",
			url: GetWEBURL() + "/Gy_Warehouse/cx",
			type: "GET",
			async: false,
			data: {
			@@ -520,7 +520,7 @@
			//}
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/Gy_Warehouse/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
			dataType: "json",

			@@ -15,6 +15,7 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/common.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -770,13 +771,14 @@
			function set_DeleteBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1 && data[0].å®¡æ ¸äºº==="") {
			debugger
			if (checkStatus.data.length === 1 && isEmpty(data[0]["å®¡æ ¸äºº"]) === true) { // å·²å®¡æ ¸è¿çæ°æ®ä¸è½å é¤
			var ItemID = data[0].HItemID.toString();
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			var wait = layer.load();
			//é»è¾å é¤æ¹æ³
			$.ajax({
			url: GetWEBURL() + 'DeltetGy_Warehouse',
			url: GetWEBURL() + '/DeltetGy_Warehouse',
			type: "GET",
			data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
			success: function (result) {

			@@ -13,7 +13,98 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/layui/layui1.js"></script>
			<script src="../../../layuiadmin/echarts.min.js"></script>
			<script src="../../../layuiadmin/common.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<link href="../../../layuiadmin/layui/css/ReportPlatform.css" rel="stylesheet" />

			<style>
			/æ ç¶å¾ç¹å»é«äº®åè²/
			.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
			background: #aef0f7;
			}

			.cnt {
			border: 1px solid #5FB878;
			height: 50px;
			border-radius: 5px;
			/background: -webkit-gradient(linear, 0% 0%, 0% 50%,from(#262525), to(#262525));/ /è°·æ/
			}

			.bottomright {
			cursor: pointer; /é¼ æ åææææ ·å¼/
			transition: all 0.1s; /ææå±æ§ååå¨0.6ç§åæ§è¡å¨ç»/
			}

			.bottomright:hover {
			transform: scale(1.3); /é¼ æ æ¾ä¸ä¹ååç´ åæ1.4åå¤§å°/
			}

			.imgtitle {
			width: 70%;
			height: 50px;
			text-align: center;
			display: block;
			font-size: 15px;
			float: left;
			line-height: 50px;
			}

			.cns {
			border: 1px solid #5FB878;
			height: auto;
			border-radius: 5px;
			}

			.cns p {
			font-size: 12px;
			line-height: 18px;
			margin: 0 5px;
			white-space: nowrap;
			text-overflow: ellipsis;
			overflow: hidden;
			}

			.check1 {
			cursor: pointer; /é¼ æ åææææ ·å¼/
			-webkit-transition: border linear .1s,-webkit-box-shadow linear .5s;
			border-color: rgba(0,148, 255,.75);
			-webkit-box-shadow: 0 0 18px rgba(0,148,255);
			}

			.prs {
			font-family: "å¾®è½¯éé»";
			font-weight: bold;
			line-height: 30px;
			margin: 0 0px 0px 10px;
			float: left;
			}

			.layui-progress {
			width: 45%;
			float: left;
			top: 6px;
			}

			.tr1-1, .tr1-2, .tr1-3, .tr1-4 {
			margin-left: 3%;
			margin-top: 4%;
			height: 310px;
			border: 1px solid rgb(0 0 0 / 10%);
			width: 95%;
			}

			.btnM {
			width: 30%;
			height: 50px;
			line-height: 50px;
			float: left;
			text-align: right;
			}

			.layui-icon {
			font-size: 20px;
			}
			</style>
			</head>

			<body>
			@@ -23,132 +114,67 @@
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-row">
			<!-- æ¨¡å·ä»åºç¶ç±»éæ© -->
			<div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box"
			style="height: 600px; overflow: scroll;"></div>
			style="height: 500px; overflow: scroll;"></div>
			</div>
			<div class="layui-col-xs9 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="btomleft" style="height:600px;display:block;overflow-y:auto;">
			<!-- å¡çæ¾ç¤ºé¢æ¿ -->
			<div class="layui-col-xs10 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="btomleft" style="height:500px;display:block;overflow-y:auto;">
			</div>
			</div>
			<div class="layui-col-xs1 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<fieldset
			style="border: 1px solid #eee; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%); height: 585px;">
			<legend style="color: #5FB878">æä½å°</legend>
			<div class="content4">
			<div class="layui-row layui-col-space10">
			<div class="layui-col-sm12 " onclick="PowerOn(event,this)">
			<div class="cnt bottomright">
			<div class="btnM">
			<span class="layui-icon layui-icon-pause imgicon"></span>
			</div>
			<span class="imgtitle">å¼æº</span>
			</div>
			</div>
			</div>
			<div class="layui-row layui-col-space10">
			<div class="layui-col-sm12 " onclick="PowerOff(event,this)">
			<div class="cnt bottomright">
			<div class="btnM">
			<span class="layui-icon layui-icon-logout imgicon"></span>
			</div>
			<span class="imgtitle">åæº</span>
			</div>
			</div>
			</div>
			<div class="layui-row layui-col-space10">
			<div class="layui-col-sm12 " onclick="DotCheck(event,this)">
			<div class="cnt bottomright">
			<div class="btnM">
			<span class="layui-icon layui-icon-list imgicon"></span>
			</div>
			<span class="imgtitle">ç¹æ£è®°å½</span>
			</div>
			</div>
			</div>
			<div class="layui-row layui-col-space10">
			<div class="layui-col-sm12 " onclick="FaultRegistration(event,this)">
			<div class="cnt bottomright">
			<div class="btnM">
			<span class="layui-icon layui-icon-list imgicon"></span>
			</div>
			<span class="imgtitle">æéç»è®°</span>
			</div>
			</div>
			</div>
			<div class="layui-row layui-col-space10">
			<div class="layui-col-sm12 " onclick="Maintenance(event,this)">
			<div class="cnt bottomright">
			<div class="btnM">
			<span class="layui-icon layui-icon-form imgicon"></span>
			</div>
			<span class="imgtitle">ç»´ä¿®</span>
			</div>
			</div>
			</div>

			<div class="layui-row layui-col-space10">
			<div class="layui-col-sm12 " onclick="Resume(event,this)">
			<div class="cnt bottomright">
			<div class="btnM">
			<span class="layui-icon layui-icon-table imgicon"></span>
			</div>
			<span class="imgtitle">å±¥å</span>
			</div>
			</div>
			</div>
			<div class="layui-row layui-col-space10">
			<div class="layui-col-sm12 " onclick="Process(event,this)">
			<div class="cnt bottomright">
			<div class="btnM">
			<span class="layui-icon layui-icon-file imgicon"></span>
			</div>
			<span class="imgtitle">å·¥èº</span>
			</div>
			</div>
			</div>
			<div class="layui-row layui-col-space10">
			<div class="layui-col-sm12 " onclick="HStatus(event,this)">
			<div class="cnt bottomright">
			<div class="btnM">
			<span class="layui-icon layui-icon-set imgicon"></span>
			</div>
			<span class="imgtitle">ç¶æ</span>
			</div>
			</div>
			</div>
			</div>
			</fieldset>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			<div class="tr1-1" id="mychart11"> </div>
			<div class="layui-tab">
			<ul class="layui-tab-title">
			<li class="layui-this">å±¥å</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>

			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<div class="tr1-2" id="mychart22"> </div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<div class="tr1-3" id="mychart3"> </div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<div class="tr1-4" id="mychart4"> </div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<div class="tr1-1" id="mychart11"> </div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<div class="tr1-2" id="mychart22"> </div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<div class="tr1-3" id="mychart3"> </div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<div class="tr1-4" id="mychart4"> </div>
			</div>-->
			<!-- åè¡¨æ¥è¯¢ -->
			</div>
			</form>
			</div>
			</div>
			</div>
			</div>

			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container my-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Search"><i class="layui-icon layui-icon-search"></i>åè®¾ç½®</button>-->
			</div>
			</script>
			</body>

			</html>
			<script>
			var selectedMouldId = -1
			var params = get_UrlVars();
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree', 'soulTable'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			, admin = layui.admin
			@@ -159,6 +185,9 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, tree = layui.tree
			, soulTable = layui.soulTable

			var titleData = ["HInterID", "HBillType"];
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -170,17 +199,311 @@

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

			$('#btomleft').on('click', function () { // çå¬å¡çå®¹å¨ç¹å»äºä»¶

			})
			//#endregion

			//#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³
			function set_ClearBill() {

			//åå§åè¡¨æ ¼
			set_InitGrid();

			get_Display_Tree()

			get_DisplayResume(selectedMouldId)
			}

			//æ¥è¯¢æ¨¡å·æ¸å çæå¡ç
			function Check(HWHID) {
			wktag = 0;
			debugger
			$("#btomleft").html("");
			$.ajax({
			url: GetWEBURL() + '/Web/Get_Sc_MouldStatusAnalysisList',
			type: "GET",
			data: { "sWhere": " and HWHID = " + HWHID , "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
			dataType: "json",//æ°æ®ç±»åå¯ä»¥ä¸º text xml json script jsonp
			success: function (data) {
			var LoadData1 = data.data;
			if (LoadData1.length > 0) //å·¥ååè¡¨æ°æ®
			{

			for (var i = 0; i < LoadData1.length; i++) {
			var html1 = '';
			html1 += '<div class="layui-col-sm12 layui-col-md2" style="margin: 6px;width: 180px;">';
			html1 += '<div class="cns" data-index=' + (i + 1) + ' id="bs' + (i + 1) + '">';
			html1 += '<dl>';
			html1 += '<dd class="tcenter">';
			html1 += '<h1 style="display:none;"><span>æ¨¡å·IDï¼</span><span id="md' + (i + 1) + '">' + LoadData1[i].HInterID + '</span></h1>';
			//html1 += '<h1 style="display:none;"><span>çäº§è®¢ååIDï¼</span><span id="ds' + (i + 1) + '">' + LoadData1[i].çäº§è®¢åååç + '</span></h1>';
			//html1 += '<h1 style="display:none;"><span>äº§çº¿IDï¼</span><span id="cs' + (i + 1) + '">' + LoadData1[i].HSourceID + '</span></h1>';
			html1 += '<h1 style="display:none;"><span>ä»åºIDï¼</span><span id="wh' + (i + 1) + '">' + LoadData1[i].HWHID + '</span></h1>';

			html1 += '<p><span>æ¨¡å·ç¼å·ï¼</span><span id="mdno' + (i + 1) + '">' + LoadData1[i].æ¨¡å·ç¼å· + '</span></p>';
			html1 += '<p><span>æ¨¡å·åç§°ï¼</span><span id="mdname' + (i + 1) + '">' + LoadData1[i].æ¨¡å·åç§° + '</span></p>';
			html1 += '<p><span>ä»åºï¼</span><span id="whname' + (i + 1) + '">' + LoadData1[i].ä»åº + '</span></p>';
			html1 += '<p><span>ä½¿ç¨ç¶æï¼</span><span id="ustatus' + (i + 1) + '">' + LoadData1[i].ä½¿ç¨ç¶æ + '</span></p>';
			html1 += '<p><span>è®¾è®¡å¯¿å½ï¼</span><span id="dlife' + (i + 1) + '">' + LoadData1[i].è®¾è®¡å¯¿å½ + '</span></p>';
			html1 += '<p><span>ä½¿ç¨å¯¿å½ï¼</span><span id="ulife' + (i + 1) + '">' + LoadData1[i].ä½¿ç¨å¯¿å½ + '</span></p>';
			html1 += '<p><span>å©ä½å¯¿å½ï¼</span><span id="rlife' + (i + 1) + '">' + (LoadData1[i].è®¾è®¡å¯¿å½ - LoadData1[i].ä½¿ç¨å¯¿å½) + '</span></p>';
			switch (LoadData1[i].æ¨¡å·ç¶æ) {
			case "å¨åº":
			html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border6"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
			break;
			case "æéç»´ä¿®":
			html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
			break;
			case "é¢åº":
			html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
			break;
			case "ä¿å»":
			html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
			break;
			case "ç»´ä¿®ä¸":
			html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border5"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
			break;
			case "æé":
			html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
			break;
			case "ç»´ä¿®å®æ":
			html1 += '<p><span>å½åç¶æï¼</span><span class="gj_icon color_border7"></span><span>' + LoadData1[i].æ¨¡å·ç¶æ + '</span></p>';
			break;
			default:
			html1 += '<p><span>å½åç¶æï¼</span><span></span><span>' + LoadData1[i].æ¨¡å·ç¶æ +'</span></p>';
			break;

			}
			html1 += '</dd>';
			html1 += '</dl>';
			html1 += '</div>';
			html1 += '</div>';
			$("#btomleft").append(html1);
			}
			}
			},
			error: function (err) {
			layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
			return false;
			}
			});
			}

			function set_InitGrid() {
			optionResume = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-130'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cellMinWidth: 100
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}
			}

			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			case "get_Refresh": set_Refresh(); break;
			case "get_Exit": set_Exit(); break;
			}
			})

			//#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;
			}
			});
			})
			//#endregion


			//#region æ¥è¯¢æ¨¡å·å±¥å
			function get_DisplayResume(HInterID) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_MouldFileMain/GetMouldResumeList',
			type: "GET",
			data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.code == 1) {
			var data = [];
			var col = [];
			var totalArray = ["æ°é", "å³èæ°é", "æªå³èæ°é", "æå°æ¡ç æ°é", "æªæå°æ¡ç æ°é", "å®æ¶æ°é", "éé¢", "è®¡åéé¢"];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1) { //æ·»å è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			optionResume.cols = [col];
			optionResume.data = data1.data;

			table.render(optionResume);
			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			}

			function get_Display_Tree() {
			//var sWhere = " and ä»åºç±»å=N'æ¨¡å·ä»åº'";
			let sWhere = ""
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_Warehouse/listTree',
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
			type: "GET",
			success: function (data1) {
			if (data1.count == 1) {
			layer.close(ajaxLoad);
			var data = JSON.parse(data1.data);
			MenuMain(data);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//éåçæä¸»èå
			function MenuMain(data) {
			var liStr = '[';
			//éåçæä¸»èå
			for (var i = 0; i < data.length; i++) {

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

			var data = obj.data; //è·åå½åç¹å»çèç¹æ°æ®
			HWHID = 0;
			if (data.id == "0") {

			} else {
			HWHID = data.id;
			}
			Check(HWHID); // æ¥è¯¢ä»åºä¸çæ¸å
			}
			});
			}

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

			function set_Exit() {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			let exitMode = isEmpty(params[params['openType']]) === false ? 1 : 2;
			debugger
			Pub_Close(exitMode);
			});
			}

			function set_Refresh() {
			get_DisplayResume(selectedMouldId)
			}

			$("#btomleft").on("click", function (e) {

			let tar = e.target
			let ct = $(tar).closest(".cns ")
			if (ct.length > 0) {
			let i = $(ct[0]).data('index');

			selectedMouldId = $("#md" + i)[0].innerText

			// æ·»å æ ·å¼
			$('.cns').removeClass('check1'); //å é¤ä¸åç¶çº§clssæ ·å¼ç¸åçææåç´
			$("#bs" + i + "").addClass('check1'); // æ·»å å½ååç´ çæ ·å¼

			get_DisplayResume(selectedMouldId);
			}
			})



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

			@@ -427,7 +427,7 @@
			if (OperationType == 1) {//æ æºæ°å¢
			set_AddFNew();
			}
			if (OperationType == 2) {//æ æºæ°å¢
			else if (OperationType == 2) {//æ æºæ°å¢
			set_EditFromGrid(linterid);

			get_MAXNum();
			@@ -604,7 +604,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -947,6 +947,7 @@
			//#region æ¤é¡µé¢æææ¹æ³
			//åå§åè¡¨åæä»¶
			function set_InitFrom() {
			Organ();
			laydate.render({
			elem: '#HDate'
			});
			@@ -1064,7 +1065,6 @@
			//ç¼è¾è·åè¡¨å¤´
			function set_EditForm(linterid) {
			//åå§åç»ç»
			Organ();
			$.ajax({
			url: GetWEBURL() + "/Sc_MouldProdInBill/Sc_MouldProdInHouseBillListCheckDetai",
			type: "GET",