1

duhe

2023-07-24 8123b1d8a6794e9ea2c3309b402abab75e5c3be1

1

 WebTM/WebTM.csproj

@@ -223,17 +223,23 @@
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillList.html" />
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\生产管理\日计划基础资料\Cg_PODemandPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_ShopCalendar.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu_IconSet.html" />
    <Content Include="views\系统管理\按钮设置\Xt_ModuleButtonSet.html" />
    <Content Include="views\系统管理\菜单自定义\Xt_DefineMenuDisplay.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillListQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillList_His.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillQuery_Mobile.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_Change.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_Copy_PL.html" />
    <Content Include="views\车间管理\报表分析\Kf_ProdProcessEntryReport_DyeColor.html" />
    <Content Include="views\车间管理\报表分析\Kf_ProdProcessSumReport_DyeColor.html" />
    <Content Include="views\车间管理\报表分析\Kf_ProdProcessSumReport_DyeColor_third.html" />
    <Content Include="views\车间管理\报表分析\SC_DayRkReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_ICOMProBarCodeReport.html" />
    <Content Include="views\车间管理\报表分析\sc_ICOMReport.html" />
    <Content Include="views\车间管理\报表分析\sc_ICOMRKReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopProcessWIPSumReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopProcessWIPReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_EmployeePieceWorkReport.html" />

 WebTM/views/PublicPage/HSourceReportHtml.html

@@ -134,7 +134,7 @@
            var OperationType = 1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HOrgID = params[params[1]];//源单id
            var HSouceBillType = decodeURI(params[params[2]]);//源单类型
        }
        var cols_arr = []; //存储表格头的数组
@@ -161,10 +161,6 @@
            var option = [];
            var titleData = [];//不需要显示的字段 å¯æ‰©å±•

            var HDeptID = 0;

            var params = getUrlVars();
            var HDeptID = params[params[0]];
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -186,6 +182,7 @@
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                data: { "HOrgID": HOrgID },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
@@ -197,9 +194,6 @@

                        }
                        $("#HDeptName").append(HDeptName);
                        if (!isNaN(HDeptID)) {
                            $("#HDeptName").val(HDeptID);
                        }
                        form.render('select');
                    }
                    layer.closeAll("loading");
