MES-WEB-LayUI.git

parent: 607c518c | 补丁 | 提交 | ignore whitespace

yusijie

2023-08-03 577ad1599781b4afca2858afecd9ac51492d10e4

15个文件已修改

4个文件已添加

	WebTM/Properties/PublishProfiles/JFTM.pubxml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	2943 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/home/console.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/条码报表/Kf_BarCodeOutInReport.html	635 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/条码报表/Kf_ICInventory_BarCode.html	562 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/条码报表/Kf_ICInventory_Mater.html	554 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/条码报表/Kf_MaterOutInReport.html	627 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html	215 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/报表分析/SC_DayRkReport.html	35 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/报表分析/sc_ICOMRKReport.html	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/报表分析/sc_ICOMReport.html	77 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/Properties/PublishProfiles/JFTM.pubxml

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

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -204,6 +204,10 @@
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§ç®¡ç\çäº§ç»æå\Sc_PackUnionBill_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\è°æ¨æ¢æ\Kf_MoveStockBill_HuanTuo_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\è°æ¨æ¢æ\Kf_MoveStockBillList_HuanTuo_PDA.html" />
    <Content Include="views\ä»åç®¡ç\æ¡ç æ¥è¡¨\Kf_MaterOutInReport.html" />
    <Content Include="views\ä»åç®¡ç\æ¡ç æ¥è¡¨\Kf_ICInventory_Mater.html" />
    <Content Include="views\ä»åç®¡ç\æ¡ç æ¥è¡¨\Kf_ICInventory_BarCode.html" />
    <Content Include="views\ä»åç®¡ç\æ¡ç æ¥è¡¨\Kf_BarCodeOutInReport.html" />
    <Content Include="views\äººäºç®¡ç\å¥èç³è¯·\HR_EmpEngageRequestBill.html" />
    <Content Include="views\äººäºç®¡ç\å¥èç³è¯·\HR_EmpEngageRequestBillList.html" />
    <Content Include="views\äººäºç®¡ç\ç¦»èç³è¯·\HR_EmpDimissionBill.html" />

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
ï»¿<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\GITä»åº\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,11 +3,11 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //åå¬å®¤æå¡å¨
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //chæ¬å°*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";   //é¢æåæ¬å°éç½®
    var WEBURL = "http://localhost/API/";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost/WEBAPI/";   //é¢å®¶å°å¼æºæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/lubao";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    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
@@ -21,7 +21,7 @@
    //var WEBURL = "http://192.168.80.90:9090/API/";    //å®çæå¡å¨
    //var WEBURL = "http://192.168.16.53:8081/API/";    //é¾å±±æ±½é
    //var WEBURL = "http://122.227.158.218:8090/API/";    //é¾å±±æ±½éå¤ç½
     //var WEBURL = "http://192.168.0.244:8082/API/";    //å¸å¨åç½
    //var WEBURL = "http://192.168.0.244:8082/API/";    //å¸å¨åç½
    return WEBURL
}


 WebTM/views/home/console.html

@@ -3,7 +3,6 @@
<!DOCTYPE html>
<html>
<head>
    <
    <meta charset="utf-8">
    <title>æ§å¶å°ä¸»é¡µä¸</title>
    <meta name="renderer" content="webkit">

 WebTM/views/index.html

@@ -253,8 +253,10 @@
                                    <a>ä»åºæ¥è¡¨</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="ä»åç®¡ç/æ«ç å¼å¸¸è®°å½è¡¨/KF_PonderationBillList.html">æ«ç å¼å¸¸è®°å½æ¥è¯¢</a></dd>
                                        <dd><a lay-href="ä»åç®¡ç/æ¡ç åºå¥åºè®°å½è¡¨/Kf_ICStockBillSubList.html">æ¡ç åºå¥åºè®°å½è¡¨</a></dd>
                                        <dd><a lay-href="ä»åç®¡ç/æ¡ç åºå/KF_ICInventoryList_WMS.html">æ¡ç åºåæ¥è¯¢</a></dd>
                                        <dd><a lay-href="ä»åç®¡ç/æ¡ç æ¥è¡¨/Kf_BarCodeOutInReport.html">æ¡ç åºå¥åºè®°å½è¡¨</a></dd>
                                        <dd><a lay-href="ä»åç®¡ç/æ¡ç æ¥è¡¨/Kf_ICInventory_BarCode.html">æ¡ç åºåæ¥è¯¢æ¥è¡¨</a></dd>
                                        <dd><a lay-href="ä»åç®¡ç/æ¡ç æ¥è¡¨/Kf_MaterOutInReport.html">WMSç©æåºå¥åºè®°å½è¡¨</a></dd>
                                        <dd><a lay-href="ä»åç®¡ç/æ¡ç æ¥è¡¨/Kf_ICInventory_Mater.html">WMSç©æåºåæ¥è¯¢æ¥è¡¨</a></dd>
                                        <dd><a lay-href="ä»åç®¡ç/æ¡ç åºå/KF_PonderationBillMain_Temp.html">æ¡ç åºå¥åºç¼ååè¡¨</a></dd>
                                        <dd><a lay-href="ä»åç®¡ç/æ¡ç åºå¥åºè®°å½è¡¨/KF_PonderationBillList_Query.html">æ«ç è®°å½ç¼åæ¥è¡¨</a></dd>
                                    </dl>
@@ -301,6 +303,7 @@
                                        <dd><a lay-href="è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBillList.html">å·¥èºè·¯çº¿ç»´æ¤</a></dd>
                                        <dd><a lay-href="è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBillListQuery.html">å·¥èºè·¯çº¿æ¥è¯¢</a></dd>
                                        <dd><a lay-href="è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBill.html">å·¥èºè·¯çº¿</a></dd>
                                        <dd><a lay-href="è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBillList_His.html">å·¥èºè·¯çº¿åå²è®°å½</a></dd>
                                        <dd><a lay-href="è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBillimport.html">å·¥èºè·¯çº¿æ°æ®å¯¼å¥</a></dd>
                                    </dl>
                                </dd>

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂë±¨±í/Kf_BarCodeOutInReport.html

New file
@@ -0,0 +1,635 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>æ¡ç åºå¥åºè®°å½</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <style>
        .layui-form-select .layui-input {
            padding-right: 15px;
            cursor: pointer;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">å¼å§æ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç»ææ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">åæ®ç±»å</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HBillType" id="HBillType" lay-verify="HBillType">
                                            <!--å¨ææ¸²æç»ç»-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">ç»ç»</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
                                            <!--å¨ææ¸²æç»ç»-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

                                <div class="layui-colla-content">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ç©æ</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HMater" id="HMater" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æ¹å·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æ¡ç ç¼å·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">åæ®å·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»åº</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»ä½</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æºååå·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">å¶åäºº</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>ä¿ååå®½</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>é»è®¤åå®½</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        //#region æå æ³¨é
        //#endregion
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
            
        //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            var ins;                        //ç¨äºå¯¼åºexcel
            var columns = "";
            var HModName = "Kf_BarCodeOutInReport";
            var titleData = [];     //ä¸éè¦æ¾ç¤ºçåæ®µ
        //#endregion

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

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

            //#region åå§åçé¢
            function set_ClearBill() {
                //è·åå¼å§æ¥æãç»ææ¥æ
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //è·åç»ç»
                Organ();
                //è·ååæ®ç±»å
                BillType();
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //æ¥è¯¢
                get_Display(sWhere);
            }
            //#endregion

            //#region   è·åç»ç»
            function Organ() {
                //è·åç»å½é¡µç»ç»å
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    success: function (result) {
                        var Organization = "";
                        Organization += '<option  style="color:blue;" value="å¨é¨">å¨é¨</option>';
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
                            }
                            $("#HStockOrgID").append(Organization);
                            $("#HStockOrgID").val(sessionStorage["Organization"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region   è·ååæ®ç±»å
            function BillType() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/GetBarCodeReport_BillType_Json",
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    success: function (result) {
                        var HBillType = "";
                        HBillType += '<option  style="color:blue;" value="å¨é¨">å¨é¨</option>';
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HBillType += '<option  style="color:blue;" value="' + data[i].HBillTypeName + '">' + data[i].HBillTypeName + '</option>';
                            }
                            $("#HBillType").append(HBillType);
                            $("#HBillType").val("å¨é¨")
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region åå§åè¡¨æ ¼
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 'full-50'
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                };
            }
            //#endregion

            //#region è·ååå®½
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //è·ååå®½
                $.ajax({
                    type: "Get",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
                    async: false,
                    dataType: "json",
                    data: { "colNum": colNum, "Name": HModName },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {

                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                return result;
            }
            //#endregion

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

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

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

        //#endregion

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

            //#region å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //å¯¼åºæé®
                    case 'btn_Export': get_Export();
                        break;
                    //æ¥è¯¢æé®
                    case 'btn_Query': get_Display();
                        break;
                    //éåºæé®
                    case 'btn_Exit': Pub_Close(2);
                        break;
                    //ä¿ååå®½æé®
                    case 'btn-Cell': set_SaveGridColWidth();
                        break;
                    //é»è®¤åå®½æé®
                    case 'btn-RefreshCell': set_DefaultGridColWidth();
                        break;
                    //åè®¾ç½®
                    case 'btn_HideColumn': get_HideColumn();
                        break;
                };
            });
            //#endregion

            //#region å¯¼åºExecel
            function get_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion

            //#region æ¥è¯¢
            function get_Display() {
                var HBeginDate = $("#HBeginDate").val();        //å¼å§æ¥æ
                var HEndDate = $("#HEndDate").val();            //ç»ææ¥æ
                var HBillType = $("#HBillType").val();          //åæ®ç±»å
                var HBillNo = $("#HBillNo").val();              //åæ®å·
                var HBarCode = $("#HBarCode").val();            //æ¡ç ç¼å·
                var HMater = $("#HMater").val();                //ç©æ
                var HBatchNo = $("#HBatchNo").val();            //æ¹å·
                var HWHName = $("#HWHName").val();              //ä»åº
                var HSPName = $("#HSPName").val();              //ä»ä½
                var HSourceBillNo = $("#HSourceBillNo").val();  //æºååå·
                var HMaker = $("#HMaker").val();                //å¶åäºº
                var HStockOrgName = $("#HStockOrgID").val();    //ç»ç»

                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HBillType + "','" + HBillNo + "','" + HBarCode + "','" + HMater + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HSourceBillNo + "','" + HMaker + "','" + HStockOrgName + "'";

                var ajaxLoad = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetKf_BarCodeOutInReport_Json',
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                //å¨æè·ååè¡¨ææåå
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }

                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == 'æ°é') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            }
                                    }
                                }
                            }

                            columns = col;

                            //è®¾ç½®èµå¼åå®½
                            var colWidth = getColumnsWidth();
                            if (colWidth == "" || colWidth == []) {

                            }
                            else {
                                $.each(columns, function (x, m) {
                                    m["width"] = colWidth[x];
                                });
                            }
                            option.cols = [columns];
                            option.data = data1.data;
                            option.totalRow = true;
                            table.render(option);
                            ins = table.render(option);
                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                DisPlay_HideColumn();
            }
            //#endregion

            //#region éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                //æ¸ç©ºè¿æ»¤æ¡ä»¶
                set_ClearQuery();
            });

            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));    //å¼å§æ¥æ
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));   //ç»ææ¥æ
                $("#HBillType").val("å¨é¨");    //åæ®ç±»å
                $("#HMater").val("");           //ç©æ
                $("#HBatchNo").val("");         //æ¹å·
                $("#HBarCode").val("");         //æ¡ç ç¼å·
                $("#HBillNo").val("");          //åæ®å·
                $("#HWHName").val("");          //ä»åº
                $("#HSPName").val("");          //ä»ä½
                $("#HSourceBillNo").val("");    //æºååå·
                $("#HMaker").val("");           //å¶åäºº
                $("#HStockOrgID").val(sessionStorage["Organization"])   //ç»ç»
                form.render('select');
            }

            //#endregion

            //#region ä¿ååå®½
            function set_SaveGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
                    if (colName != "" && colName != null) {
                        arr.push(colWidth == -1 ? 200 : colWidth);
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
                    success: function (data1) {
                        if (data1.count == 1) {
                            //layer.alert(data1.Message, { icon: 1 });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                //location.reload();
            }
            //#endregion

            //#region é»è®¤åå®½
            function set_DefaultGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    if (colName != "" && colName != null) {
                        arr.push(200);   //é»è®¤å®½åº¦200
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
                    success: function (data1) {
                        if (data1.count == 1) {

                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                location.reload();
            }
            //#endregion

            //#region éèåè®¾ç½®
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }

                colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç 
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                    , title: "éèåè®¾ç½®"  //æ é¢
                    , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
                })
            }
            //#endregion

        //#endregion


        });




    </script>