@@ -304,7 +298,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
                    type: "GET",
                    data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": linterid },
                    data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": HOrgID },
                    async: false,
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    success: function (data1) {
@@ -407,10 +401,7 @@
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                //传递的参数不为NAN
                if (!isNaN(HDeptID) && HDeptName == 0) {
                    HDeptName = HDeptID;
                }
              
                switch (HSouceBillType) {
                    case '生产订单':
                        if (HBillNo) {

 WebTM/views/index.html

@@ -321,6 +321,7 @@
                                                <!--<dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">导入</a></dd>-->
                                                <dd><a lay-href="生产管理/齐套分析/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">齐套分析信息明细列表</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">生产日计划查询</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/Sc_ShopCalendar.html" style="margin: 0 0 0 13px;">工厂日历</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
@@ -362,7 +363,7 @@
                                            <a>报表</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">提料计划报表(采购订单维度)</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">提料计划报表</a></dd>
                                                <!--<dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">提料计划报表</a></dd>-->
                                                <dd><a lay-href="生产管理/日计划报表/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">要料计划报表</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">齐套报表</a></dd>
                                            </dl>
@@ -523,6 +524,11 @@
                                        <dd><a lay-href="车间管理/报表分析/Sc_EmployeePieceWorkReport.html">工序汇报日报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Sc_EmployeePiecePayReport.html">计件工资报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Sc_EmployeePiecePaySumReport.html">计件工资汇总报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/sc_ICOMReport.html">(按生产订单)客户订单报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/sc_ICOMRKReport.html">生产入库报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/SC_DayRkReport.html">生产日记</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/SC_DayRkReport1.html">成品克重差异明细表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Sc_ICOMProBarCodeReport.html">客户订单明细报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Kf_MaterOutSumReport_Cloth.html">白坯发布汇总报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Kf_MaterOutEntryReport_Cloth.html">白坯发布明细报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor.html">染厂汇总报表</a></dd>

 WebTM/views/index_Mobile_QiaoYi.html

@@ -506,35 +506,41 @@
                  </a>
                  <dl class="layui-nav-child">
                      <!--<dd>
                          <a lay-href="验收入库/外购入库/Kf_POStockInBill_FastList.html" style="color: aqua;">
        <a lay-href="验收入库/外购入库/Kf_POStockInBill_FastList.html" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            é‡‡è´­å…¥åº“缓存列表
        </a>
    </dd>
    <dd>
        <a lay-href="领料发货/领料出库/Kf_MateOutBill_FastList.html" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            ç”Ÿäº§é¢†æ–™ç¼“存列表
        </a>
    </dd>
    <dd>
        <a lay-href="验收入库/产品入库/Kf_ProductInBill_FastList.html" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            ç”Ÿäº§å…¥åº“缓存列表
        </a>
    </dd>
    <dd>
        <a lay-href="领料发货/销售出库/Kf_SellOutBill_FastList.html" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            é”€å”®å‡ºåº“缓存列表
        </a>
    </dd>
    <dd>
        <a lay-href="领料发货/销售出库/Kf_SellOutBill_CheckList_New.html" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            é”€å”®å‡ºåº“校验缓存列表
        </a>
    </dd>-->
                      <dd>
                          <a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBillQuery_Mobile.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              é‡‡è´­å…¥åº“缓存列表
                              å·¥åºæµè½¬å¡åˆ—表
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="领料发货/领料出库/Kf_MateOutBill_FastList.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              ç”Ÿäº§é¢†æ–™ç¼“存列表
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="验收入库/产品入库/Kf_ProductInBill_FastList.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              ç”Ÿäº§å…¥åº“缓存列表
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="领料发货/销售出库/Kf_SellOutBill_FastList.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              é”€å”®å‡ºåº“缓存列表
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="领料发货/销售出库/Kf_SellOutBill_CheckList_New.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              é”€å”®å‡ºåº“校验缓存列表
                          </a>
                      </dd>-->
                      <dd>
                          <a lay-href="验收入库/其他入库/Kf_OtherInBill_FastList.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
@@ -548,35 +554,35 @@
                          </a>
                      </dd>
                      <!--<dd>
                          <a lay-href="验收入库/委外入库/Kf_EntrustInBill_FastList.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              å§”外入库缓存列表
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="验收入库/委外出库/Kf_EntrustOutBill_FastList.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              å§”外领料缓存列表
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="领料发货/委外出库/Kf_EntrustOutBill_CheckList_New.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              å§”外领料校验缓存列表
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="领料发货/生产补料/Kf_MateReplenishOutBill_CheckList_New.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              ç”Ÿäº§è¡¥æ–™æ ¡éªŒç¼“存列表
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="领料发货/委外补料/Kf_EntrustReplenishOutBill_CheckList_New.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              å§”外补料校验缓存列表
                          </a>
                      </dd>-->
        <a lay-href="验收入库/委外入库/Kf_EntrustInBill_FastList.html" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            å§”外入库缓存列表
        </a>
    </dd>
    <dd>
        <a lay-href="验收入库/委外出库/Kf_EntrustOutBill_FastList.html" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            å§”外领料缓存列表
        </a>
    </dd>
    <dd>
        <a lay-href="领料发货/委外出库/Kf_EntrustOutBill_CheckList_New.html" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            å§”外领料校验缓存列表
        </a>
    </dd>
    <dd>
        <a lay-href="领料发货/生产补料/Kf_MateReplenishOutBill_CheckList_New.html" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            ç”Ÿäº§è¡¥æ–™æ ¡éªŒç¼“存列表
        </a>
    </dd>
    <dd>
        <a lay-href="领料发货/委外补料/Kf_EntrustReplenishOutBill_CheckList_New.html" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            å§”外补料校验缓存列表
        </a>
    </dd>-->
                      <dd>
                          <a lay-href="仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
@@ -584,47 +590,47 @@
                          </a>
                      </dd>
                      <!--<dd>
                          <a lay-href="" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              åˆ†æ­¥å¼è°ƒå‡ºç¼“存列表null
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              åˆ†æ­¥å¼è°ƒå…¥ç¼“存列表null
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              é‡‡è´­é€€æ–™ç¼“存列表null
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              ç”Ÿäº§é€€åº“缓存列表null
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              ç”Ÿäº§é€€æ–™ç¼“存列表null
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              é”€å”®é€€è´§ç¼“存列表null
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              åˆ°è´§ç‚¹æ•°ç¼“存列表null
                          </a>
                      </dd>-->
        <a lay-href="" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            åˆ†æ­¥å¼è°ƒå‡ºç¼“存列表null
        </a>
    </dd>
    <dd>
        <a lay-href="" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            åˆ†æ­¥å¼è°ƒå…¥ç¼“存列表null
        </a>
    </dd>
    <dd>
        <a lay-href="" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            é‡‡è´­é€€æ–™ç¼“存列表null
        </a>
    </dd>
    <dd>
        <a lay-href="" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            ç”Ÿäº§é€€åº“缓存列表null
        </a>
    </dd>
    <dd>
        <a lay-href="" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            ç”Ÿäº§é€€æ–™ç¼“存列表null
        </a>
    </dd>
    <dd>
        <a lay-href="" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            é”€å”®é€€è´§ç¼“存列表null
        </a>
    </dd>
    <dd>
        <a lay-href="" style="color: aqua;">
            <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
            åˆ°è´§ç‚¹æ•°ç¼“存列表null
        </a>
    </dd>-->
                  </dl>
              </li>
              <!-- ç³»ç»Ÿç®¡ç† -->

 WebTM/views/index_QiaoYi.html

@@ -509,6 +509,9 @@
    <dd><a lay-href="车间管理/报表分析/Mes_WIPProcReport.html">工序在制品报表(纵向)</a></dd>
    <dd><a lay-href="车间管理/报表分析/DefectiveDetailedYieldReport.html">不良明细良率报表</a></dd>
    <dd><a lay-href="车间管理/报表分析/Sc_StationOutSumReport.html">车间生产汇报统计表</a></dd>-->
                                            <dd><a lay-href="车间管理/报表分析/sc_ICOMReport.html">(按生产订单)客户订单报表</a></dd>
                                            <dd><a lay-href="车间管理/报表分析/sc_ICOMRKReport.html">生产入库报表</a></dd>
                                            <dd><a lay-href="车间管理/报表分析/SC_DayRkReport.html">生产日记</a></dd>
                                            <dd><a lay-href="车间管理/报表分析/Kf_MaterOutSumReport_Cloth.html">白坯发布汇总报表</a></dd>
                                            <dd><a lay-href="车间管理/报表分析/Kf_MaterOutEntryReport_Cloth.html">白坯发布明细报表</a></dd>
                                            <dd><a lay-href="车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor.html">染厂汇总报表</a></dd>

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html

@@ -476,7 +476,7 @@
                //获取组织ID
                var SetHOrgID = $("#HOrgID").find("option:selected").val();
                //页面层-自定义
                var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&linterid=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
                var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&HOrgID=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
                url = encodeURI(url);
                //alert(url);
                layer.open({

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

@@ -218,6 +218,11 @@
            });
            //#endregion

            //双击表格事件
            table.on('rowDouble(mainTable)', function (obj) {
                btnrowDouble(obj);
            })

        //#endregion


@@ -452,6 +457,14 @@
                }
            }

            function btnrowDouble(obj) {
                var index = parent.layer.getFrameIndex(window.name);
                var data = obj.data;
               //返回方法
                parent.GetGySource(data);
                parent.layer.close(index);
            }

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(number) {
                var HOrgID = "";

 WebTM/views/Éú²ú¹ÜÀí/¼´Ê±¿â´æ/JIT_InventoryList.html

@@ -151,6 +151,8 @@
                    , { field: '仓库ID', title: '仓库ID', hide: true }
                    , { field: '仓库编码', title: '仓库编码' }
                    , { field: '仓库名称', title: '仓库名称' }
                    , { field: '仓位ID', title: '仓位ID', hide: true }
                    , { field: '仓位名称', title: '仓位名称' }
                    , { field: '库存主单位ID', title: '库存主单位ID', hide: true }
                    , { field: '单位编码', title: '单位编码' }
                    , { field: '单位名称', title: '单位名称' }

 WebTM/views/Éú²ú¹ÜÀí/ÌáÁϼƻ®/JIT_LiftMaterPlaBillnList.html

@@ -206,6 +206,7 @@
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: 'hmainid', title: 'hmainid', hide: true }
                    , { field: '销售订单号', title: '销售订单号', width: 120 }
                    , { field: '单据类型', title: '单据类型', width: 120 }
                    , { field: '日期', title: '提料日期' }
                    , { field: '单据号', title: '单据号', width: 200 }

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBillList.html

@@ -48,7 +48,7 @@
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="width: 60%; display: inline-block;">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
@@ -57,13 +57,13 @@
                                    <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="HMaterNumber" id="HMaterNumber" readonly>
                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" >
                                        </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="HMaterModel" id="HMaterModel" readonly>
                                            <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" >
                                        </div>
                                    </div>
                                </div>

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportPODemandPlanBillList.html

@@ -89,6 +89,11 @@
                            </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="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
@@ -119,6 +124,7 @@
            , util = layui.util
        var sWhere = "";
        var option = [];
        var HModName = "ReportPODemandPlanBillList";
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -129,6 +135,16 @@
        //#endregion

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

        //头工具栏事件
        table.on('toolbar(mainTable)', function (obj) {
            switch (obj.event) {
                //隐藏列设置
                case 'HideColumn':
                    get_HideColumn();
                    break;
            };
        });

        //#region äº§å“ç¼–码
        form.on('submit(btnHMATERIALID)', function (data) {
@@ -165,22 +181,17 @@
            $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));
            //生产组织加载
            Organ();
            //初始化表格
            set_InitGrid();
            ////初始化表格
            //set_InitGrid();
            //快速过滤
            get_FastQuery(1);
            DisPlay_HideColumn(); 
        }
        //#endregion

        //#region åˆå§‹åŒ–表格方法
        function set_InitGrid() {
            var columns = [];
            var myDate = new Date();
            var yyyy = myDate.getFullYear();
            var MM = myDate.getMonth() + 1;
            var dd = myDate.getDate();
            var SumMonth = 31; //动态两月之差 new Date(yyyy, MM, 0).getDate()
            var MonthCount = new Date(yyyy, MM-1, 0).getDate();
        
            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: '组织', title: '采购组织' });
@@ -196,12 +207,40 @@
            columns.push({ field: '物料代码', title: '物料编码' });
            columns.push({ field: '计量单位名称', title: '计量单位' });
            columns.push({ field: 'TQSUM', title: '提料拖期数量' });
            for (var i = 1; i <= (MonthCount - dd + (SumMonth - MonthCount)); i++) {
                columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'MM.dd'), width: 70 })//0
         
            //获取两个月期之间的相差
            var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//开始时间
            var time2 = Date.parse(new Date($("#HENDDATE").val()));//结束时间
            var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
            //获取年
            var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
            //获取月份
            var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
            //获取开始月份的最大天数
            var SumMonth = new Date(yyyy, MM, 0).getDate(); //动态两月之差
            //获取开始日期的天数
            var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //获取开始日期天数

            var k = 0;//收集循环次数
            for (var j = 0; j <= (Days - k); j++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
                //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                if (MM == 12 && (HBEGINDATE + j) == 31) {
                    yyyy += 1;
                    MM = 1;
                    SumMonth = new Date(yyyy, MM, 0).getDate();
                    HBEGINDATE = 0;
                    k += j;
                    j = 0;
                } else if ((HBEGINDATE + j) == SumMonth) { //跨月 æœˆæ•°åŠ ä¸€  å¤©æ•°ä»Žä¸€å¼€å§‹
                    HBEGINDATE = 0;
                    MM += 1;
                    SumMonth = new Date(yyyy, MM, 0).getDate();
                    k += j;
                    j = 0;
                }
            }
            for (var i = 1; i <= dd; i++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
            }
          
            columns.push({ field: '', title: '提料计划合计' });

            option = {
@@ -217,6 +256,7 @@
            };
        }
        //#endregion


        //获取组织
        function Organ() {
@@ -282,6 +322,10 @@
            var HXQD = $("#HXQD").val();//需求单号
            var HPURORDERNO = $("#HPURORDERNO").val();//采购订单号

            if (HBEGINDATE > HENDDATE) {
                return layer.msg("开始日期不能小于结束日期!");
            }

            sWhere = {
                HORGID: HORGID
                , HBEGINDATE: HBEGINDATE
@@ -291,6 +335,8 @@
                , HXQD: HXQD
                , HPURORDERNO: HPURORDERNO
            }
            //初始化表格
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
            sWhere = "";//调用接口后清空sWhere缓存
        }