</body>
</html>

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂë±¨±í/Kf_ICInventory_BarCode.html

New file
@@ -0,0 +1,562 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>æ¡ç åºåæ¥è¯¢æ¥è¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <style>
        .layui-form-select .layui-input {
            padding-right: 15px;
            cursor: pointer;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">æ¡ç ç¼å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç©æ</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HMater" id="HMater" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">æ¹å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">ç»ç»</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
                                            <!--å¨ææ¸²æç»ç»-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

                                <div class="layui-colla-content">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è¾å©å±æ§</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HAuxProp" id="HAuxProp" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»åº</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»ä½</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>ä¿ååå®½</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>é»è®¤åå®½</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        //#region æå æ³¨é
        //#endregion
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
            
        //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            var ins;                        //ç¨äºå¯¼åºexcel
            var columns = "";
            var HModName = "Kf_ICInventory_BarCode";
            var titleData = [];     //ä¸éè¦æ¾ç¤ºçåæ®µ
        //#endregion

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

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

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

            //#region   è·åç»ç»
            function Organ() {
                //è·åç»å½é¡µç»ç»å
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    success: function (result) {
                        var Organization = "";
                        Organization += '<option  style="color:blue;" value="å¨é¨">å¨é¨</option>';
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
                            }
                            $("#HStockOrgID").append(Organization);
                            $("#HStockOrgID").val(sessionStorage["Organization"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region åå§åè¡¨æ ¼
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 'full-50'
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                };
            }
            //#endregion

            //#region è·ååå®½
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //è·ååå®½
                $.ajax({
                    type: "Get",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
                    async: false,
                    dataType: "json",
                    data: { "colNum": colNum, "Name": HModName },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {

                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                return result;
            }
            //#endregion

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

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

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

        //#endregion

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

            //#region å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //å¯¼åºæé®
                    case 'btn_Export': get_Export();
                        break;
                    //æ¥è¯¢æé®
                    case 'btn_Query': get_Display();
                        break;
                    //éåºæé®
                    case 'btn_Exit': Pub_Close(2);
                        break;
                    //ä¿ååå®½æé®
                    case 'btn-Cell': set_SaveGridColWidth();
                        break;
                    //é»è®¤åå®½æé®
                    case 'btn-RefreshCell': set_DefaultGridColWidth();
                        break;
                    //åè®¾ç½®
                    case 'btn_HideColumn': get_HideColumn();
                        break;
                };
            });
            //#endregion

            //#region å¯¼åºExecel
            function get_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion

            //#region æ¥è¯¢
            function get_Display() {
                var HBarCode = $("#HBarCode").val();            //æ¡ç ç¼å·
                var HMater = $("#HMater").val();                //ç©æ
                var HAuxProp = $("#HAuxProp").val();            //è¾å©å±æ§
                var HBatchNo = $("#HBatchNo").val();            //æ¹å·
                var HWHName = $("#HWHName").val();              //ä»åº
                var HSPName = $("#HSPName").val();              //ä»ä½
                var HStockOrgName = $("#HStockOrgID").val();    //ç»ç»

                sWhere = "'" + HBarCode + "','" + HMater + "','" + HAuxProp + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HStockOrgName + "'";

                var ajaxLoad = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetKf_BarCodeICInventoryReport_Json',
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                //å¨æè·ååè¡¨ææåå
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }

                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == 'æ°é') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            }
                                    }
                                }
                            }

                            columns = col;

                            //è®¾ç½®èµå¼åå®½
                            var colWidth = getColumnsWidth();
                            if (colWidth == "" || colWidth == []) {

                            }
                            else {
                                $.each(columns, function (x, m) {
                                    m["width"] = colWidth[x];
                                });
                            }
                            option.cols = [columns];
                            option.data = data1.data;
                            option.totalRow = true;
                            table.render(option);
                            ins = table.render(option);
                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                DisPlay_HideColumn();
            }
            //#endregion

            //#region éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                //æ¸ç©ºè¿æ»¤æ¡ä»¶
                set_ClearQuery();
            });

            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HBarCode").val("");         //æ¡ç ç¼å·
                $("#HMater").val("");           //ç©æ
                $("#HAuxProp").val("");         //è¾å©å±æ§
                $("#HBatchNo").val("");         //æ¹å·
                $("#HWHName").val("");          //ä»åº
                $("#HSPName").val("");          //ä»ä½
                $("#HStockOrgID").val(sessionStorage["Organization"])   //ç»ç»
                form.render('select');
            }

            //#endregion

            //#region ä¿ååå®½
            function set_SaveGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
                    if (colName != "" && colName != null) {
                        arr.push(colWidth == -1 ? 200 : colWidth);
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
                    success: function (data1) {
                        if (data1.count == 1) {
                            //layer.alert(data1.Message, { icon: 1 });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                //location.reload();
            }
            //#endregion

            //#region é»è®¤åå®½
            function set_DefaultGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    if (colName != "" && colName != null) {
                        arr.push(200);   //é»è®¤å®½åº¦200
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
                    success: function (data1) {
                        if (data1.count == 1) {

                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                location.reload();
            }
            //#endregion

            //#region éèåè®¾ç½®
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }

                colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç 
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                    , title: "éèåè®¾ç½®"  //æ é¢
                    , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
                })
            }
            //#endregion

        //#endregion


        });




    </script>

</body>
</html>

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂë±¨±í/Kf_ICInventory_Mater.html

New file
@@ -0,0 +1,554 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>WMSç©æåºåæ¥è¯¢æ¥è¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <style>
        .layui-form-select .layui-input {
            padding-right: 15px;
            cursor: pointer;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç©æ</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HMater" id="HMater" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">æ¹å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ä»åº</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">ç»ç»</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
                                            <!--å¨ææ¸²æç»ç»-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

                                <div class="layui-colla-content">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è¾å©å±æ§</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HAuxProp" id="HAuxProp" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»ä½</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>ä¿ååå®½</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>é»è®¤åå®½</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        //#region æå æ³¨é
        //#endregion
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
            
        //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            var ins;                        //ç¨äºå¯¼åºexcel
            var columns = "";
            var HModName = "Kf_ICInventory_Mater";
            var titleData = [];     //ä¸éè¦æ¾ç¤ºçåæ®µ
        //#endregion

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

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

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

            //#region   è·åç»ç»
            function Organ() {
                //è·åç»å½é¡µç»ç»å
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    success: function (result) {
                        var Organization = "";
                        Organization += '<option  style="color:blue;" value="å¨é¨">å¨é¨</option>';
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
                            }
                            $("#HStockOrgID").append(Organization);
                            $("#HStockOrgID").val(sessionStorage["Organization"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region åå§åè¡¨æ ¼
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 'full-50'
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                };
            }
            //#endregion

            //#region è·ååå®½
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //è·ååå®½
                $.ajax({
                    type: "Get",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
                    async: false,
                    dataType: "json",
                    data: { "colNum": colNum, "Name": HModName },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {

                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                return result;
            }
            //#endregion

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

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

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

        //#endregion

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

            //#region å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //å¯¼åºæé®
                    case 'btn_Export': get_Export();
                        break;
                    //æ¥è¯¢æé®
                    case 'btn_Query': get_Display();
                        break;
                    //éåºæé®
                    case 'btn_Exit': Pub_Close(2);
                        break;
                    //ä¿ååå®½æé®
                    case 'btn-Cell': set_SaveGridColWidth();
                        break;
                    //é»è®¤åå®½æé®
                    case 'btn-RefreshCell': set_DefaultGridColWidth();
                        break;
                    //åè®¾ç½®
                    case 'btn_HideColumn': get_HideColumn();
                        break;
                };
            });
            //#endregion

            //#region å¯¼åºExecel
            function get_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion

            //#region æ¥è¯¢
            function get_Display() {
                var HMater = $("#HMater").val();                //ç©æ
                var HAuxProp = $("#HAuxProp").val();            //è¾å©å±æ§
                var HBatchNo = $("#HBatchNo").val();            //æ¹å·
                var HWHName = $("#HWHName").val();              //ä»åº
                var HSPName = $("#HSPName").val();              //ä»ä½
                var HStockOrgName = $("#HStockOrgID").val();    //ç»ç»

                sWhere = "'" + HMater + "','" + HAuxProp + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HStockOrgName + "'";

                var ajaxLoad = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetKf_MaterICInventoryReport_Json',
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                //å¨æè·ååè¡¨ææåå
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }

                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == 'æ°é') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            }
                                    }
                                }
                            }

                            columns = col;

                            //è®¾ç½®èµå¼åå®½
                            var colWidth = getColumnsWidth();
                            if (colWidth == "" || colWidth == []) {

                            }
                            else {
                                $.each(columns, function (x, m) {
                                    m["width"] = colWidth[x];
                                });
                            }
                            option.cols = [columns];
                            option.data = data1.data;
                            option.totalRow = true;
                            table.render(option);
                            ins = table.render(option);
                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                DisPlay_HideColumn();
            }
            //#endregion

            //#region éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                //æ¸ç©ºè¿æ»¤æ¡ä»¶
                set_ClearQuery();
            });

            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HMater").val("");           //ç©æ
                $("#HAuxProp").val("");         //è¾å©å±æ§
                $("#HBatchNo").val("");         //æ¹å·
                $("#HWHName").val("");          //ä»åº
                $("#HSPName").val("");          //ä»ä½
                $("#HStockOrgID").val(sessionStorage["Organization"])   //ç»ç»
                form.render('select');
            }

            //#endregion

            //#region ä¿ååå®½
            function set_SaveGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
                    if (colName != "" && colName != null) {
                        arr.push(colWidth == -1 ? 200 : colWidth);
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
                    success: function (data1) {
                        if (data1.count == 1) {
                            //layer.alert(data1.Message, { icon: 1 });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                //location.reload();
            }
            //#endregion

            //#region é»è®¤åå®½
            function set_DefaultGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    if (colName != "" && colName != null) {
                        arr.push(200);   //é»è®¤å®½åº¦200
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
                    success: function (data1) {
                        if (data1.count == 1) {

                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                location.reload();
            }
            //#endregion

            //#region éèåè®¾ç½®
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }

                colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç 
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                    , title: "éèåè®¾ç½®"  //æ é¢
                    , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
                })
            }
            //#endregion

        //#endregion


        });




    </script>