@@ -345,7 +391,7 @@
                , area: ['90%', '90%']//大小
                , title: '供应商列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_SupplierList.html', 'yes']
                , content: ['../../基础资料/采购基础资料/Gy_Supplier.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -355,14 +401,117 @@
                    }
                    //获取数据
                    $("#HSUPPLIERID").val(checkStatus.data[0].HItemID);
                    $("#HSUPPLIERNAME").val(checkStatus.data[0].HName);
                    $("#HSUPPLIERNAME").val(checkStatus.data[0].供应商名称);
                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }

        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
            for (var i = 1; i < option.cols[0].length; 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);//关闭弹窗
                }
            })
        }

        //显示列数据
        function DisPlay_HideColumn() {
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.data.length != 0) {

                        var dataCol = [];//数据库查询出的列数据
                        var titleData = [];//不需要显示的字段 å¯æ‰©å±•

                        dataCol = data1.data[0].HGridString.split(',');

                        for (var i = 0; i < option.cols[0].length - 1; i++) {
                            if (dataCol[i]) {
                                var dataCols = dataCol[i].split('|');
                            }
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                            }
                            //设置内容字体大小
                            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[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //显示列
                            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
        //以上是layui模块

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

@@ -254,6 +254,7 @@
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
@@ -544,7 +545,7 @@
                        //, { field: '作废日期', title: '作废日期', hide: true }
                        //, { field: '销售订单日期', title: '销售订单日期', sort: true, width: 120, hide: true }
                        , { field: '销售订单日期', title: '销售订单日期', sort: true  }
                        , { field: '销售订单编号', title: '销售订单编号', sort: true }
                        , { field: '销售订单号', title: '销售订单号', sort: true }
                        , { field: '销售物料名称', title: '销售物料名称', sort: true }
                        , { field: '包装方式', title: '包装方式', sort: true }
                        , { field: '销售数量', title: '销售数量', sort: true }

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList.html

@@ -86,6 +86,12 @@
                                                <input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
                                            </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="HICOMBillNo" id="HICOMBillNo">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -323,6 +329,7 @@
            var HMaterName = $("#HMaterName").val();//物料名称
            var HMaterNumber = $("#HMaterNumber").val();//物料编码
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号
            var HICOMBillNo = $("#HICOMBillNo").val();//生产订单号

            if (HBillNo) {
                sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
@@ -345,6 +352,9 @@
            if (HSeOrderBillNo) {
                sWhere += " and é”€å”®è®¢å•å· like'%" + HSeOrderBillNo + "%'";
            }
            if (HICOMBillNo) {
                sWhere += " and ç”Ÿäº§è®¢å•å· like'%" + HICOMBillNo + "%'";
            }
            get_Display(sWhere);
            sWhere = "";//调用接口后清空sWhere缓存
        }

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

@@ -41,13 +41,16 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">生产订单组织</label>
                                    <label class="layui-form-label" style="width: 85px;">提料类型</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
                                            <!--动态渲染组织-->
                                        <select name="HTLType" id="HTLType" lay-verify="HTLType">
                                            <option value="缺料" selected="selected">缺料</option>
                                            <option value="生产用料清单">生产用料清单</option>
                                            <!--<option value="采购订单">采购订单</option> æš‚时没有-->
                                        </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;">
@@ -72,7 +75,7 @@
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料编码</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
@@ -95,15 +98,14 @@
                                        <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="HMaterName" id="HMaterName" style="background-color:#efefef4d" readonly>
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                            </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="HOrderType" id="HOrderType" lay-verify="HOrderType">
                                                    <option value="全部">全部</option>
                                                    <option value="生产用料清单">生产用料清单</option>
                                                    <option value="生产用料清单" selected="selected">生产用料清单</option>
                                                    <option value="标准Bom">标准Bom</option>
                                                </select>
                                            </div>
@@ -119,7 +121,7 @@
                                        <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="HMaterModel" id="HMaterModel" style="background-color:#efefef4d" readonly>
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -129,14 +131,57 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:10px;">
                                        <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="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
                                                    <!--动态渲染组织-->
                                                </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;">
                                                <input type="date" class="layui-input" lay-verify="HMastersDate" name="HMastersDate" id="HMastersDate" style="padding-left: 75px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" 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_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="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_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
@@ -154,9 +199,7 @@
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<script>
    var treeCkData = { id: 0 };
    var TagId = "";
    var TagParentId = "";
    var OptionData = [];
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
@@ -176,6 +219,7 @@
        var sWhere = "";
        var option = [];
        var HModName = "JIT_DayPlanPlatForm";
      
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -344,6 +388,7 @@
            //初始化时间
            $("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            $("#HMastersDate").val("");
            //组织
            Organ();
            //初始化表格
@@ -580,6 +625,11 @@
                            get_Display_1(HinterID_S);
                            get_Display_2(HinterID_S)
                        }

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }

                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -806,9 +856,36 @@
            }
            var HPlanBeginDate = $("#HPlanBeginDate").val();//开工起始日期
            var HPlanEndDate = $("#HPlanEndDate").val();//开工截止日期
            var HMastersDate = $("#HMastersDate").val();//排产日期
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号
            var HMaterID = $("#HMaterID").val();//物料编码id
            var HICMOBillNo = $("#HICMOBillNo").val();//生产订单号
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var sWheres = "";

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like''%" + ColContent + "%''";
                        break;
                    case "8":
                        com = "like''%" + ColContent + "''";
                        break;
                    case "9":
                        com = "like''" + ColContent + "%''";
                        break;
                    case "10":
                        com = "not like''%" + ColContent + "%''";
                        break;
                    default:
                        com = "" + Comparator + "''" + ColContent + "''";
                        break;
                }
                sWheres += " and [" + ColName + "] " + com;
            }

            sWhere = {
                HPlanBeginDate: HPlanBeginDate
@@ -818,6 +895,8 @@
                , HMaterID: HMaterID
                , HICMOBillNo: HICMOBillNo
                , HWorkShopID: HWorkShopID
                , HMastersDate: HMastersDate
                , sWheres: sWheres
            }
            get_Display(JSON.stringify(sWhere));
            sWhere = ""//调用接口后清空sWhere缓存
@@ -837,6 +916,7 @@
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , maxmin: true //设置最大最小按钮是否显示
                , area: ['90%', '90%']//大小
                , title: '齐套分析明细表'//标题
                , shift: 2//弹出动画
@@ -849,6 +929,7 @@
            $("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开工起始日期
            $("#HSeOrderBillNo").val("");//销售订单号
            $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//开工截止日期
            $("#HMastersDate").val("");//排产日期
            $("#HMaterID").val("0");//物料编码id
            $("#HMaterNumber").val("");//物料编码
            $("#HMaterName").val("");//物料名称
@@ -857,6 +938,9 @@
            $("#HWorkShopID").val("0");//生产车间id
            $("#HWorkShopIDName").val("");//生产车间
            $("#HProdORGID").val(sessionStorage["OrganizationID"])//生产订单组织
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            form.render('select');
            sWhere = "";
        }
@@ -901,12 +985,13 @@
                HProdORGID: $("#HProdORGID").val()
                , HWorkShopID: $("#HWorkShopID").val()
            }
            var HTLType = $("#HTLType").val();
            sWhere = JSON.stringify(sWhere);
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_TLYS',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["Czybm"] },
                data: { "sWhere": sWhere, "user": sessionStorage["Czybm"], "HTLType": HTLType },
                success: function (data1) {
                    if (data1.count == 1) {
                        get_FastQuery(2);
@@ -1138,6 +1223,12 @@
                                })
                                layer.close(index);//关闭弹窗
                            }
                            , end: function () {
                                obj.update({
                                    "HSourceID": OptionData.HItemID
                                    , "生产资源": OptionData.生产资源名称
                                })
                            }
                        })
                    }
                    obj.event = "";
@@ -1322,7 +1413,24 @@
            })
        }

        //列明显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
            for (var i = 1; i < option.cols[0].length; i++) {
                if (option.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                }
            }
            $("#ColName").empty();
            $("#ColName").append(Organization);
            form.render('select');
        }
        //#endregion
        //以上是layui模块
    });

    //双击返回生产资源
    function GetGySource(data) {
        OptionData = data
    }
</script>

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

@@ -11,37 +11,6 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .main-btn { /*头部主按钮*/
            padding: 0 2px; /*调整按钮左右空隙大小*/
            height: 30px;
            line-height: 30px;
        }

        .btn-title {
            font-size: 16px;
        }
        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        .layui-table-cell {
            overflow: visible !important;
        }
        /* ä½¿å¾—下拉框与单元格刚好合适 */
        td .layui-form-select {
            margin-top: -10px;
            margin-left: -15px;
            margin-right: -15px;
        }

        .layui-form-item .layui-inline {
            margin-top: 5px;
            margin-bottom: 5px;
            margin-right: 0px;
        }

        .layui-form-label {
            width: 25%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
@@ -217,24 +186,24 @@
            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: 'hmainid', title: 'hmainid', width: 200, hide: true });
            columns.push({ field: '单据号', title: '单据号', width: 200 });
            columns.push({ field: '生产订单号*', title: '生产订单号' });
            columns.push({ field: '生产订单号*', title: '生产订单号', width: 150 });
            columns.push({ field: '生产订单明细行号*', title: '生产订单明细行号', width: 200 });
            columns.push({ field: '组织编码*', title: '组织编码' });
            columns.push({ field: '组织编码*', title: '组织编码', width: 150});
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: '生产车间编码*', title: '生产车间' });
            columns.push({ field: '生产车间编码*', title: '生产车间', width: 150});
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
            columns.push({ field: '生产资源编码*', title: '生产资源', edit: 'text', event: "HSourceID"   });
            columns.push({ field: '优先级', title: '优先级' });
            columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
            columns.push({ field: '员工', title: '员工' });
            columns.push({ field: '员工编码', title: '员工编码' });
            columns.push({ field: '员工', title: '员工', width: 150 });
            columns.push({ field: '员工编码', title: '员工编码', width: 150 });
            columns.push({ field: 'HMaterID', title: '物料ID', hide: true });
            columns.push({ field: '物料编码*', title: '物料编码' });
            columns.push({ field: '物料编码*', title: '物料编码', width: 150 });
            columns.push({ field: '物料名称', title: '物料名称', width: 200 });
            columns.push({ field: '规格型号', title: '规格型号' });
            columns.push({ field: '规格型号', title: '规格型号', width: 150});
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: '计量单位', title: '计量单位' });
            columns.push({ field: '批次号', title: '批次' });
            columns.push({ field: '计量单位', title: '计量单位', width: 150});
            columns.push({ field: '批次号', title: '批次', width: 150});
            columns.push({ field: '销售订单数量', title: '销售订单数量', width: 200 });
            columns.push({ field: '生产订单数量', title: '生产订单数量', width: 200 });
            columns.push({ field: '总齐套数量', title: '总齐套数量', width: 200 });
@@ -242,10 +211,10 @@
            columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            for (var i = 0; i <= (SumMonth - dd); i++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:60 })
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:80 })
            }
            for (var i = 1; i <= dd; i++) {
                columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 60 })
                columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 80 })
            }
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });


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