</body>
</html>

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂë±¨±í/Kf_MaterOutInReport.html

New file
@@ -0,0 +1,627 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>WMSç©æåºå¥åºè®°å½</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <style>
        .layui-form-select .layui-input {
            padding-right: 15px;
            cursor: pointer;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">å¼å§æ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç»ææ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">åæ®ç±»å</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HBillType" id="HBillType" lay-verify="HBillType">
                                            <!--å¨ææ¸²æç»ç»-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">ç»ç»</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
                                            <!--å¨ææ¸²æç»ç»-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

                                <div class="layui-colla-content">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ç©æ</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HMater" id="HMater" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æ¹å·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">åæ®å·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»åº</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»ä½</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æºååå·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">å¶åäºº</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>ä¿ååå®½</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>é»è®¤åå®½</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        //#region æå æ³¨é
        //#endregion
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
            
        //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            var ins;                        //ç¨äºå¯¼åºexcel
            var columns = "";
            var HModName = "Kf_MaterOutInReport";
            var titleData = [];     //ä¸éè¦æ¾ç¤ºçåæ®µ
        //#endregion

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

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

            //#region åå§åçé¢
            function set_ClearBill() {
                //è·åå¼å§æ¥æãç»ææ¥æ
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //è·åç»ç»
                Organ();
                //è·ååæ®ç±»å
                BillType();
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //æ¥è¯¢
                get_Display(sWhere);
            }
            //#endregion

            //#region   è·åç»ç»
            function Organ() {
                //è·åç»å½é¡µç»ç»å
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    success: function (result) {
                        var Organization = "";
                        Organization += '<option  style="color:blue;" value="å¨é¨">å¨é¨</option>';
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
                            }
                            $("#HStockOrgID").append(Organization);
                            $("#HStockOrgID").val(sessionStorage["Organization"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region   è·ååæ®ç±»å
            function BillType() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/GetBarCodeReport_BillType_Json",
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    success: function (result) {
                        var HBillType = "";
                        HBillType += '<option  style="color:blue;" value="å¨é¨">å¨é¨</option>';
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HBillType += '<option  style="color:blue;" value="' + data[i].HBillTypeName + '">' + data[i].HBillTypeName + '</option>';
                            }
                            $("#HBillType").append(HBillType);
                            $("#HBillType").val("å¨é¨")
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region åå§åè¡¨æ ¼
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 'full-50'
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                };
            }
            //#endregion

            //#region è·ååå®½
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //è·ååå®½
                $.ajax({
                    type: "Get",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
                    async: false,
                    dataType: "json",
                    data: { "colNum": colNum, "Name": HModName },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {

                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                return result;
            }
            //#endregion

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

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

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

        //#endregion

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

            //#region å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //å¯¼åºæé®
                    case 'btn_Export': get_Export();
                        break;
                    //æ¥è¯¢æé®
                    case 'btn_Query': get_Display();
                        break;
                    //éåºæé®
                    case 'btn_Exit': Pub_Close(2);
                        break;
                    //ä¿ååå®½æé®
                    case 'btn-Cell': set_SaveGridColWidth();
                        break;
                    //é»è®¤åå®½æé®
                    case 'btn-RefreshCell': set_DefaultGridColWidth();
                        break;
                    //åè®¾ç½®
                    case 'btn_HideColumn': get_HideColumn();
                        break;
                };
            });
            //#endregion

            //#region å¯¼åºExecel
            function get_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion

            //#region æ¥è¯¢
            function get_Display() {
                var HBeginDate = $("#HBeginDate").val();        //å¼å§æ¥æ
                var HEndDate = $("#HEndDate").val();            //ç»ææ¥æ
                var HBillType = $("#HBillType").val();          //åæ®ç±»å
                var HBillNo = $("#HBillNo").val();              //åæ®å·
                var HMater = $("#HMater").val();                //ç©æ
                var HBatchNo = $("#HBatchNo").val();            //æ¹å·
                var HWHName = $("#HWHName").val();              //ä»åº
                var HSPName = $("#HSPName").val();              //ä»ä½
                var HSourceBillNo = $("#HSourceBillNo").val();  //æºååå·
                var HMaker = $("#HMaker").val();                //å¶åäºº
                var HStockOrgName = $("#HStockOrgID").val();    //ç»ç»

                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HBillType + "','" + HBillNo + "','" + HMater + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HSourceBillNo + "','" + HMaker + "','" + HStockOrgName + "'";

                var ajaxLoad = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetKf_MaterOutInReport_Json',
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                //å¨æè·ååè¡¨ææåå
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }

                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == 'æ°é') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            }
                                    }
                                }
                            }

                            columns = col;

                            //è®¾ç½®èµå¼åå®½
                            var colWidth = getColumnsWidth();
                            if (colWidth == "" || colWidth == []) {

                            }
                            else {
                                $.each(columns, function (x, m) {
                                    m["width"] = colWidth[x];
                                });
                            }
                            option.cols = [columns];
                            option.data = data1.data;
                            option.totalRow = true;
                            table.render(option);
                            ins = table.render(option);
                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                DisPlay_HideColumn();
            }
            //#endregion

            //#region éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                //æ¸ç©ºè¿æ»¤æ¡ä»¶
                set_ClearQuery();
            });

            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));    //å¼å§æ¥æ
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));   //ç»ææ¥æ
                $("#HBillType").val("å¨é¨");    //åæ®ç±»å
                $("#HMater").val("");           //ç©æ
                $("#HBatchNo").val("");         //æ¹å·
                $("#HBillNo").val("");          //åæ®å·
                $("#HWHName").val("");          //ä»åº
                $("#HSPName").val("");          //ä»ä½
                $("#HSourceBillNo").val("");    //æºååå·
                $("#HMaker").val("");           //å¶åäºº
                $("#HStockOrgID").val(sessionStorage["Organization"])   //ç»ç»
                form.render('select');
            }

            //#endregion

            //#region ä¿ååå®½
            function set_SaveGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
                    if (colName != "" && colName != null) {
                        arr.push(colWidth == -1 ? 200 : colWidth);
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
                    success: function (data1) {
                        if (data1.count == 1) {
                            //layer.alert(data1.Message, { icon: 1 });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                //location.reload();
            }
            //#endregion

            //#region é»è®¤åå®½
            function set_DefaultGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    if (colName != "" && colName != null) {
                        arr.push(200);   //é»è®¤å®½åº¦200
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
                    success: function (data1) {
                        if (data1.count == 1) {

                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                location.reload();
            }
            //#endregion

            //#region éèåè®¾ç½®
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }

                colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç 
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                    , title: "éèåè®¾ç½®"  //æ é¢
                    , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
                })
            }
            //#endregion

        //#endregion


        });




    </script>

</body>
</html>

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

@@ -119,8 +119,6 @@
                                                </button>
                                            </div>
                                        </div>


                                        <div class="layui-inline" style="width: 51%;">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å®¢æ·</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
@@ -257,6 +255,20 @@
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">å®¢æ·ç©æåç§°</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCusMaterName" lay-verify="HCusMaterName" id="HCusMaterName" style="display: inline-block;" >
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">å®¢æ·è§æ ¼åå·</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline" style="width: 56%;">
                                            <label class="layui-form-label" style="width: 85px;">ç½å¯è¦æ±</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
@@ -273,7 +285,7 @@
                                        </div>
                                    </div>
                                </div>
                            </div>
                                </div>

                            <!--å¶ä»ä¿¡æ¯-->
                            <div class="layui-tab-item">
@@ -1013,6 +1025,8 @@
                            , "HWidth": d.data[0].HWidth
                            , "HWeight": d.data[0].HWeight
                            , "HColorRemark": d.data[0].æè²è¦æ±
                            , "HCusMaterName": d.data[0].å®¢æ·ç©æåç§°
                            , "HCusModel": d.data[0].å®¢æ·è§æ ¼åå·
                            //å¶ä»ä¿¡æ¯
                            , "hmakers": OperationType == 2 ? "" : d.data[0].å¶åäºº
                            , "hmakedate": OperationType == 2 ? "" : d.data[0].å¶åæ¥æ == null ? "" : Format(new Date(d.data[0].å¶åæ¥æ), "yyyy-MM-dd")

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

@@ -26,6 +26,7 @@
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">é½å¥åæ</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">ææè¿ç®</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">çäº§è®¢åéå</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">åå¤</button>
                        </div>
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
@@ -50,7 +51,7 @@
                                        </select>
                                    </div>
                                </div>
                               

                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">çäº§è½¦é´</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
@@ -177,13 +178,17 @@
                                </div>
                            </div>
                        </div>
                        <div id="test"></div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>æ¹éå¡«å</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>-->
            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶è¡</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤è¡</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>ä¸ç§»</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverDown"><i class="layui-icon layui-icon-delete"></i>ä¸ç§»</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>ä¼åçº§</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                            </div>
                        </script>
@@ -245,7 +250,7 @@
                    return;
                }
                if (!isNaN(parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]))) {
                    dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]);
                    dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')])  ;
                }
            }
            for (var i = 1; i < dd; i++) {
@@ -253,6 +258,14 @@
                    dateHQty += parseInt(obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')]);
                }
            }

            if (dateHQty > (parseInt(obj.data["è®¡åæ°é"]))) {
                obj.update({
                    "æ¥è®¡åæ°éæ»é": dateHQty
                });
                return layer.msg("æäº§æ°éå¤§äºè®¢åæ°é!")
            }

            //ä¿®æ¹æ°æ®
            obj.update({
                "æ¥è®¡åæ°éæ»é": dateHQty
@@ -262,6 +275,39 @@
        //åå»è¡¨æ ¼äºä»¶
        table.on('rowDouble(mainTable)', function (obj) {
            btnrowDouble(obj.data);
        })

        var objData = "";
        //ç¹å»è¡éä¸æ°æ®
        table.on('row(mainTable)', function (obj) {

            if (objData != "" && objData.tr.find(':checkbox:first').prop('checked') != obj.tr.find(':checkbox:first').prop('checked')) {
                objData.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
                objData.tr.find(':checkbox:first').prop('checked', false);//åæ¶å¤éæ¡éä¸æ ·å¼
                layui.each(table.cache.mainTable, function (i, l) {
                    if (objData.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = false;
                    }
                });
            }

            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');  //è®¾ç½®å¤éæ¡éä¸æ ·å¼
            } else {
                obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
                obj.tr.find(':checkbox:first').prop('checked', false);//åæ¶å¤éæ¡éä¸æ ·å¼
            }
            //mainTable ä¸ºè¡¨æ ¼ID   æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
            layui.each(table.cache.mainTable, function (i, l) {
                if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                    l.LAY_CHECKED = flag;
                }
            });

          
            objData = obj;
        })

        //å¤´å·¥å·æ äºä»¶
@@ -296,6 +342,18 @@
                //å é¤è¡
                case 'set_DeleteBill':
                    set_DeleteBill();
                    break;
                //ä¸ç§»
                case 'set_MoverUp':
                    set_MoverUp(data);
                    break;
                //ä¸ç§»
                case 'set_MoverDown':
                    set_MoverDown(data);
                    break;
                //ä¼åçº§
                case 'set_Priority':
                    set_Priority();
                    break;
            }
        });