New file
@@ -0,0 +1,548 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>工厂日历</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <script src="../../../layuiadmin/layui/layui1.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">日期</label>
                                    <div class="layui-input-block" style="width:100px">
                                        <select name="HDate" lay-verify="required" id="HDate">
                                         <!--动态获取日期-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>-->
                            </div>
                        </div>
                        <div class="layui-row" style="padding:10px 0">
                            <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="TreeTable" class="demo-tree demo-tree-box"></div>
                            </div>
                            <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 83%">
                                <div>
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
                                    <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
                                    <table class="layui-hide" id="mainTable5" lay-filter="mainTable5"></table>
                                    <table class="layui-hide" id="mainTable6" lay-filter="mainTable6"></table>
                                    <table class="layui-hide" id="mainTable7" lay-filter="mainTable7"></table>
                                    <table class="layui-hide" id="mainTable8" lay-filter="mainTable8"></table>
                                    <table class="layui-hide" id="mainTable9" lay-filter="mainTable9"></table>
                                    <table class="layui-hide" id="mainTable10" lay-filter="mainTable10"></table>
                                    <table class="layui-hide" id="mainTable11" lay-filter="mainTable11"></table>
                                    <table class="layui-hide" id="mainTable12" lay-filter="mainTable12"></table>
                                </div>
                            </div>
                        </div>
                      
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>
<script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','tree'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var TagId = "";
            var option1 = [];
            var option2 = [];
            var option3 = [];
            var option4 = [];
            var option5 = [];
            var option6 = [];
            var option7 = [];
            var option8 = [];
            var option9 = [];
            var option10 = [];
            var option11 = [];
            var option12 = [];
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½

            set_ClearBill();

            //#endregion


            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等

            //行内鼠标离开事件
            table.on('edit(mainTable1)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;
              
                Save(hdate, hvalue, TagId)
            })
            table.on('edit(mainTable2)', function (obj) {
                var hdate = obj.field;
                var hvalue = obj.value;

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

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

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

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

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

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

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

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

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

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

                Save(hdate, hvalue, TagId)
            })


            //快速过滤
            form.on('submit(btnSearch)', function (data) {
                var Year = new Date($("#HDate").val()).getFullYear();
                //初始化表格
                set_InitGrid(Year, 1, "");
                set_InitGrid(Year, 2, "");
                set_InitGrid(Year, 3, "");
                set_InitGrid(Year, 4, "");
                set_InitGrid(Year, 5, "");
                set_InitGrid(Year, 6, "");
                set_InitGrid(Year, 7, "");
                set_InitGrid(Year, 8, "");
                set_InitGrid(Year, 9, "");
                set_InitGrid(Year, 10, "");
                set_InitGrid(Year, 11, "");
                set_InitGrid(Year, 12, "");
                get_Display_Tree();
                get_Display("");
            });

            //#endregion

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法
            function set_ClearBill() {
                getDate();
                //获取年
                var Year = new Date($("#HDate").val()).getFullYear();
                //初始化表格
                set_InitGrid(Year, 1,"");
                set_InitGrid(Year, 2, "");
                set_InitGrid(Year, 3, "");
                set_InitGrid(Year, 4, "");
                set_InitGrid(Year, 5, "");
                set_InitGrid(Year, 6, "");
                set_InitGrid(Year, 7, "");
                set_InitGrid(Year, 8, "");
                set_InitGrid(Year, 9, "");
                set_InitGrid(Year, 10, "");
                set_InitGrid(Year, 11, "");
                set_InitGrid(Year, 12, "");
                get_Display_Tree();
                get_Display("");
            }

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

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

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

            //查询数据
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/MaterOutEntryReport/Sc_ShopCalendar',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var Year = new Date($("#HDate").val()).getFullYear();
                            var num = "";
                            if (data1.data.length != 0) {
                                set_InitGrid(Year, 1, num);
                                set_InitGrid(Year, 2, num);
                                set_InitGrid(Year, 3, num);
                                set_InitGrid(Year, 4, num);
                                set_InitGrid(Year, 5, num);
                                set_InitGrid(Year, 6, num);
                                set_InitGrid(Year, 7, num);
                                set_InitGrid(Year, 8, num);
                                set_InitGrid(Year, 9, num);
                                set_InitGrid(Year, 10, num);
                                set_InitGrid(Year, 11, num);
                                set_InitGrid(Year, 12, num);
                                for (var i = 0; i < data1.data.length; i++) {
                                    var Month = new Date(data1.data[i]["日期"]).getMonth() + 1;
                                    switch (Month) {
                                        case 1:
                                            option1.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 2:
                                            option2.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 3:
                                            option3.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 4:
                                            option4.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 5:
                                            option5.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 6:
                                            option6.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 7:
                                            option7.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 8:
                                            option8.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 9:
                                            option9.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 10:
                                            option10.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 11:
                                            option11.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                        case 12:
                                            option12.data[0][data1.data[i]["日期"]] = data1.data[i]["加班工时"];
                                            break;
                                    }
                                }
                            } else {
                                num = 8;
                                set_InitGrid(Year, 1, num);
                                set_InitGrid(Year, 2, num);
                                set_InitGrid(Year, 3, num);
                                set_InitGrid(Year, 4, num);
                                set_InitGrid(Year, 5, num);
                                set_InitGrid(Year, 6, num);
                                set_InitGrid(Year, 7, num);
                                set_InitGrid(Year, 8, num);
                                set_InitGrid(Year, 9, num);
                                set_InitGrid(Year, 10, num);
                                set_InitGrid(Year, 11, num);
                                set_InitGrid(Year, 12, num);
                            }
                            table.render(option1);
                            table.render(option2);
                            table.render(option3);
                            table.render(option4);
                            table.render(option5);
                            table.render(option6);
                            table.render(option7);
                            table.render(option8);
                            table.render(option9);
                            table.render(option10);
                            table.render(option11);
                            table.render(option12);
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            // æ ‘状图查询
            function get_Display_Tree() {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/MaterOutEntryReport/Gy_SourceList',
                    type: "GET",
                    async: false,
                    data: { "HOrgid": sessionStorage["OrganizationID"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.close(ajaxLoad);
                            var data = JSON.parse(data1.data);
                            MenuMain(data);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //遍历生成主菜单
            function MenuMain(data) {
                var liStr = '[';
                //遍历生成主菜单
                for (var i = 0; i < data.length; i++) {
                    // åˆ¤æ–­æ˜¯å¦å­˜åœ¨å­èœå•
                    if (data[i].children != null && data[i].children.length > 0) {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
                        // éåŽ†èŽ·å–子菜单
                        for (var k = 0; k < data[i].children.length; k++) {
                            liStr += getChildMenu(data[i].children[k], 0);
                        }
                        liStr = liStr.substring(0, liStr.length - 1);
                        liStr += ']},';
                    } else {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
                    }
                };
                liStr = liStr.substring(0, liStr.length - 1);
                liStr += "]";
                var treeTable = JSON.parse(liStr);
                tree.render({
                    elem: '#TreeTable' //默认是点击节点可进行收缩
                    , data: treeTable
                    , click: function (obj) {
                        var data = obj.data;  //获取当前点击的节点数据
                        TagId = data.id;
                        var sql = "";
                        var HDate = $("#HDate").val();
                        if (data.id == "0") {
                            sql = " and æ—¥æœŸ like'%" + HDate + "%'";
                        } else {
                            sql = " and HSourceID='" + data.id + "' and æ—¥æœŸ like'%" + HDate+"%'";
                        }
                        get_Display(sql);
                    }
                });
            }

            // é€’归生成子菜单
            function getChildMenu(subMenu, num) {
                num++;
                var subStr = '';
                if (subMenu.children != null && subMenu.children.length > 0) {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
                    for (var j = 0; j < subMenu.children.length; j++) {
                        subStr += getChildMenu(subMenu.children[j], num);
                        if (j + 1 == subMenu.children.length) {
                            subStr = subStr.substring(0, subStr.length - 1);
                        }
                    }
                    subStr += ']},';
                } else {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
                }
                return subStr;
            }

            //保存
            function Save(hdate, hvalue, TagId) {
                if (TagId == "") {
                    return layer.msg("请先选择生产资源!");
                }
                var reg = /^\d+(\.\d+)?$/;
                if (reg.test(hvalue) == false || hvalue == "" || hvalue == "0") {
                    layer.msg("数量必须为数量或小数");
                    return false;
                }

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

                $.ajax({
                    url: GetWEBURL() + '/MaterOutEntryReport/Sc_ShopCalendarSave',
                    type: "POST",
                    async: false,
                    data: { "sMainSub": sMainSub },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.msg(data1.Message);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
     

          
            //以上是layui模块
        });




</script>

 WebTM/views/Éú²ú¹ÜÀí/ÆëÌ×·ÖÎö/JIT_CompleteDetailList.html

@@ -29,7 +29,7 @@
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料编码</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterNumber" id="btnHMaterNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
@@ -58,7 +58,7 @@
                                        <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="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="display: inline-block;" >
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -82,7 +82,7 @@
                                        <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="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="display: inline-block;" >
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -247,7 +247,9 @@
                    , { field: '生产车间名称', title: '生产车间名称' }
                    , { field: '仓库ID', title: '仓库ID', hide: true }
                    , { field: '仓库编码', title: '仓库编码' }
                    , { field: '仓库名称', title: '仓库名称', width: 120}
                    , { field: '仓库名称', title: '仓库名称', width: 120 }
                    , { field: '仓位ID', title: '仓位ID', hide: true }
                    , { field: '仓位名称', title: '仓位名称' }
                    , { field: '批号', title: '批号' ,width:120}
                ]]
                , done: function (res, curr, count) {
@@ -296,6 +298,8 @@
        function get_FastQuery() {
            var HMaterID = $("#HMaterID").val();
            var HMaterNumber = $("#HMaterNumber").val();
            var HMaterName = $("#HMaterName").val();
            var HMaterModel = $("#HMaterModel").val();
            var HComplete = $("#HComplete").val();
            var HPlanDate = $("#HPlanDate").val();
            var HICMOBillNo = $("#HICMOBillNo").val();
@@ -304,7 +308,13 @@
                sWhere += " and ç‰©æ–™ID = '" + HMaterID + "'";
            }
            if (HMaterNumber) {
                sWhere += " and ç‰©æ–™ç¼–码 = '" + HMaterNumber + "'";
                sWhere += " and ç‰©æ–™ç¼–码 like '%" + HMaterNumber + "%'";
            }
            if (HMaterName) {
                sWhere += " and ç‰©æ–™åç§° like '%" + HMaterName + "%'";
            }
            if (HMaterModel) {
                sWhere += " and è§„格型号 like '%" + HMaterModel + "%'";
            }
            if (HComplete) {
                sWhere += " and é½å¥—状态 = '" + HComplete + "'";

 WebTM/views/³µ¼ä¹ÜÀí/ίÍ⹤Ðò·¢³öµ¥/Cj_StationEntrustInBill.html

@@ -395,7 +395,7 @@
                    <!--隐藏字段-->
                    <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
                    <input type="hidden" name="HMaker" id="HMaker"><!--制单人-->
                    <!--<input type="hidden" name="HMaker" id="HMaker">--><!--制单人-->
                    <input type="hidden" name="eventType" id="eventType" value="Add">
                </form>
            </div>

 WebTM/views/³µ¼ä¹ÜÀí/ίÍ⹤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBill.html

@@ -1015,7 +1015,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../../views/基础资料/采购基础资料/Gy_Supplier.html', 'yes'],
                    content: ['../../views/基础资料/采购基础资料/Gy_Supplier.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调

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

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

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

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

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

@@ -1832,7 +1832,7 @@
                    layer.confirm("确认要批量打印吗?", { title: "确认" }, function (index) {
                        time = setInterval(function () {
                            dy(data);
                        }, 1000);
                        }, 2000);
                        //关闭当前frame
                        layer.close(index);
                    })
@@ -1848,7 +1848,7 @@
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名
                    async: true,
                    async: false,
                    data: { "sWhere": sWhere },
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -1867,7 +1867,7 @@
                                var args = {
                                    type: "print",
                                    showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可
                                    report: urlAddRandomNo("../../grf/涤纶.grf"),
                                    report: urlAddRandomNo("../../grf/cs10.grf"),
                                    data: Customer
                                };
                                //var args = {

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

New file
@@ -0,0 +1,297 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>工序流转卡列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>

</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">客户</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HCurName" id="HCurName">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px;">
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
        var sWhere = "";
        var option = [];

        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½

        //初始化界面
        set_ClearBill();

        //#endregion

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

        //#region å¤´å·¥å…·æ äº‹ä»¶
        table.on('toolbar(mainTable)', function (obj) {
            switch (obj.event) {
                //刷新
                case 'get_Refresh': get_Refresh();
                    break;
                //退出按钮
                case 'get_Exit': Pub_Close(2);
                    break;
                //列设置
                case 'set_HideColumn': get_HideColumn();
                    break;
            };
        });

        //#endregion

        //#region æŸ¥è¯¢æŒ‰é’®
        form.on('submit(btnSearch)', function (data) {//选择仓位
            get_FastQuery();
        });
        //#endregion

        //重置按钮
        form.on('submit(btnReSearch)', function (data) {

            set_ClearQuery();
        });
        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

        //获取组织

        //#region åˆå§‹åŒ–界面
        function set_ClearBill() {
            //初始化表格
            set_InitGrid();
            //查询
            get_FastQuery();
        }
        //#endregion

        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , loading: false
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: '客户', title: '客户', sort: true, width: 120 }
                    , { field: '产品规格', title: '产品规格', width: 120 }
                    , { field: '单据号', title: '单据号', width: 120 }
                    , { field: '当前工序', title: '当前工序', width: 120 }
                    , { field: '日期', title: '日期', width: 120 }
                    , { field: '流转卡数量', title: '流转卡数量', width: 100 }
                    ]]
            };
        }

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

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

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //#endregion

        //#region å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
           
            var HCurName = $("#HCurName").val();
            var HBillNo = $("#HBillNo").val();//单据号
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like'%" + ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + ColContent + "%'";
                        break;
                    default:
                        com = "" + Comparator + "'" + ColContent + "'";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }


            var HOrgID= sessionStorage["OrganizationID"];

            if (HCurName) {
                sWhere += " and å®¢æˆ· like '%" + HCurName + "%'";
            }
            if (HBillNo) {
                sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
            }
            if (HOrgID) {
                sWhere += " and HPRDORGID = '" + HOrgID + "'";
            }
            get_Display(sWhere);
            sWhere = "";//调用接口后清空sWhere缓存
        }
        //#endregion

        //#endregion

        //#region åˆ—明显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
            for (var i = 1; i < option.cols[0].length; i++) {
                if (option.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                }
            }
            $("#ColName").empty();
            $("#ColName").append(Organization);
            form.render('select');
        }
        //#endregion
        //#endregion

        //以上是layui模块
    });




</script>

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

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

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

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

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

New file
@@ -0,0 +1,506 @@
<!DOCTYPE html>
<html>
<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/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </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-form layui-inline" style="position:relative;top:10px;">
                                    <label class="layui-form-label" style="width:30px">日期</label>
                                    <div class="layui-form-item  layui-inline">

                                        <div class="layui-input-inline">
                                            <input type="text" class="layui-input" id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
                                        </div>
                                        <label class="layui-form-label" style="width:25px">-</label>
                                        <div class="layui-input-inline">
                                            <input type="text" class="layui-input" id="HEndDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
                                        </div>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-form layui-inline">
                                    <label class="layui-form-label" style="width: 80px;">总重量(千克)</label>
                                    <div class="layui-input-block" style="margin-left: 112px;">
                                        <input type="text" class="layui-input" name="HWeight" id="HWeight" style=" width: 120px; background-color: #efefef4d;" readonly>
                                    </div>
                                </div>
                                <div class="layui-form layui-inline">
                                    <label class="layui-form-label" style="width: 42px;">总匹数</label>
                                    <div class="layui-input-block" style="margin-left: 74px;">
                                        <input type="text" class="layui-input" name="HNumberOH" id="HNumberOH" style=" width: 120px; background-color: #efefef4d;" readonly>
                                    </div>
                                </div>
                                <div class="layui-form layui-inline">
                                    <label class="layui-form-label" style="width: 95px;">总实际数量(ç±³)</label>
                                    <div class="layui-input-block" style="margin-left: 128px;">
                                        <input type="text" class="layui-input" name="HActualHQty" id="HActualHQty" style=" width: 120px; background-color: #efefef4d;" readonly>
                                    </div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-bottom:10px;">
                                        <!--其他条件-->
                                        <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="HCustomerName" id="HCustomerName">
                                            </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="HMaterNumber" id="HMaterNumber">
                                            </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="HProductName" id="HProductName">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <table class="" id="mainTable1" lay-filter="mainTable1"></table>
                        <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="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "SC_DayRkReport";
            var HWeight = 0;
            var HNumberOH = 0;
            var HActualHQty = 0;

            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½

            //#region åˆå§‹åŒ–界面

            set_ClearBill();

            //#endregion

            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //退出
                    case 'btn-exit': Pub_Close(2);
                        break;
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                };
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //#endregion

            //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

            //初始化界面
            function set_ClearBill() {
                //初始化时间
                laydate.render({
                    elem: '#HBeginDate',
                    type: 'datetime',
                    fullPanel: true
                    , format: 'yyyy-MM-dd HH:mm'
                    , value: Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
                });
                laydate.render({
                    elem: '#HEndDate',
                    type: 'datetime',
                    fullPanel: true
                    , format: 'yyyy-MM-dd HH:mm'
                    , value: Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
                });

                //加载数据到网格
                get_FastQuery();
               // DisPlay_HideColumn();
            }

            //加载网格
            function get_Display(sWhere) {
                //动态列-缓存列表
                $.ajax({
                    url: GetWEBURL() + "/MaterOutEntryReport/SC_DayRkReport",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "num": 1},
                    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 });
                            }

                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计-小毛皮成品'  });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '实际数量(ç±³)' || data[i].name == '匹数(件)' || data[i].name == '重量(千克)' ) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
                                }
                            }
                            option = {
                                elem: '#mainTable'
                                //, toolbar: '#toolbarDemo'
                                , cellMinWidth: 120
                                , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                                , height: 500
                                , totalRow: true //开启合计
                                , cols: [col]
                                , data: data1.data
                                , done: function (obj) {
                                    if (obj.data.length != 0) {
                                        for (var i = 0; i < obj.data.length; i++) {
                                            HWeight += obj.data[i]["重量(千克)"];
                                            HNumberOH += obj.data[i]["匹数(件)"];
                                            HActualHQty += obj.data[i]["实际数量(ç±³)"];
                                        }
                                    }
                                }
                            };
                            table.render(option);
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                })
            }

            function get_Display_1(sWhere) {
                //动态列-缓存列表
                $.ajax({
                    url: GetWEBURL() + "/MaterOutEntryReport/SC_DayRkReport",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere,"num":2 },
                    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 });
                            }

                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计-大毛皮成品' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '实际数量(ç±³)' || data[i].name == '匹数(件)' || data[i].name == '重量(千克)') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
                                }
                            }
                            option = {
                                elem: '#mainTable1'
                                //, toolbar: '#toolbarDemo'
                                , cellMinWidth: 120
                                , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                                , height: 500
                                , totalRow: true //开启合计
                                , cols: [col]
                                , data: data1.data
                                , done: function (obj) {
                                    if (obj.data.length != 0) {
                                        for (var i = 0; i < obj.data.length; i++) {
                                            HWeight += obj.data[i]["重量(千克)"];
                                            HNumberOH += obj.data[i]["匹数(件)"];
                                            HActualHQty += obj.data[i]["实际数量(ç±³)"];
                                        }
                                    }
                                }
                            };
                            table.render(option);
                            $("#HWeight").val(HWeight.toFixed(2));
                            $("#HNumberOH").val(HNumberOH.toFixed(2));
                            $("#HActualHQty").val(HActualHQty.toFixed(2));
                            HWeight = 0;
                            HNumberOH = 0;
                            HActualHQty = 0;

                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                })
            }

            //快速过滤
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                var HEndDate = $("#HEndDate").val();//结束日期
                var HMaterNumber = $("#HMaterNumber").val();//物料代码
                var HCustomerName = $("#HCustomerName").val();          //单据号
                var HProductName = $("#HProductName").val();//产品名称

                if (HBeginDate != "" && HEndDate != "") {
                   
                } else {
                    HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm");
                    HEndDate = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm");
                }
             
                sWhere = {
                    HBeginDate: HBeginDate,
                    HMaterNumber: HMaterNumber,
                    HCustomerName: HCustomerName,
                    HProductName: HProductName,
                    HEndDate: HEndDate
                };

                get_Display(JSON.stringify(sWhere));
                get_Display_1(JSON.stringify(sWhere));
                //调用接口后清空sWhere缓存
                sWhere = "";
            }

            //重置过滤条件
            function set_ClearQuery() {
                //初始化时间
                laydate.render({
                    elem: '#HBeginDate',
                    type: 'datetime',
                    fullPanel: true
                    , format: 'yyyy-MM-dd HH:mm'
                    , value: Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
                });
                laydate.render({
                    elem: '#HEndDate',
                    type: 'datetime',
                    fullPanel: true
                    , format: 'yyyy-MM-dd HH:mm'
                    , value: Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
                });
                $("#HMaterNumber").val("");
                $("#HCustomerName").val("");
                $("#HProductName").val("");
                sWhere = "";
            }


            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length; 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);//关闭弹窗
                    }
                })
            }

            //显示列数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var titleData = [];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置内容字体大小
                                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[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //显示列
                                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
        });
    </script>