@@ -351,6 +409,13 @@
        form.on('submit(btnICMOBill)', function (data) {
            get_btnICMOBill();
        })

        //åå¤
        form.on('submit(btnReady)', function (data) {
            get_btnReady();
        })

        

        //è¡åäºä»¶
        table.on('tool(mainTable)', function (obj) {
@@ -582,7 +647,13 @@
            columns.push({ field: 'äº§çº¿å¥åºæ°é', title: 'äº§çº¿å¥åºæ°é', width: 150 });
            columns.push({ field: 'æªææ°é', title: 'å¯ææ°é', width: 150 });
            columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150 });
            columns.push({ field: 'äº¤è´§æ¥æ', title: 'äº¤è´§æ¥æ', width: 150, templet: "<div>{{d.äº¤è´§æ¥æ =='' ?'':layui.util.toDateString(d.äº¤è´§æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>"});
            columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>" });
            columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150 });
            columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150 });
            columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150 });
            columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150 });
            columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" });
            columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>"});
            columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150 });
            columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150 });
            columns.push({ field: 'hmainid', title: 'æ¥è®¡åå·¥åä¸»ç ', width: 150 });
@@ -1042,6 +1113,90 @@
            })
        }

        //åå¤
        function get_btnReady() {
            var data = table.cache["mainTable"];
            var HICOMNum = [];
            for (var i = 0; i < data.length; i++) {
                HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"]);
            }
            $('#test').html(`
    <div class="layui-progress" lay-filter="demo-filter-progress">
      <div class="layui-progress-bar" lay-percent="40%"></div>
    </div>
  `);
            // æ¸²æè¿åº¦æ¡ç»ä»¶
            element.render('progress', 'demo-filter-progress');
            $.ajax({
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
                type: "GET",
                data: { "HICOMNum": HICOMNum.toString() },
                success: function (data1) {
                    if (data1.count == 1) {
                        for (var i = 0; i < data1.data.length; i++) {
                            for (var j = 0; j < option.data.length; j++) {
                                if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
                                    option.data[j]["å°æ¶äº§è½"] = data1.data[i]["å°æ¶äº§è½"];
                                    option.data[j]["çäº§å¨æ"] = data1.data[i]["çäº§å¨æ"];
                                    option.data[j]["å¼å·¥ä½é"] = data1.data[i]["å¼å·¥ä½é"];
                                    option.data[j]["æè¿å¼å·¥æ¥æ"] = data1.data[i]["æè¿å¼å·¥æ¥æ"];
                                    option.data[j]["æè¿å®å·¥æ¥æ"] = data1.data[i]["æè¿å®å·¥æ¥æ"];
                                    option.data[j]["è®¢åéæ±æ°é"] = data1.data[i]["è®¢åéæ±æ°é"];
                                    option.data[j]["è®¢åäº¤è´§æ"] = data1.data[i]["è®¢åäº¤è´§æ"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["è®¢åäº¤è´§æ"];
                                    break;
                                }
                            }
                        }

                        for (var i = 0; i < option.data.length - 1; i++) {
                            for (var j = 0; j < option.data.length - i - 1; j++) {
                                var tables = [];
                                //è®¾ç½®ä»»å¡åä¼åæåºï¼å¹¶è®¾ç½®ä¼å(æè¿å®å·¥æ¥æ+è®¢åäº¤è´§æ)  å°è£
                                if (option.data[j]["æè¿å®å·¥æ¥æ"] > option.data[j + 1]["æè¿å®å·¥æ¥æ"]) {

                                    tables.push(option.data[j + 1]);
                                    option.data[j + 1] = option.data[j];
                                    option.data[j] = tables[0];

                                } else if (option.data[j]["æè¿å®å·¥æ¥æ"] == option.data[j + 1]["æè¿å®å·¥æ¥æ"]) {
                                    if (option.data[j]["è®¢åäº¤è´§æ"] > option.data[j + 1]["è®¢åäº¤è´§æ"]) {

                                        tables.push(option.data[j + 1]);
                                        option.data[j + 1] = option.data[j];
                                        option.data[j] = tables[0];

                                    } else if (option.data[j]["è®¢åäº¤è´§æ"] == option.data[j + 1]["è®¢åäº¤è´§æ"]) {
                                        if (option.data[j]["è®¢åéæ±æ°"] < option.data[j + 1]["è®¢åéæ±æ°"]) {

                                            tables.push(option.data[j + 1]);
                                            option.data[j + 1] = option.data[j];
                                            option.data[j] = tables[0];

                                        }
                                    }
                                }
                            }
                        }
                        $('#test').html('')

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

        //ä¸ç§»
        function DownTable(data ,i) {
           
        }

        //æ¥è¯¢çäº§è®¢å
        function SelectICMOBill(hmainid) {
            var ajaxLoad = layer.load();
@@ -1146,6 +1301,58 @@
            }
        }

        //ä¸ç§»
        function set_MoverUp(data) {
            if (data.length != 1) {
                layer.msg("è¯·éæ©ä¸è¡æ°æ®ï¼");
            } else if (option.data[0]["çäº§è®¢åå·"] == data[0]["çäº§è®¢åå·"]) {
                layer.msg("é¦è¡æ°æ®æ æ³ç§»å¨ï¼");
            } else {
                var tables = [];
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["çäº§è®¢åå·"] == data[0]["çäº§è®¢åå·"]) {
                        tables.push(option.data[i - 1]);
                        data[0].LAY_CHECKED = true;
                        option.data[i - 1] = data[0];
                        option.data[i] = tables[0];
                        table.render(option);
                        break;
                    }
                }
            }
        }

        //ä¸ç§»
        function set_MoverDown(data) {
            if (data.length != 1) {
                layer.msg("è¯·éæ©ä¸è¡æ°æ®ï¼");
            } else if (option.data[option.data.length - 1]["çäº§è®¢åå·"] == data[0]["çäº§è®¢åå·"]) {
                layer.msg("æ«è¡æ°æ®æ æ³ç§»å¨ï¼");
            } else {
                var tables = [];
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["çäº§è®¢åå·"] == data[0]["çäº§è®¢åå·"]) {
                        tables.push(option.data[i + 1]);
                        data[0].LAY_CHECKED = true;
                        option.data[i + 1] = data[0];
                        option.data[i] = tables[0];
                        table.render(option);
                        break;
                    }
                }
            }
        }

        //ä¼åçº§
        function set_Priority() {
            var data = table.cache["mainTable"];
            for (var i = 0; i < data.length; i++) {
                data[i]["ä¼åçº§"] = (i + 1);
            }
            option.data = data;
            table.render(option);
        }

        //ä¿å
        function set_AddNew(data) {


 WebTM/views/Éè±¸¹ÜÀí/Éè±¸µµ°¸/Gy_EquipFileMainEdit.html

@@ -138,7 +138,7 @@
                                                <label class="layui-form-label">å¯¹åºERPç©æ<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
                                                    <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="float:left;width:150px;">
                                                    <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -1043,10 +1043,11 @@
                layer.msg("è®¾å¤è§æ ¼ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return Result = false;
            }
            if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
                layer.msg("è¯·éæ©å¯¹åºERPç©æï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return Result = false;
            }
            //å¯è´ä¸éè¦
            //if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
            //    layer.msg("è¯·éæ©å¯¹åºERPç©æï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
            //    return Result = false;
            //}
            if ($("#HEquipFileTypeID").val() == '' || $("#HEquipFileTypeID").val() == null) {
                layer.msg("è¯·éæ©è®¾å¤åç±»ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return Result = false;

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

@@ -300,6 +300,12 @@
                                                <input type="hidden" class="layui-input" name="HCusID" id="HCusID">
                                            </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="HMaterModel" id="HMaterModel" style="float: left;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs6 layui-inline">
@@ -581,12 +587,7 @@
                                                </button>
                                            </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="HMaterModel" id="HMaterModel" style="float: left;">
                                            </div>
                                        </div>
                                       

                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>

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

@@ -727,7 +727,7 @@
                        $("#HEmpID").val(data1.data[0].HEmpID);
                        //$("#HAuxUnitName").val(data1.data[0].HAuxUnitName);
                        //$("#HAuxUnit").val(data1.data[0].HAuxUnit);
                       // $("#HMaterModel").val(data1.data[0].HMaterModel);
                        $("#HMaterModel").val(data1.data[0].è§æ ¼åå·);

                        $.ajax({
                            type: "get",

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

@@ -2,7 +2,7 @@
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>çäº§å¥åºæ¥è¡¨</title>
    <title>çäº§æ¥è®°æ¥è¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -163,6 +163,17 @@
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //åå»è¡¨æ ¼äºä»¶
            table.on('rowDouble(mainTable)', function (obj) {
                btnrowDouble(obj.data);
            })

            //åå»è¡¨æ ¼äºä»¶
            table.on('rowDouble(mainTable1)', function (obj) {
                btnrowDouble(obj.data);
            })


            //#endregion

@@ -370,6 +381,28 @@
                sWhere = "";
            }

            //åå»è·³è½¬çäº§å¥åºæ¥è¡¨
            function btnrowDouble(obj) {

                var HProcExchBillNo = obj["å·¥èºåå·"];
                var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
                var HEndDate = $("#HEndDate").val();//ç»ææ¥æ

                if (HProcExchBillNo == "" || HProcExchBillNo == null) {
                    return layer.alert("æ çäº§å¥åºæç»,æ æ³æ¥ç!", { icon: 5 });
                }

                layer.open({
                    type: 2 //ç±»å
                    , skin: 'layui-layer-rim'//å ä¸è¾¹æ¡
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'çäº§å¥åºæ¥è¡¨'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../è½¦é´ç®¡ç/æ¥è¡¨åæ/sc_ICOMRKReport.html?OperationType=1&HProcExchBillNo=' + HProcExchBillNo + '&HBeginDate="' + HBeginDate + '"&HEndDate="' + HEndDate+'"', 'yes']
                })
            }

            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                //åå§åæ¶é´

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

@@ -147,13 +147,27 @@
            var sWhere = "";
            var option = [];
            var HModName = "sc_ICOMRKReport";
            var HProcExchBillNo = "";
            var HBeginDate_u = "";
            var HEndDate_u = "";

            //#endregion

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

            var params = getUrlVars();
            var OperationType = params[params[0]];

            //å¤ææ¯å¦æåæ°ä¼ é
            if (!isNaN(OperationType)) {
                HProcExchBillNo = params[params[1]];
                HBeginDate_u = params[params[2]];
                HEndDate_u = params[params[3]];
            }


            //#region åå§åçé¢
          

            set_ClearBill();

            //#endregion
@@ -310,6 +324,12 @@
                var HBillNo = $("#HBillNo").val();          //åæ®å·
                var HProductName = $("#HProductName").val();//äº§ååç§°
                var HProductModel = $("#HProductModel").val();//äº§åè§æ ¼

                if (HProcExchBillNo != "") {
                    sWhere += " and æµè½¬å¡å· ='" + HProcExchBillNo + "'";
                    HBeginDate = HBeginDate_u;
                    HEndDate = HEndDate_u;
                }

                if (HBeginDate != "" && HEndDate != "") {
                    sWhere += " and æ¥æ between '" + HBeginDate + "' and '" + HEndDate + "' ";
@@ -502,6 +522,18 @@
                })
            }

            //è·ååæ°
            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;
            }

            //#endregion
        });
    </script>

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

@@ -117,6 +117,8 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-form"></i>å³éè®¢å</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddHRemark"><i class="layui-icon layui-icon-form"></i>æ·»å å¤æ³¨</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
                            </div>
                        </script>
@@ -163,11 +165,18 @@
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //éåº
                    case 'btn-exit': Pub_Close(2);
                    case 'btn-exit': Pub_Close(2); 
                        break;
                    //å³éè®¢å
                    case 'btn-Close': btn_Close(obj);
                        break;
                    //éèåè®¾ç½®
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //æ·»å å¤æ³¨
                    case 'btn-AddHRemark':
                        btn_AddHRemark();
                        break;
                };
            });