</body>
</html>

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

New file
@@ -0,0 +1,508 @@
<!DOCTYPE html>
<html>
<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/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </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-form layui-inline" style="position:relative;top:10px;">
        <label class="layui-form-label">日期</label>
        <div class="layui-form-item  layui-inline">
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                </div>
            </div>
        </div>
        <div class="layui-form-item  layui-inline">
            <div class="layui-inline">
                <label class="layui-form-label">-</label>
                <div class="layui-input-inline">
                    <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                </div>
            </div>
        </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="HMaterNumber" id="HMaterNumber">
                                    </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="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <!--其他条件-->

                                        <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="HProductName" id="HProductName">
                                            </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="HProductModel" id="HProductModel">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin:10px 0px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" 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-exit"><i class="layui-icon layui-icon-return"></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>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "Sc_ICOMProBarCodeReport";
            var HICMOBillNo = "";
          
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½

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

            //判断是否有参数传递
            if (!isNaN(OperationType)) {
                HICMOBillNo = params[params[1]];
            }



            //#region åˆå§‹åŒ–界面
            set_ClearBill();

            //#endregion

            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //退出
                    case 'btn-exit': Pub_Close(2);
                        break;
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                };
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //行监听事件-单击
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });
            //#endregion

            //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

            //初始化界面
            function set_ClearBill() {
                //初始化时间
                //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                //$("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));

                //加载数据到网格
                get_FastQuery();
                DisPlay_HideColumn();
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }


            //加载网格
            function get_Display(sWhere) {
                //动态列-缓存列表
                $.ajax({
                    url: GetWEBURL() + "/MaterOutEntryReport/Sc_ICOMProBarCodeReport",
                    type: "GET",
                    async: false,
                    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 });
                            }

                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'  });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '入库米数' ) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
                                }
                            }
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cellMinWidth: 120
                                , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                                , height: 'full-70'
                                , totalRow: true //开启合计
                                , cols: [col]
                                , data: data1.data
                            };
                            table.render(option);
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                })
            }

            //快速过滤
            function get_FastQuery() {
                //var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                //var HEndDate = $("#HEndDate").val();//结束日期
                var HMaterNumber = $("#HMaterNumber").val();//物料代码
                var HBillNo = $("#HBillNo").val();          //单据号
                var HProductName = $("#HProductName").val();//产品名称
                var HProductModel = $("#HProductModel").val();//产品规格

                //sWhere = " and æ¡ç æ—¥æœŸ between '" + HBeginDate + "' and '" + HEndDate + "' ";

                if (HICMOBillNo != "") {
                    sWhere = " and ç”Ÿäº§è®¢å•å·='" + HICMOBillNo + "' "
                }

                if (HMaterNumber != "") {
                    sWhere += " and ç‰©æ–™ä»£ç ='" + HMaterNumber + "' ";
                }

                if (HBillNo != "") {
                    sWhere += " and ç”Ÿäº§è®¢å•å·='" + HBillNo + "' ";
                }

                if (HProductName != "") {
                    sWhere += " and ç‰©æ–™åç§°='" + HProductName + "' ";
                }

                if (HProductModel != "") {
                    sWhere += " and è§„格型号='" + HProductModel + "' ";
                }

                //任意字段条件过滤 æ¡ä»¶æå–
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                //拼接任一字段过滤查询条件
                var com = "";
                if (ColName != 0 && Comparator != 0) {
                    switch (Comparator) {
                        case "7":
                            com = "like '%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like '%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like '" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like '%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + " '" + ColContent + "'";
                            break;
                    }
                    com = " and (" + ColName + " " + com + ")";
                }
                sWhere += com;

                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
            }

            //重置过滤条件
            function set_ClearQuery() {
                //初始化时间
                //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                //$("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));
                $("#HMaterNumber").val("");
                $("#HBillNo").val("");
                $("#HProductName").val("");
                $("#HProductModel").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                ColFilter();
                sWhere = "";
            }


            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length; 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);//关闭弹窗
                    }
                })
            }

            //显示列数据
            function DisPlay_HideColumn() {
                ColFilter();
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var titleData = [];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置内容字体大小
                                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[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //显示列
                                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 });
                    }
                })
            }

            //获取参数
            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>
</body>
</html>

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

New file
@@ -0,0 +1,509 @@
<!DOCTYPE html>
<html>
<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/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </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-form layui-inline" style="position:relative;top:10px;">
                                    <label class="layui-form-label">日期</label>
                                    <div class="layui-form-item  layui-inline">
                                        <div class="layui-inline">
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-form-item  layui-inline">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">-</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HEndDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
                                            </div>
                                        </div>
                                    </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="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <!--其他条件-->
                                        <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="HMaterNumber" id="HMaterNumber">
                                            </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="HProductName" id="HProductName">
                                            </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="HProductModel" id="HProductModel">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin:10px 0px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" 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-exit"><i class="layui-icon layui-icon-return"></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>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "sc_ICOMRKReport";

            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½

            //#region åˆå§‹åŒ–界面
          
            set_ClearBill();

            //#endregion

            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //退出
                    case 'btn-exit': Pub_Close(2);
                        break;
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                };
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //行监听事件-单击
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });
            //#endregion

            //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

            //初始化界面
            function set_ClearBill() {
                //初始化时间
                laydate.render({
                    elem: '#HBeginDate',
                    type: 'datetime',
                    fullPanel: true
                    , format: 'yyyy-MM-dd HH:mm'
                    , value: Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
                });
                laydate.render({
                    elem: '#HEndDate',
                    type: 'datetime',
                    fullPanel: true
                    , format: 'yyyy-MM-dd HH:mm'
                    , value: Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
                });

                //加载数据到网格
                get_FastQuery();
                DisPlay_HideColumn();
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }


            //加载网格
            function get_Display(sWhere) {
                //动态列-缓存列表
                $.ajax({
                    url: GetWEBURL() + "/MaterOutEntryReport/sc_ICOMRKReport",
                    type: "GET",
                    async: false,
                    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 });
                            }

                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'  });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '实际数量(ç±³)' || data[i].name == '扣点数(克)' || data[i].name == '重量(千克)' ) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
                                }
                            }
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cellMinWidth: 120
                                , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                                , height: 'full-70'
                                , totalRow: true //开启合计
                                , cols: [col]
                                , data: data1.data
                            };
                            table.render(option);
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                })
            }

            //快速过滤
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                var HEndDate = $("#HEndDate").val();//结束日期
                var HMaterNumber = $("#HMaterNumber").val();//物料代码
                var HBillNo = $("#HBillNo").val();          //单据号
                var HProductName = $("#HProductName").val();//产品名称
                var HProductModel = $("#HProductModel").val();//产品规格

                if (HBeginDate != "" && HEndDate != "") {
                    sWhere += " and æ—¥æœŸ between '" + HBeginDate + "' and '" + HEndDate + "' ";
                } else {
                    sWhere += " and æ—¥æœŸ between '" + Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm") + "' and '" + Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm") + "' ";
                }
             
                if (HMaterNumber != "") {
                    sWhere += " and ç‰©æ–™ä»£ç ='" + HMaterNumber + "' ";
                }

                if (HBillNo != "") {
                    sWhere += " and ç”Ÿäº§è®¢å•å·='" + HBillNo + "' ";
                }

                if (HProductName != "") {
                    sWhere += " and ç‰©æ–™åç§°='" + HProductName + "' ";
                }

                if (HProductModel != "") {
                    sWhere += " and è§„格型号='" + HProductModel + "' ";
                }

                //任意字段条件过滤 æ¡ä»¶æå–
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                //拼接任一字段过滤查询条件
                var com = "";
                if (ColName != 0 && Comparator != 0) {
                    switch (Comparator) {
                        case "7":
                            com = "like '%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like '%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like '" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like '%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + " '" + ColContent + "'";
                            break;
                    }
                    com = " and (" + ColName + " " + com + ")";
                }
                sWhere += com;

                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
            }

            //重置过滤条件
            function set_ClearQuery() {
                //初始化时间
                laydate.render({
                    elem: '#HBeginDate',
                    type: 'datetime',
                    fullPanel: true
                    , format: 'yyyy-MM-dd HH:mm'
                    , value: Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
                });
                laydate.render({
                    elem: '#HEndDate',
                    type: 'datetime',
                    fullPanel: true
                    , format: 'yyyy-MM-dd HH:mm'
                    , value: Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
                });
                $("#HMaterNumber").val("");
                $("#HBillNo").val("");
                $("#HProductName").val("");
                $("#HProductModel").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                ColFilter();
                sWhere = "";
            }


            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length; 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);//关闭弹窗
                    }
                })
            }

            //显示列数据
            function DisPlay_HideColumn() {
                ColFilter();
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var titleData = [];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置内容字体大小
                                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[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //显示列
                                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
        });
    </script>
</body>
</html>

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

New file
@@ -0,0 +1,509 @@
<!DOCTYPE html>
<html>
<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/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </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-form layui-inline" style="position:relative;top:10px;">
                                    <label class="layui-form-label">日期</label>
                                    <div class="layui-form-item  layui-inline">
                                        <div class="layui-inline">
                                            <div class="layui-input-inline">
                                                <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-form-item  layui-inline">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">-</label>
                                            <div class="layui-input-inline">
                                                <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <!--其他条件-->
                                        <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="HMaterNumber" id="HMaterNumber">
                                            </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="HBillNo" id="HBillNo">
                                            </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="HProductName" id="HProductName">
                                            </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="HProductModel" id="HProductModel">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin:10px 0px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" 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-exit"><i class="layui-icon layui-icon-return"></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>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "sc_ICOMReport";

            var detailBar = 0;       //用于汇总报表查看明细报表，当为0时显示明细汇总报表对应明细报表。
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½

            //#region åˆå§‹åŒ–界面
            set_ClearBill();

            //#endregion

            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //退出
                    case 'btn-exit': Pub_Close(2);
                        break;
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                };
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //双击表格事件
            table.on('rowDouble(mainTable)', function (obj) {
                btnrowDouble(obj.data);
            })

            //行监听事件-单击
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });
            //#endregion

            //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

            //初始化界面
            function set_ClearBill() {
                //初始化时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));

                //加载数据到网格
                get_FastQuery();
                DisPlay_HideColumn();
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }


            //加载网格
            function get_Display(sWhere) {
                //动态列-缓存列表
                $.ajax({
                    url: GetWEBURL() + "/MaterOutEntryReport/sc_ICOMReportList",
                    type: "GET",
                    async: false,
                    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 });
                            }

                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'  });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '成品合计件数' || data[i].name == '入库合计米数') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
                                }
                            }
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cellMinWidth: 120
                                , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                                , height: 'full-70'
                                , totalRow: true //开启合计
                                , cols: [col]
                                , data: data1.data
                            };
                            table.render(option);
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                })
            }

            //快速过滤
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                var HEndDate = $("#HEndDate").val();//结束日期
                var HMaterNumber = $("#HMaterNumber").val();//物料代码
                var HBillNo = $("#HBillNo").val();          //单据号
                var HProductName = $("#HProductName").val();//产品名称
                var HProductModel = $("#HProductModel").val();//产品规格

                sWhere = " and æ—¥æœŸ between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";

                if (HMaterNumber != "") {
                    sWhere += " and ç‰©æ–™ä»£ç =''" + HMaterNumber + "'' ";
                }

                if (HBillNo != "") {
                    sWhere += " and ç”Ÿäº§è®¢å•å·=''" + HBillNo + "'' ";
                }

                if (HProductName != "") {
                    sWhere += " and ç‰©æ–™åç§°=''" + HProductName + "'' ";
                }

                if (HProductModel != "") {
                    sWhere += " and è§„格型号=''" + HProductModel + "'' ";
                }

                //任意字段条件过滤 æ¡ä»¶æå–
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                //拼接任一字段过滤查询条件
                var com = "";
                if (ColName != 0 && Comparator != 0) {
                    switch (Comparator) {
                        case "7":
                            com = "like ''%" + ColContent + "%''";
                            break;
                        case "8":
                            com = "like ''%" + ColContent + "''";
                            break;
                        case "9":
                            com = "like ''" + ColContent + "%''";
                            break;
                        case "10":
                            com = "not like ''%" + ColContent + "%''";
                            break;
                        default:
                            com = "" + Comparator + " ''" + ColContent + "''";
                            break;
                    }
                    com = " and (" + ColName + " " + com + ")";
                }
                sWhere += com;

                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
            }

            //重置过滤条件
            function set_ClearQuery() {
                //初始化时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));
                $("#HMaterNumber").val("");
                $("#HBillNo").val("");
                $("#HProductName").val("");
                $("#HProductModel").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                ColFilter();
                sWhere = "";
            }


            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length; 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);//关闭弹窗
                    }
                })
            }

            //显示列数据
            function DisPlay_HideColumn() {
                ColFilter();
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var titleData = [];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置内容字体大小
                                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[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //显示列
                                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 });
                    }
                })
            }


            //双击跳转客户订单明细报表
            function btnrowDouble(obj) {

                HICMOBillNo = obj["生产订单号"];

                if (HICMOBillNo == "" || HICMOBillNo == null) {
                    return layer.alert("无工艺明细,无法查看!", { icon: 5 });
                }

                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , maxmin: true //设置最大最小按钮是否显示
                    , area: ['90%', '90%']//大小
                    , title: '客户订单明细报表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../车间管理/报表分析/Sc_ICOMProBarCodeReport.html?OperationType=1&HICMOBillNo=' + HICMOBillNo , 'yes']
                })
            }

          

            //#endregion
        });
    </script>
</body>
</html>

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

@@ -1409,8 +1409,8 @@
                            }
                            layer.load(3);
                            element.tabChange('tab-MateOutBill', '2');
                            //扫源单成功后，光标显示到仓库上
                            $("#HBarCode").focus();
                            //扫源单成功后，光标显示到仓位上
                            $("#HStockPlaceName").focus();
                            //显示表体明细
                            DisBillEntryList();
                        }
@@ -1873,7 +1873,7 @@
                            table.render(listOption);
                            FIFOlistOption.data = result.data.FIFOlist;
                            table.render(FIFOlistOption);

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