@@ -372,6 +381,70 @@
                sWhere = "";
            }

            //å³éè®¢å
            function btn_Close(obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                var HICOMBillNoNum = [];
                for (var i = 0; i < checkStatus.data.length; i++) {
                    HICOMBillNoNum.push(checkStatus.data[i]["çäº§è®¢åå·"])
                }
                var sMainSub = HICOMBillNoNum.toString() + ";" + sessionStorage["HUserName"];
                $.ajax({
                    url: GetWEBURL() + "/LEMS/sc_ICOMReportClose",
                    type: "POST",
                    async: false,
                    data: { "sMainSub": sMainSub },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.msg(data1.Message);
                            get_FastQuery();
                        } else {
                            layer.msg(data1.Message);
                        }
                    },
                    error: function (err) {
                        layer.msg('éè¯¯' + err, {
                            icon: 5,
                            time: 20000
                        });
                    }
                })
               
            }

            function btn_AddHRemark() {
                var checkStatus = table.checkStatus('mainTable');
                if (checkStatus.data.length != 1) {
                    layer.msg("è¯·éæ©ä¸æ¡æ°æ®!");
                } else {
                    layer.prompt({ title: 'æ·»å å¤æ³¨', formType: 2 }, function (text, index) {

                        var sMainSub = checkStatus.data[0]["çäº§è®¢åå·"]+ ";"+text + ";" + sessionStorage["HUserName"];
                        $.ajax({
                            url: GetWEBURL() + "/LEMS/sc_ICOMReportAddHRemark",
                            type: "POST",
                            async: false,
                            data: { "sMainSub": sMainSub },
                            success: function (data1) {
                                if (data1.count == 1) {
                                    get_FastQuery();
                                    layer.close(index);
                                    layer.msg(data1.Message);
                                } else {
                                    layer.msg(data1.Message);
                                }
                            },
                            error: function (err) {
                                layer.msg('éè¯¯' + err, {
                                    icon: 5,
                                    time: 20000
                                });
                            }
                        })
                       
                    });
                }
            }

            //éèåè®¾ç½®
            function get_HideColumn() {
@@ -483,7 +556,7 @@
            //åå»è·³è½¬å®¢æ·è®¢åæç»æ¥è¡¨
            function btnrowDouble(obj) {

                HICMOBillNo = obj["çäº§è®¢åå·"];
                var HICMOBillNo = obj["çäº§è®¢åå·"];

                if (HICMOBillNo == "" || HICMOBillNo == null) {
                    return layer.alert("æ å·¥èºæç»,æ æ³æ¥ç!", { icon: 5 });

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

			@@ -204,6 +204,10 @@
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§ç®¡ç\çäº§ç»æå\Sc_PackUnionBill_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\è°æ¨æ¢æ\Kf_MoveStockBill_HuanTuo_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\è°æ¨æ¢æ\Kf_MoveStockBillList_HuanTuo_PDA.html" />
			<Content Include="views\ä»åç®¡ç\æ¡ç æ¥è¡¨\Kf_MaterOutInReport.html" />
			<Content Include="views\ä»åç®¡ç\æ¡ç æ¥è¡¨\Kf_ICInventory_Mater.html" />
			<Content Include="views\ä»åç®¡ç\æ¡ç æ¥è¡¨\Kf_ICInventory_BarCode.html" />
			<Content Include="views\ä»åç®¡ç\æ¡ç æ¥è¡¨\Kf_BarCodeOutInReport.html" />
			<Content Include="views\äººäºç®¡ç\å¥èç³è¯·\HR_EmpEngageRequestBill.html" />
			<Content Include="views\äººäºç®¡ç\å¥èç³è¯·\HR_EmpEngageRequestBillList.html" />
			<Content Include="views\äººäºç®¡ç\ç¦»èç³è¯·\HR_EmpDimissionBill.html" />

			@@ -1,7 +1,7 @@
			ï»¿<?xml version="1.0" encoding="utf-8"?>
			<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\GITä»åº\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>

			@@ -3,11 +3,11 @@
			//var WEBURL = "http://192.168.16.80:8011/"; //åå¬å®¤æå¡å¨
			//var WEBURL = "http://localhost:8081/SWEAPI/"; //chæ¬å°*/
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
			//var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost/WEBAPI/"; //é¢å®¶å°å¼æºæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			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
			@@ -21,7 +21,7 @@
			//var WEBURL = "http://192.168.80.90:9090/API/"; //å®çæå¡å¨
			//var WEBURL = "http://192.168.16.53:8081/API/"; //é¾å±±æ±½é
			//var WEBURL = "http://122.227.158.218:8090/API/"; //é¾å±±æ±½éå¤ç½
			//var WEBURL = "http://192.168.0.244:8082/API/"; //å¸å¨åç½
			//var WEBURL = "http://192.168.0.244:8082/API/"; //å¸å¨åç½
			return WEBURL
			}

			@@ -3,7 +3,6 @@
			<!DOCTYPE html>
			<html>
			<head>
			<
			<meta charset="utf-8">
			<title>æ§å¶å°ä¸»é¡µä¸</title>
			<meta name="renderer" content="webkit">

			@@ -253,8 +253,10 @@
			<a>ä»åºæ¥è¡¨</a>
			<dl class="layui-nav-child">
			<dd><a lay-href="ä»åç®¡ç/æ«ç å¼å¸¸è®°å½è¡¨/KF_PonderationBillList.html">æ«ç å¼å¸¸è®°å½æ¥è¯¢</a></dd>
			<dd><a lay-href="ä»åç®¡ç/æ¡ç åºå¥åºè®°å½è¡¨/Kf_ICStockBillSubList.html">æ¡ç åºå¥åºè®°å½è¡¨</a></dd>
			<dd><a lay-href="ä»åç®¡ç/æ¡ç åºå/KF_ICInventoryList_WMS.html">æ¡ç åºåæ¥è¯¢</a></dd>
			<dd><a lay-href="ä»åç®¡ç/æ¡ç æ¥è¡¨/Kf_BarCodeOutInReport.html">æ¡ç åºå¥åºè®°å½è¡¨</a></dd>
			<dd><a lay-href="ä»åç®¡ç/æ¡ç æ¥è¡¨/Kf_ICInventory_BarCode.html">æ¡ç åºåæ¥è¯¢æ¥è¡¨</a></dd>
			<dd><a lay-href="ä»åç®¡ç/æ¡ç æ¥è¡¨/Kf_MaterOutInReport.html">WMSç©æåºå¥åºè®°å½è¡¨</a></dd>
			<dd><a lay-href="ä»åç®¡ç/æ¡ç æ¥è¡¨/Kf_ICInventory_Mater.html">WMSç©æåºåæ¥è¯¢æ¥è¡¨</a></dd>
			<dd><a lay-href="ä»åç®¡ç/æ¡ç åºå/KF_PonderationBillMain_Temp.html">æ¡ç åºå¥åºç¼ååè¡¨</a></dd>
			<dd><a lay-href="ä»åç®¡ç/æ¡ç åºå¥åºè®°å½è¡¨/KF_PonderationBillList_Query.html">æ«ç è®°å½ç¼åæ¥è¡¨</a></dd>
			</dl>
			@@ -301,6 +303,7 @@
			<dd><a lay-href="è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBillList.html">å·¥èºè·¯çº¿ç»´æ¤</a></dd>
			<dd><a lay-href="è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBillListQuery.html">å·¥èºè·¯çº¿æ¥è¯¢</a></dd>
			<dd><a lay-href="è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBill.html">å·¥èºè·¯çº¿</a></dd>
			<dd><a lay-href="è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBillList_His.html">å·¥èºè·¯çº¿åå²è®°å½</a></dd>
			<dd><a lay-href="è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBillimport.html">å·¥èºè·¯çº¿æ°æ®å¯¼å¥</a></dd>
			</dl>
			</dd>

New file
			@@ -0,0 +1,635 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>æ¡ç åºå¥åºè®°å½</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<style>
			.layui-form-select .layui-input {
			padding-right: 15px;
			cursor: pointer;
			}
			</style>
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åæ®ç±»å</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HBillType" id="HBillType" lay-verify="HBillType">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<div class="layui-colla-content">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ç©æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMater" id="HMater" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¹å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¡ç ç¼å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">ä»åº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»ä½</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSPName" id="HSPName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æºååå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¶åäºº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMaker" id="HMaker" style="width:190px;">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>ä¿ååå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>é»è®¤åå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</form>
			</div>
			</div>
			</div>
			</div>
			<script>
			//#region æå æ³¨é
			//#endregion
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {

			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			var sWhere = "";
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			var columns = "";
			var HModName = "Kf_BarCodeOutInReport";
			var titleData = []; //ä¸éè¦æ¾ç¤ºçåæ®µ
			//#endregion

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

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

			//#region åå§åçé¢
			function set_ClearBill() {
			//è·åå¼å§æ¥æãç»ææ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//è·åç»ç»
			Organ();
			//è·ååæ®ç±»å
			BillType();
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			}
			//#endregion

			//#region è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			success: function (result) {
			var Organization = "";
			Organization += '<option style="color:blue;" value="å¨é¨">å¨é¨</option>';
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
			}
			$("#HStockOrgID").append(Organization);
			$("#HStockOrgID").val(sessionStorage["Organization"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region è·ååæ®ç±»å
			function BillType() {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/WEBSController/GetBarCodeReport_BillType_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			success: function (result) {
			var HBillType = "";
			HBillType += '<option style="color:blue;" value="å¨é¨">å¨é¨</option>';
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HBillType += '<option style="color:blue;" value="' + data[i].HBillTypeName + '">' + data[i].HBillTypeName + '</option>';
			}
			$("#HBillType").append(HBillType);
			$("#HBillType").val("å¨é¨")
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region åå§åè¡¨æ ¼
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, totalRow: true
			, height: 'full-50'
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			};
			}
			//#endregion

			//#region è·ååå®½
			function getColumnsWidth() {
			var result = [];
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			//è·ååå®½
			$.ajax({
			type: "Get",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
			async: false,
			dataType: "json",
			data: { "colNum": colNum, "Name": HModName },
			success: function (data1) {
			if (data1.code == 1) {
			result = data1.data;
			}
			else if (data1.code == -1) {

			}
			else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			return result;
			}
			//#endregion

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

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

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

			//#endregion

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

			//#region å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å¯¼åºæé®
			case 'btn_Export': get_Export();
			break;
			//æ¥è¯¢æé®
			case 'btn_Query': get_Display();
			break;
			//éåºæé®
			case 'btn_Exit': Pub_Close(2);
			break;
			//ä¿ååå®½æé®
			case 'btn-Cell': set_SaveGridColWidth();
			break;
			//é»è®¤åå®½æé®
			case 'btn-RefreshCell': set_DefaultGridColWidth();
			break;
			//åè®¾ç½®
			case 'btn_HideColumn': get_HideColumn();
			break;
			};
			});
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//#region æ¥è¯¢
			function get_Display() {
			var HBeginDate = $("#HBeginDate").val(); //å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val(); //ç»ææ¥æ
			var HBillType = $("#HBillType").val(); //åæ®ç±»å
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HBarCode = $("#HBarCode").val(); //æ¡ç ç¼å·
			var HMater = $("#HMater").val(); //ç©æ
			var HBatchNo = $("#HBatchNo").val(); //æ¹å·
			var HWHName = $("#HWHName").val(); //ä»åº
			var HSPName = $("#HSPName").val(); //ä»ä½
			var HSourceBillNo = $("#HSourceBillNo").val(); //æºååå·
			var HMaker = $("#HMaker").val(); //å¶åäºº
			var HStockOrgName = $("#HStockOrgID").val(); //ç»ç»

			sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HBillType + "','" + HBillNo + "','" + HBarCode + "','" + HMater + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HSourceBillNo + "','" + HMaker + "','" + HStockOrgName + "'";

			var ajaxLoad = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/GetKf_BarCodeOutInReport_Json',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			//å¨æè·ååè¡¨ææåå
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			//è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
			var patrn = new RegExp(/^h/i);
			if (patrn.test(data1.list[key].ColmCols)) {
			titleData[key] = data1.list[key].ColmCols;
			}
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			if (data[i].name == 'æ°é') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}
			}

			columns = col;

			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			option.cols = [columns];
			option.data = data1.data;
			option.totalRow = true;
			table.render(option);
			ins = table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			},
			error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			DisPlay_HideColumn();
			}
			//#endregion

			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			});

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$("#HBillType").val("å¨é¨"); //åæ®ç±»å
			$("#HMater").val(""); //ç©æ
			$("#HBatchNo").val(""); //æ¹å·
			$("#HBarCode").val(""); //æ¡ç ç¼å·
			$("#HBillNo").val(""); //åæ®å·
			$("#HWHName").val(""); //ä»åº
			$("#HSPName").val(""); //ä»ä½
			$("#HSourceBillNo").val(""); //æºååå·
			$("#HMaker").val(""); //å¶åäºº
			$("#HStockOrgID").val(sessionStorage["Organization"]) //ç»ç»
			form.render('select');
			}

			//#endregion

			//#region ä¿ååå®½
			function set_SaveGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
			if (colName != "" && colName != null) {
			arr.push(colWidth == -1 ? 200 : colWidth);
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			type: "POST",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": HModName },
			success: function (data1) {
			if (data1.count == 1) {
			//layer.alert(data1.Message, { icon: 1 });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			//location.reload();
			}
			//#endregion

			//#region é»è®¤åå®½
			function set_DefaultGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			if (colName != "" && colName != null) {
			arr.push(200); //é»è®¤å®½åº¦200
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			type: "POST",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": HModName },
			success: function (data1) {
			if (data1.count == 1) {

			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			location.reload();
			}
			//#endregion

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//#endregion

			//#endregion


			});




			</script>

			</body>
			</html>

New file
			@@ -0,0 +1,562 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>æ¡ç åºåæ¥è¯¢æ¥è¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<style>
			.layui-form-select .layui-input {
			padding-right: 15px;
			cursor: pointer;
			}
			</style>
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¡ç ç¼å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMater" id="HMater" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¹å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<div class="layui-colla-content">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">è¾å©å±æ§</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HAuxProp" id="HAuxProp" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»åº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»ä½</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSPName" id="HSPName" style="width:190px;">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>ä¿ååå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>é»è®¤åå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</form>
			</div>
			</div>
			</div>
			</div>
			<script>
			//#region æå æ³¨é
			//#endregion
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {

			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			var sWhere = "";
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			var columns = "";
			var HModName = "Kf_ICInventory_BarCode";
			var titleData = []; //ä¸éè¦æ¾ç¤ºçåæ®µ
			//#endregion

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

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

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

			//#region è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			success: function (result) {
			var Organization = "";
			Organization += '<option style="color:blue;" value="å¨é¨">å¨é¨</option>';
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
			}
			$("#HStockOrgID").append(Organization);
			$("#HStockOrgID").val(sessionStorage["Organization"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region åå§åè¡¨æ ¼
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, totalRow: true
			, height: 'full-50'
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			};
			}
			//#endregion

			//#region è·ååå®½
			function getColumnsWidth() {
			var result = [];
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			//è·ååå®½
			$.ajax({
			type: "Get",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
			async: false,
			dataType: "json",
			data: { "colNum": colNum, "Name": HModName },
			success: function (data1) {
			if (data1.code == 1) {
			result = data1.data;
			}
			else if (data1.code == -1) {

			}
			else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			return result;
			}
			//#endregion

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

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

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

			//#endregion

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

			//#region å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å¯¼åºæé®
			case 'btn_Export': get_Export();
			break;
			//æ¥è¯¢æé®
			case 'btn_Query': get_Display();
			break;
			//éåºæé®
			case 'btn_Exit': Pub_Close(2);
			break;
			//ä¿ååå®½æé®
			case 'btn-Cell': set_SaveGridColWidth();
			break;
			//é»è®¤åå®½æé®
			case 'btn-RefreshCell': set_DefaultGridColWidth();
			break;
			//åè®¾ç½®
			case 'btn_HideColumn': get_HideColumn();
			break;
			};
			});
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//#region æ¥è¯¢
			function get_Display() {
			var HBarCode = $("#HBarCode").val(); //æ¡ç ç¼å·
			var HMater = $("#HMater").val(); //ç©æ
			var HAuxProp = $("#HAuxProp").val(); //è¾å©å±æ§
			var HBatchNo = $("#HBatchNo").val(); //æ¹å·
			var HWHName = $("#HWHName").val(); //ä»åº
			var HSPName = $("#HSPName").val(); //ä»ä½
			var HStockOrgName = $("#HStockOrgID").val(); //ç»ç»

			sWhere = "'" + HBarCode + "','" + HMater + "','" + HAuxProp + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HStockOrgName + "'";

			var ajaxLoad = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/GetKf_BarCodeICInventoryReport_Json',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			//å¨æè·ååè¡¨ææåå
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			//è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
			var patrn = new RegExp(/^h/i);
			if (patrn.test(data1.list[key].ColmCols)) {
			titleData[key] = data1.list[key].ColmCols;
			}
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			if (data[i].name == 'æ°é') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}
			}

			columns = col;

			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			option.cols = [columns];
			option.data = data1.data;
			option.totalRow = true;
			table.render(option);
			ins = table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			},
			error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			DisPlay_HideColumn();
			}
			//#endregion

			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			});

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HBarCode").val(""); //æ¡ç ç¼å·
			$("#HMater").val(""); //ç©æ
			$("#HAuxProp").val(""); //è¾å©å±æ§
			$("#HBatchNo").val(""); //æ¹å·
			$("#HWHName").val(""); //ä»åº
			$("#HSPName").val(""); //ä»ä½
			$("#HStockOrgID").val(sessionStorage["Organization"]) //ç»ç»
			form.render('select');
			}

			//#endregion

			//#region ä¿ååå®½
			function set_SaveGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
			if (colName != "" && colName != null) {
			arr.push(colWidth == -1 ? 200 : colWidth);
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			type: "POST",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": HModName },
			success: function (data1) {
			if (data1.count == 1) {
			//layer.alert(data1.Message, { icon: 1 });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			//location.reload();
			}
			//#endregion

			//#region é»è®¤åå®½
			function set_DefaultGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			if (colName != "" && colName != null) {
			arr.push(200); //é»è®¤å®½åº¦200
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			type: "POST",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": HModName },
			success: function (data1) {
			if (data1.count == 1) {

			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			location.reload();
			}
			//#endregion

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//#endregion

			//#endregion


			});




			</script>

			</body>
			</html>

New file
			@@ -0,0 +1,554 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>WMSç©æåºåæ¥è¯¢æ¥è¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<style>
			.layui-form-select .layui-input {
			padding-right: 15px;
			cursor: pointer;
			}
			</style>
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMater" id="HMater" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¹å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»åº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<div class="layui-colla-content">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">è¾å©å±æ§</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HAuxProp" id="HAuxProp" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»ä½</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSPName" id="HSPName" style="width:190px;">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>ä¿ååå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>é»è®¤åå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</form>
			</div>
			</div>
			</div>
			</div>
			<script>
			//#region æå æ³¨é
			//#endregion
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {

			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			var sWhere = "";
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			var columns = "";
			var HModName = "Kf_ICInventory_Mater";
			var titleData = []; //ä¸éè¦æ¾ç¤ºçåæ®µ
			//#endregion

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

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

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

			//#region è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			success: function (result) {
			var Organization = "";
			Organization += '<option style="color:blue;" value="å¨é¨">å¨é¨</option>';
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
			}
			$("#HStockOrgID").append(Organization);
			$("#HStockOrgID").val(sessionStorage["Organization"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region åå§åè¡¨æ ¼
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, totalRow: true
			, height: 'full-50'
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			};
			}
			//#endregion

			//#region è·ååå®½
			function getColumnsWidth() {
			var result = [];
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			//è·ååå®½
			$.ajax({
			type: "Get",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
			async: false,
			dataType: "json",
			data: { "colNum": colNum, "Name": HModName },
			success: function (data1) {
			if (data1.code == 1) {
			result = data1.data;
			}
			else if (data1.code == -1) {

			}
			else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			return result;
			}
			//#endregion

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

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

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

			//#endregion

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

			//#region å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å¯¼åºæé®
			case 'btn_Export': get_Export();
			break;
			//æ¥è¯¢æé®
			case 'btn_Query': get_Display();
			break;
			//éåºæé®
			case 'btn_Exit': Pub_Close(2);
			break;
			//ä¿ååå®½æé®
			case 'btn-Cell': set_SaveGridColWidth();
			break;
			//é»è®¤åå®½æé®
			case 'btn-RefreshCell': set_DefaultGridColWidth();
			break;
			//åè®¾ç½®
			case 'btn_HideColumn': get_HideColumn();
			break;
			};
			});
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//#region æ¥è¯¢
			function get_Display() {
			var HMater = $("#HMater").val(); //ç©æ
			var HAuxProp = $("#HAuxProp").val(); //è¾å©å±æ§
			var HBatchNo = $("#HBatchNo").val(); //æ¹å·
			var HWHName = $("#HWHName").val(); //ä»åº
			var HSPName = $("#HSPName").val(); //ä»ä½
			var HStockOrgName = $("#HStockOrgID").val(); //ç»ç»

			sWhere = "'" + HMater + "','" + HAuxProp + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HStockOrgName + "'";

			var ajaxLoad = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/GetKf_MaterICInventoryReport_Json',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			//å¨æè·ååè¡¨ææåå
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			//è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
			var patrn = new RegExp(/^h/i);
			if (patrn.test(data1.list[key].ColmCols)) {
			titleData[key] = data1.list[key].ColmCols;
			}
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			if (data[i].name == 'æ°é') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}
			}

			columns = col;

			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			option.cols = [columns];
			option.data = data1.data;
			option.totalRow = true;
			table.render(option);
			ins = table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			},
			error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			DisPlay_HideColumn();
			}
			//#endregion

			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			});

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HMater").val(""); //ç©æ
			$("#HAuxProp").val(""); //è¾å©å±æ§
			$("#HBatchNo").val(""); //æ¹å·
			$("#HWHName").val(""); //ä»åº
			$("#HSPName").val(""); //ä»ä½
			$("#HStockOrgID").val(sessionStorage["Organization"]) //ç»ç»
			form.render('select');
			}

			//#endregion

			//#region ä¿ååå®½
			function set_SaveGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
			if (colName != "" && colName != null) {
			arr.push(colWidth == -1 ? 200 : colWidth);
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			type: "POST",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": HModName },
			success: function (data1) {
			if (data1.count == 1) {
			//layer.alert(data1.Message, { icon: 1 });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			//location.reload();
			}
			//#endregion

			//#region é»è®¤åå®½
			function set_DefaultGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			if (colName != "" && colName != null) {
			arr.push(200); //é»è®¤å®½åº¦200
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			type: "POST",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": HModName },
			success: function (data1) {
			if (data1.count == 1) {

			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			location.reload();
			}
			//#endregion

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//#endregion

			//#endregion


			});




			</script>

			</body>
			</html>

New file
			@@ -0,0 +1,627 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>WMSç©æåºå¥åºè®°å½</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<style>
			.layui-form-select .layui-input {
			padding-right: 15px;
			cursor: pointer;
			}
			</style>
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åæ®ç±»å</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HBillType" id="HBillType" lay-verify="HBillType">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<div class="layui-colla-content">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ç©æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMater" id="HMater" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¹å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">ä»åº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»ä½</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSPName" id="HSPName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æºååå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¶åäºº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMaker" id="HMaker" style="width:190px;">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>ä¿ååå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>é»è®¤åå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</form>
			</div>
			</div>
			</div>
			</div>
			<script>
			//#region æå æ³¨é
			//#endregion
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {

			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			var sWhere = "";
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			var columns = "";
			var HModName = "Kf_MaterOutInReport";
			var titleData = []; //ä¸éè¦æ¾ç¤ºçåæ®µ
			//#endregion

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

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

			//#region åå§åçé¢
			function set_ClearBill() {
			//è·åå¼å§æ¥æãç»ææ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//è·åç»ç»
			Organ();
			//è·ååæ®ç±»å
			BillType();
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			}
			//#endregion

			//#region è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			success: function (result) {
			var Organization = "";
			Organization += '<option style="color:blue;" value="å¨é¨">å¨é¨</option>';
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
			}
			$("#HStockOrgID").append(Organization);
			$("#HStockOrgID").val(sessionStorage["Organization"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region è·ååæ®ç±»å
			function BillType() {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/WEBSController/GetBarCodeReport_BillType_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			success: function (result) {
			var HBillType = "";
			HBillType += '<option style="color:blue;" value="å¨é¨">å¨é¨</option>';
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HBillType += '<option style="color:blue;" value="' + data[i].HBillTypeName + '">' + data[i].HBillTypeName + '</option>';
			}
			$("#HBillType").append(HBillType);
			$("#HBillType").val("å¨é¨")
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region åå§åè¡¨æ ¼
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, totalRow: true
			, height: 'full-50'
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			};
			}
			//#endregion

			//#region è·ååå®½
			function getColumnsWidth() {
			var result = [];
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			//è·ååå®½
			$.ajax({
			type: "Get",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
			async: false,
			dataType: "json",
			data: { "colNum": colNum, "Name": HModName },
			success: function (data1) {
			if (data1.code == 1) {
			result = data1.data;
			}
			else if (data1.code == -1) {

			}
			else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			return result;
			}
			//#endregion

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

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

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

			//#endregion

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

			//#region å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å¯¼åºæé®
			case 'btn_Export': get_Export();
			break;
			//æ¥è¯¢æé®
			case 'btn_Query': get_Display();
			break;
			//éåºæé®
			case 'btn_Exit': Pub_Close(2);
			break;
			//ä¿ååå®½æé®
			case 'btn-Cell': set_SaveGridColWidth();
			break;
			//é»è®¤åå®½æé®
			case 'btn-RefreshCell': set_DefaultGridColWidth();
			break;
			//åè®¾ç½®
			case 'btn_HideColumn': get_HideColumn();
			break;
			};
			});
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//#region æ¥è¯¢
			function get_Display() {
			var HBeginDate = $("#HBeginDate").val(); //å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val(); //ç»ææ¥æ
			var HBillType = $("#HBillType").val(); //åæ®ç±»å
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HMater = $("#HMater").val(); //ç©æ
			var HBatchNo = $("#HBatchNo").val(); //æ¹å·
			var HWHName = $("#HWHName").val(); //ä»åº
			var HSPName = $("#HSPName").val(); //ä»ä½
			var HSourceBillNo = $("#HSourceBillNo").val(); //æºååå·
			var HMaker = $("#HMaker").val(); //å¶åäºº
			var HStockOrgName = $("#HStockOrgID").val(); //ç»ç»

			sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HBillType + "','" + HBillNo + "','" + HMater + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HSourceBillNo + "','" + HMaker + "','" + HStockOrgName + "'";

			var ajaxLoad = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/GetKf_MaterOutInReport_Json',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			//å¨æè·ååè¡¨ææåå
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			//è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
			var patrn = new RegExp(/^h/i);
			if (patrn.test(data1.list[key].ColmCols)) {
			titleData[key] = data1.list[key].ColmCols;
			}
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			if (data[i].name == 'æ°é') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}
			}

			columns = col;

			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			option.cols = [columns];
			option.data = data1.data;
			option.totalRow = true;
			table.render(option);
			ins = table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			},
			error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			DisPlay_HideColumn();
			}
			//#endregion

			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			});

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$("#HBillType").val("å¨é¨"); //åæ®ç±»å
			$("#HMater").val(""); //ç©æ
			$("#HBatchNo").val(""); //æ¹å·
			$("#HBillNo").val(""); //åæ®å·
			$("#HWHName").val(""); //ä»åº
			$("#HSPName").val(""); //ä»ä½
			$("#HSourceBillNo").val(""); //æºååå·
			$("#HMaker").val(""); //å¶åäºº
			$("#HStockOrgID").val(sessionStorage["Organization"]) //ç»ç»
			form.render('select');
			}

			//#endregion

			//#region ä¿ååå®½
			function set_SaveGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
			if (colName != "" && colName != null) {
			arr.push(colWidth == -1 ? 200 : colWidth);
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			type: "POST",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": HModName },
			success: function (data1) {
			if (data1.count == 1) {
			//layer.alert(data1.Message, { icon: 1 });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			//location.reload();
			}
			//#endregion

			//#region é»è®¤åå®½
			function set_DefaultGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			if (colName != "" && colName != null) {
			arr.push(200); //é»è®¤å®½åº¦200
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			type: "POST",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": HModName },
			success: function (data1) {
			if (data1.count == 1) {

			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			location.reload();
			}
			//#endregion

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//#endregion

			//#endregion


			});




			</script>

			</body>
			</html>

			@@ -119,8 +119,6 @@
			</button>
			</div>
			</div>


			<div class="layui-inline" style="width: 51%;">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å®¢æ·</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			@@ -257,6 +255,20 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å®¢æ·ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HCusMaterName" lay-verify="HCusMaterName" id="HCusMaterName" style="display: inline-block;" >
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å®¢æ·è§æ ¼åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width: 56%;">
			<label class="layui-form-label" style="width: 85px;">ç½å¯è¦æ±</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			@@ -273,7 +285,7 @@
			</div>
			</div>
			</div>
			</div>
			</div>

			<!--å¶ä»ä¿¡æ¯-->
			<div class="layui-tab-item">
			@@ -1013,6 +1025,8 @@
			, "HWidth": d.data[0].HWidth
			, "HWeight": d.data[0].HWeight
			, "HColorRemark": d.data[0].æè²è¦æ±
			, "HCusMaterName": d.data[0].å®¢æ·ç©æåç§°
			, "HCusModel": d.data[0].å®¢æ·è§æ ¼åå·
			//å¶ä»ä¿¡æ¯
			, "hmakers": OperationType == 2 ? "" : d.data[0].å¶åäºº
			, "hmakedate": OperationType == 2 ? "" : d.data[0].å¶åæ¥æ == null ? "" : Format(new Date(d.data[0].å¶åæ¥æ), "yyyy-MM-dd")

			@@ -26,6 +26,7 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">é½å¥åæ</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">ææè¿ç®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">çäº§è®¢åéå</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">åå¤</button>
			</div>
			<div class="layui-collapse">
			<div class="layui-colla-item">
			@@ -50,7 +51,7 @@
			</select>
			</div>
			</div>


			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">çäº§è½¦é´</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			@@ -177,13 +178,17 @@
			</div>
			</div>
			</div>
			<div id="test"></div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>æ¹éå¡«å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>ä¸ç§»</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverDown"><i class="layui-icon layui-icon-delete"></i>ä¸ç§»</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>ä¼åçº§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			@@ -245,7 +250,7 @@
			return;
			}
			if (!isNaN(parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]))) {
			dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]);
			dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]) ;
			}
			}
			for (var i = 1; i < dd; i++) {
			@@ -253,6 +258,14 @@
			dateHQty += parseInt(obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')]);
			}
			}

			if (dateHQty > (parseInt(obj.data["è®¡åæ°é"]))) {
			obj.update({
			"æ¥è®¡åæ°éæ»é": dateHQty
			});
			return layer.msg("æäº§æ°éå¤§äºè®¢åæ°é!")
			}

			//ä¿®æ¹æ°æ®
			obj.update({
			"æ¥è®¡åæ°éæ»é": dateHQty
			@@ -262,6 +275,39 @@
			//åå»è¡¨æ ¼äºä»¶
			table.on('rowDouble(mainTable)', function (obj) {
			btnrowDouble(obj.data);
			})

			var objData = "";
			//ç¹å»è¡éä¸æ°æ®
			table.on('row(mainTable)', function (obj) {

			if (objData != "" && objData.tr.find(':checkbox:first').prop('checked') != obj.tr.find(':checkbox:first').prop('checked')) {
			objData.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			objData.tr.find(':checkbox:first').prop('checked', false);//åæ¶å¤éæ¡éä¸æ ·å¼
			layui.each(table.cache.mainTable, function (i, l) {
			if (objData.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = false;
			}
			});
			}

			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'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			obj.tr.find(':checkbox:first').prop('checked', false);//åæ¶å¤éæ¡éä¸æ ·å¼
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});


			objData = obj;
			})

			//å¤´å·¥å·æ äºä»¶
			@@ -296,6 +342,18 @@
			//å é¤è¡
			case 'set_DeleteBill':
			set_DeleteBill();
			break;
			//ä¸ç§»
			case 'set_MoverUp':
			set_MoverUp(data);
			break;
			//ä¸ç§»
			case 'set_MoverDown':
			set_MoverDown(data);
			break;
			//ä¼åçº§
			case 'set_Priority':
			set_Priority();
			break;
			}
			});
			@@ -351,6 +409,13 @@
			form.on('submit(btnICMOBill)', function (data) {
			get_btnICMOBill();
			})

			//åå¤
			form.on('submit(btnReady)', function (data) {
			get_btnReady();
			})



			//è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {
			@@ -582,7 +647,13 @@
			columns.push({ field: 'äº§çº¿å¥åºæ°é', title: 'äº§çº¿å¥åºæ°é', width: 150 });
			columns.push({ field: 'æªææ°é', title: 'å¯ææ°é', width: 150 });
			columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150 });
			columns.push({ field: 'äº¤è´§æ¥æ', title: 'äº¤è´§æ¥æ', width: 150, templet: "<div>{{d.äº¤è´§æ¥æ =='' ?'':layui.util.toDateString(d.äº¤è´§æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>"});
			columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150 });
			columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150 });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150 });
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150 });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>"});
			columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150 });
			columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150 });
			columns.push({ field: 'hmainid', title: 'æ¥è®¡åå·¥åä¸»ç ', width: 150 });
			@@ -1042,6 +1113,90 @@
			})
			}

			//åå¤
			function get_btnReady() {
			var data = table.cache["mainTable"];
			var HICOMNum = [];
			for (var i = 0; i < data.length; i++) {
			HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"]);
			}
			$('#test').html(`
			<div class="layui-progress" lay-filter="demo-filter-progress">
			<div class="layui-progress-bar" lay-percent="40%"></div>
			</div>
			`);
			// æ¸²æè¿åº¦æ¡ç»ä»¶
			element.render('progress', 'demo-filter-progress');
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
			type: "GET",
			data: { "HICOMNum": HICOMNum.toString() },
			success: function (data1) {
			if (data1.count == 1) {
			for (var i = 0; i < data1.data.length; i++) {
			for (var j = 0; j < option.data.length; j++) {
			if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
			option.data[j]["å°æ¶äº§è½"] = data1.data[i]["å°æ¶äº§è½"];
			option.data[j]["çäº§å¨æ"] = data1.data[i]["çäº§å¨æ"];
			option.data[j]["å¼å·¥ä½é"] = data1.data[i]["å¼å·¥ä½é"];
			option.data[j]["æè¿å¼å·¥æ¥æ"] = data1.data[i]["æè¿å¼å·¥æ¥æ"];
			option.data[j]["æè¿å®å·¥æ¥æ"] = data1.data[i]["æè¿å®å·¥æ¥æ"];
			option.data[j]["è®¢åéæ±æ°é"] = data1.data[i]["è®¢åéæ±æ°é"];
			option.data[j]["è®¢åäº¤è´§æ"] = data1.data[i]["è®¢åäº¤è´§æ"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["è®¢åäº¤è´§æ"];
			break;
			}
			}
			}

			for (var i = 0; i < option.data.length - 1; i++) {
			for (var j = 0; j < option.data.length - i - 1; j++) {
			var tables = [];
			//è®¾ç½®ä»»å¡åä¼åæåºï¼å¹¶è®¾ç½®ä¼å(æè¿å®å·¥æ¥æ+è®¢åäº¤è´§æ) å°è£
			if (option.data[j]["æè¿å®å·¥æ¥æ"] > option.data[j + 1]["æè¿å®å·¥æ¥æ"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["æè¿å®å·¥æ¥æ"] == option.data[j + 1]["æè¿å®å·¥æ¥æ"]) {
			if (option.data[j]["è®¢åäº¤è´§æ"] > option.data[j + 1]["è®¢åäº¤è´§æ"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["è®¢åäº¤è´§æ"] == option.data[j + 1]["è®¢åäº¤è´§æ"]) {
			if (option.data[j]["è®¢åéæ±æ°"] < option.data[j + 1]["è®¢åéæ±æ°"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			}
			}
			}
			}
			}
			$('#test').html('')

			table.render(option);

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

			//ä¸ç§»
			function DownTable(data ,i) {

			}

			//æ¥è¯¢çäº§è®¢å
			function SelectICMOBill(hmainid) {
			var ajaxLoad = layer.load();
			@@ -1146,6 +1301,58 @@
			}
			}

			//ä¸ç§»
			function set_MoverUp(data) {
			if (data.length != 1) {
			layer.msg("è¯·éæ©ä¸è¡æ°æ®ï¼");
			} else if (option.data[0]["çäº§è®¢åå·"] == data[0]["çäº§è®¢åå·"]) {
			layer.msg("é¦è¡æ°æ®æ æ³ç§»å¨ï¼");
			} else {
			var tables = [];
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i]["çäº§è®¢åå·"] == data[0]["çäº§è®¢åå·"]) {
			tables.push(option.data[i - 1]);
			data[0].LAY_CHECKED = true;
			option.data[i - 1] = data[0];
			option.data[i] = tables[0];
			table.render(option);
			break;
			}
			}
			}
			}

			//ä¸ç§»
			function set_MoverDown(data) {
			if (data.length != 1) {
			layer.msg("è¯·éæ©ä¸è¡æ°æ®ï¼");
			} else if (option.data[option.data.length - 1]["çäº§è®¢åå·"] == data[0]["çäº§è®¢åå·"]) {
			layer.msg("æ«è¡æ°æ®æ æ³ç§»å¨ï¼");
			} else {
			var tables = [];
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i]["çäº§è®¢åå·"] == data[0]["çäº§è®¢åå·"]) {
			tables.push(option.data[i + 1]);
			data[0].LAY_CHECKED = true;
			option.data[i + 1] = data[0];
			option.data[i] = tables[0];
			table.render(option);
			break;
			}
			}
			}
			}

			//ä¼åçº§
			function set_Priority() {
			var data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			data[i]["ä¼åçº§"] = (i + 1);
			}
			option.data = data;
			table.render(option);
			}

			//ä¿å
			function set_AddNew(data) {

			@@ -138,7 +138,7 @@
			<label class="layui-form-label">å¯¹åºERPç©æ<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
			<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="float:left;width:150px;">
			<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -1043,10 +1043,11 @@
			layer.msg("è®¾å¤è§æ ¼ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HMaterID").val() == '' \|\| $("#HMaterID").val() == null) {
			layer.msg("è¯·éæ©å¯¹åºERPç©æï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			//å¯è´ä¸éè¦
			//if ($("#HMaterID").val() == '' \|\| $("#HMaterID").val() == null) {
			// layer.msg("è¯·éæ©å¯¹åºERPç©æï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return Result = false;
			//}
			if ($("#HEquipFileTypeID").val() == '' \|\| $("#HEquipFileTypeID").val() == null) {
			layer.msg("è¯·éæ©è®¾å¤åç±»ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;

			@@ -300,6 +300,12 @@
			<input type="hidden" class="layui-input" name="HCusID" id="HCusID">
			</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="HMaterModel" id="HMaterModel" style="float: left;">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs6 layui-inline">
			@@ -581,12 +587,7 @@
			</button>
			</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="HMaterModel" id="HMaterModel" style="float: left;">
			</div>
			</div>


			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>

			@@ -727,7 +727,7 @@
			$("#HEmpID").val(data1.data[0].HEmpID);
			//$("#HAuxUnitName").val(data1.data[0].HAuxUnitName);
			//$("#HAuxUnit").val(data1.data[0].HAuxUnit);
			// $("#HMaterModel").val(data1.data[0].HMaterModel);
			$("#HMaterModel").val(data1.data[0].è§æ ¼åå·);

			$.ajax({
			type: "get",

			@@ -2,7 +2,7 @@
			<html>
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>çäº§å¥åºæ¥è¡¨</title>
			<title>çäº§æ¥è®°æ¥è¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			@@ -163,6 +163,17 @@
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			});

			//åå»è¡¨æ ¼äºä»¶
			table.on('rowDouble(mainTable)', function (obj) {
			btnrowDouble(obj.data);
			})

			//åå»è¡¨æ ¼äºä»¶
			table.on('rowDouble(mainTable1)', function (obj) {
			btnrowDouble(obj.data);
			})


			//#endregion

			@@ -370,6 +381,28 @@
			sWhere = "";
			}

			//åå»è·³è½¬çäº§å¥åºæ¥è¡¨
			function btnrowDouble(obj) {

			var HProcExchBillNo = obj["å·¥èºåå·"];
			var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ

			if (HProcExchBillNo == "" \|\| HProcExchBillNo == null) {
			return layer.alert("æ çäº§å¥åºæç»,æ æ³æ¥ç!", { icon: 5 });
			}

			layer.open({
			type: 2 //ç±»å
			, skin: 'layui-layer-rim'//å ä¸è¾¹æ¡
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, area: ['90%', '90%']//å¤§å°
			, title: 'çäº§å¥åºæ¥è¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../è½¦é´ç®¡ç/æ¥è¡¨åæ/sc_ICOMRKReport.html?OperationType=1&HProcExchBillNo=' + HProcExchBillNo + '&HBeginDate="' + HBeginDate + '"&HEndDate="' + HEndDate+'"', 'yes']
			})
			}

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			//åå§åæ¶é´

			@@ -147,13 +147,27 @@
			var sWhere = "";
			var option = [];
			var HModName = "sc_ICOMRKReport";
			var HProcExchBillNo = "";
			var HBeginDate_u = "";
			var HEndDate_u = "";

			//#endregion

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

			var params = getUrlVars();
			var OperationType = params[params[0]];

			//å¤ææ¯å¦æåæ°ä¼ é
			if (!isNaN(OperationType)) {
			HProcExchBillNo = params[params[1]];
			HBeginDate_u = params[params[2]];
			HEndDate_u = params[params[3]];
			}


			//#region åå§åçé¢


			set_ClearBill();

			//#endregion
			@@ -310,6 +324,12 @@
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProductName = $("#HProductName").val();//äº§ååç§°
			var HProductModel = $("#HProductModel").val();//äº§åè§æ ¼

			if (HProcExchBillNo != "") {
			sWhere += " and æµè½¬å¡å· ='" + HProcExchBillNo + "'";
			HBeginDate = HBeginDate_u;
			HEndDate = HEndDate_u;
			}

			if (HBeginDate != "" && HEndDate != "") {
			sWhere += " and æ¥æ between '" + HBeginDate + "' and '" + HEndDate + "' ";
			@@ -502,6 +522,18 @@
			})
			}

			//è·ååæ°
			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;
			}

			//#endregion
			});
			</script>

			@@ -117,6 +117,8 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-form"></i>å³éè®¢å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddHRemark"><i class="layui-icon layui-icon-form"></i>æ·»å å¤æ³¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			</div>
			</script>
			@@ -163,11 +165,18 @@
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//éåº
			case 'btn-exit': Pub_Close(2);
			case 'btn-exit': Pub_Close(2);
			break;
			//å³éè®¢å
			case 'btn-Close': btn_Close(obj);
			break;
			//éèåè®¾ç½®
			case 'HideColumn':
			get_HideColumn();
			break;
			//æ·»å å¤æ³¨
			case 'btn-AddHRemark':
			btn_AddHRemark();
			break;
			};
			});
			@@ -372,6 +381,70 @@
			sWhere = "";
			}

			//å³éè®¢å
			function btn_Close(obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			var HICOMBillNoNum = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			HICOMBillNoNum.push(checkStatus.data[i]["çäº§è®¢åå·"])
			}
			var sMainSub = HICOMBillNoNum.toString() + ";" + sessionStorage["HUserName"];
			$.ajax({
			url: GetWEBURL() + "/LEMS/sc_ICOMReportClose",
			type: "POST",
			async: false,
			data: { "sMainSub": sMainSub },
			success: function (data1) {
			if (data1.count == 1) {
			layer.msg(data1.Message);
			get_FastQuery();
			} else {
			layer.msg(data1.Message);
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			});
			}
			})

			}

			function btn_AddHRemark() {
			var checkStatus = table.checkStatus('mainTable');
			if (checkStatus.data.length != 1) {
			layer.msg("è¯·éæ©ä¸æ¡æ°æ®!");
			} else {
			layer.prompt({ title: 'æ·»å å¤æ³¨', formType: 2 }, function (text, index) {

			var sMainSub = checkStatus.data[0]["çäº§è®¢åå·"]+ ";"+text + ";" + sessionStorage["HUserName"];
			$.ajax({
			url: GetWEBURL() + "/LEMS/sc_ICOMReportAddHRemark",
			type: "POST",
			async: false,
			data: { "sMainSub": sMainSub },
			success: function (data1) {
			if (data1.count == 1) {
			get_FastQuery();
			layer.close(index);
			layer.msg(data1.Message);
			} else {
			layer.msg(data1.Message);
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			});
			}
			})

			});
			}
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			@@ -483,7 +556,7 @@
			//åå»è·³è½¬å®¢æ·è®¢åæç»æ¥è¡¨
			function btnrowDouble(obj) {

			HICMOBillNo = obj["çäº§è®¢åå·"];
			var HICMOBillNo = obj["çäº§è®¢åå·"];

			if (HICMOBillNo == "" \|\| HICMOBillNo == null) {
			return layer.alert("æ å·¥èºæç»,æ æ³æ¥ç!", { icon: 5 });