wtt
2025-01-18 4ce9b807db8bf547005f1c07733495498fa40e0b
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
17个文件已修改
1个文件已添加
1454 ■■■■■ 已修改文件
WebTM/WebTM.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_AreaSet.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillList.html 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模具投产验收单/Sc_MouldBatchWorkCheckBillList.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckBillList.html 179 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html 182 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html 171 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_MouldRepairCheckBillList.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产报表/SC_BOMReport.html 554 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMainList.html 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html 47 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList_His.html 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/检验取样还样单/QC_TakeSampleCheckBillMainList.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -89,6 +89,7 @@
    <Content Include="layuiadmin\ax\ax-response.css" />
    <Content Include="layuiadmin\ax\ax.css" />
    <Content Include="layuiadmin\ax\ax.min.js" />
    <Content Include="layuiadmin\ax\images\iccard-bg.jpg" />
    <Content Include="layuiadmin\ax\images\login-bg.jpg" />
    <Content Include="layuiadmin\ax\images\login-left.jpg" />
    <Content Include="layuiadmin\ax\images\yanzhengma.jpg" />
@@ -556,6 +557,7 @@
    <Content Include="views\生产管理\提料计划\JIT_PickUpCalculate.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillOrProcessExchangeResumeList.html" />
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList_PDA.html" />
    <Content Include="views\生产管理\生产报表\SC_BOMReport.html" />
    <Content Include="views\生产管理\生产报表\Sc_ProductionInProgressReport.html" />
    <Content Include="views\生产管理\生产报表\Sc_NutInspectionCCDPassRate.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillMonth.html" />
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_AreaSet.html
@@ -673,12 +673,12 @@
            //以上是layui模块
        });
    </script>
    <script src="https://cdn.staticfile.net/translate.js/3.12.0/translate.js"></script>
    <!--<script src="https://cdn.staticfile.net/translate.js/3.12.0/translate.js"></script>
    <script>
        translate.language.setLocal('English'); //设置本地语种(当前网页的语种)。如果不设置,默认自动识别当前网页显示文字的语种。 å¯å¡«å†™å¦‚ 'english'、'chinese_simplified' ç­‰ï¼Œå…·ä½“参见文档下方关于此的说明。
        translate.service.use('client.edge'); //设置机器翻译服务通道,直接客户端本身,不依赖服务端 ã€‚相关说明参考 http://translate.zvo.cn/43086.html
        translate.execute();//进行翻译
    </script>
    </script>-->
</body>
</html>
WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldLowerBillList.html
@@ -29,13 +29,13 @@
                                    </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-inline">
                                        <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                    </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-inline">
                                        <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                    </div>
WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldUpperBillList.html
@@ -29,13 +29,13 @@
                                    </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-inline">
                                        <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                    </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-inline">
                                        <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                    </div>
WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ßάÐÞÅɹ¤µ¥/Sc_MouldRepairSendWorkBillList.html
@@ -57,50 +57,7 @@
                                    <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">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">部门</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;">
                                        </div>
                                    </div>
                                    <!--<hr />-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="MaterialName" id="MaterialName" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">规格型号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">源单单号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">仓库</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="Warehouse" id="Warehouse" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">制单人</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="Hmaker" id="Hmaker" style="width:190px;">
                                        </div>
                                    </div>
                                <div class="layui-colla-content">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
@@ -575,13 +532,7 @@
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HDeptID = $("#HDeptID").val();//部门
                var MaterialCode = $("#MaterialCode").val();//物料代码
                var MaterialName = $("#MaterialName").val();//物料名称
                var SpecificationModel = $("#SpecificationModel").val();//规格型号
                var HSourceBillNo = $("#HSourceBillNo").val();//源单单号
                var Warehouse = $("#Warehouse").val();//仓库
                var Hmaker = $("#Hmaker").val();//制单人
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
@@ -665,49 +616,7 @@
                }
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                if (HDeptID) {
                    sWhere += " and ç»´ä¿®éƒ¨é—¨ like '%" + HDeptID + "%'";
                }
                if (MaterialCode) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + MaterialCode + "%'";
                }
                if (MaterialName) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + MaterialName + "%'";
                }
                if (SpecificationModel) {
                    sWhere += " and è§„格型号 like '%" + SpecificationModel + "%'";
                }
                if (HSourceBillNo) {
                    sWhere += " and æºå•单号 like '%" + HSourceBillNo + "%'";
                }
                if (Warehouse) {
                    sWhere += " and å‘货仓库 like '%" + Warehouse + "%'";
                }
                if (Hmaker) {
                    sWhere += " and åˆ¶å•人 like '%" + Hmaker + "%'";
                }
                //var index = layer.load(0);
                //$.ajax({
                //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                //    url: GetWEBURL() + '/Sc_MouldRepairSendWorkBill/GetMouldRepairSendWorkBillList',
                //    type: "GET",
                //    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                //    success: function (data1) {
                //        if (data1.count == 1) {
                //            option.data = data1.data;
                //            table.render(option);
                //            layer.close(index);
                //            layer.alert("查询成功", { icon: 1 });
                //        } else {
                //            layer.close(index);
                //            layer.alert(data1.code + data1.Message, { icon: 5 });
                //        }
                //    }, error: function () {
                //        layer.close(index);
                //        layer.alert("接口失效!", { icon: 5 });
                //    }
                //});
                }
                //get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -739,14 +648,7 @@
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//单据号
                $("#HDeptID").val("");//部门
                $("#MaterialCode").val("");//物料代码
                $("#MaterialName").val("");//物料名称
                $("#SpecificationModel").val("");//规格型号
                $("#HSourceBillNo").val("");//源单单号
                $("#Warehouse").val("");//仓库
                $("#Hmaker").val("");//制单人
                $("#HBillNo").val("");//单据号
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
@@ -764,7 +666,7 @@
            // åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
                get_DisplayPage(sWhere);
            }
            //删除
WebTM/views/Ä£Öξ߹ÜÀí/Ä£¾ßͶ²úÑéÊÕµ¥/Sc_MouldBatchWorkCheckBillList.html
@@ -38,12 +38,6 @@
                                    </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 ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
@@ -55,6 +49,12 @@
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 45px;">单据号</label>
                                    <div class="layui-input-block" style="margin-left: 80px;">
                                        <input type="text" class="layui-input ForFilteringSchemes" 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>
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sb_MouldRepairWorkBillList.html
@@ -64,14 +64,7 @@
                                    <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">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <div class="layui-inline">
                                                <span>其他条件></span>
                                            </div>
                                        </div>
                                    </div>
                                <div class="layui-colla-content">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">器具编码</label>
@@ -92,7 +85,7 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
@@ -200,10 +193,10 @@
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-reload" id="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                    <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-details" id="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-generate" id="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-generate" id="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-exit" id="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldDotCheckBillList.html
@@ -38,123 +38,115 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">产品器具</label>
                                    <label class="layui-form-label">开始时间</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="PartModul" id="PartModul">
                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">点检项目</label>
                                    <label class="layui-form-label">结束时间</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="CheckItem" id="CheckItem">
                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                    </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>
                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>-->
                                <div class="layui-colla-content">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <div class="layui-inline">
                                                <span>其他条件></span>
                                            <label class="layui-form-label">产品器具</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="PartModul" id="PartModul">
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">开始时间</label>
                                                <div class="layui-input-block">
                                                    <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">结束时间</label>
                                                <div class="layui-input-block">
                                                    <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                                </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">点检项目</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="CheckItem" id="CheckItem">
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <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>
                                    </div>
                                    <div class="layui-ro" style="margin-top:5px">
                                        <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 class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                            </div>
                                        </div>
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">过滤</label>
                                                <div class="layui-input-block">
                                                    <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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>
                                        <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 class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                            </div>
                                        </div>
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">过滤</label>
                                                <div class="layui-input-block">
                                                    <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
@@ -906,12 +898,13 @@
                            var dataCol = [];//数据库查询出的列数据
                            /*var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码","源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainBillList.html
@@ -32,13 +32,15 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据类型</label>
                                    <label class="layui-form-label">开始时间</label>
                                    <div class="layui-input-block">
                                        <select name="HBillType" id="HBillType">
                                            <option value="">所有</option>
                                            <option value="ZHXJ">下架找货单</option>
                                            <option value="ZHSJ">上架归还单</option>
                                        </select>
                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束时间</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -60,104 +62,83 @@
                                <div class="layui-colla-content">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <div class="layui-inline">
                                                <span>其他条件></span>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">开始时间</label>
                                                <div class="layui-input-block">
                                                    <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">结束时间</label>
                                                <div class="layui-input-block">
                                                    <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <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>
                                            <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 class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                            </div>
                                        </div>
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">过滤</label>
                                                <div class="layui-input-block">
                                                    <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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>
                                        <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 class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                            </div>
                                        </div>
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">过滤</label>
                                                <div class="layui-input-block">
                                                    <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
@@ -200,7 +181,9 @@
                                <script type="text/html" id="xuhao1">
                                    {{d.LAY_TABLE_INDEX+1}}
                                </script>
</form>
                            </div>
                        </div>
                    </form>
                </div>
            </div>
        </div>
@@ -764,10 +747,7 @@
                }
                if (HBillNo) {
                    sWhere += " and HBillNo like '%" + HBillNo + "%'";
                }
                if (HCreateBy) {
                    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
                }
                }
                if (BenginHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + BenginHCreateDate + "'";
                }
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainPlanBillList.html
@@ -30,17 +30,7 @@
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">单据类型</label>
                                    <div class="layui-input-block">
                                        <select name="HBillType" id="HBillType">
                                            <option value="">所有</option>
                                            <option value="ZHXJ">下架找货单</option>
                                            <option value="ZHSJ">上架归还单</option>
                                        </select>
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -64,92 +54,87 @@
                                </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">
                                    <div class="layui-inline">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <div class="layui-row" style="margin-top:5px">
                                                <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 class="layui-row" style="margin-top:5px">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">过滤</label>
                                                    <div class="layui-input-block">
                                                        <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                        </select>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
                                                </div>
                                            </div>
                                            <div class="layui-row" style="margin-top:5px">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">过滤</label>
                                                    <div class="layui-input-block">
                                                        <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                        </select>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
                                                </div>
                                            <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 class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldRepairCheckBillList.html
@@ -31,17 +31,7 @@
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                <label class="layui-form-label">单据类型</label>
                <div class="layui-input-block">
                    <select name="HBillType" id="HBillType">
                        <option value="">所有</option>
                        <option value="ZHXJ">下架找货单</option>
                        <option value="ZHSJ">上架归还单</option>
                    </select>
                </div>
            </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
@@ -164,10 +154,10 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-reload" id="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-details" id="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-generate" id="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-generate" id="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-exit" id="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                            </div>
WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/SC_BOMReport.html
New file
@@ -0,0 +1,554 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>BOM层级展开报表</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">
    <link href="../../../layuiadmin/resize/ResizeLeftRight.css" rel="stylesheet" />
    <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/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/modules/treeTable.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-tab layui-tab-card" style="margin-top:20px;">
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <div class="layui-collapse">
                                        <div class="layui-colla-item">
                                            <div class="layui-colla-title layui-inline">
                                                <div class="layui-inline">
                                                    <span>更多</span>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">物料代码</label>
                                                <div class="layui-input-block">
                                                    <input type="hidden" class="layui-input ForFilteringSchemes" name="HMaterID" id="HMaterID" value="" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
                                                    <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">物料名称</label>
                                                <div class="layui-input-block">
                                                    <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMater" id="btnHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
                                            </div>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
                                                <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="box" style="padding:10px 0" id="box">
                                        <div class="left" id="left" style="margin-top:20px;">
                                            <div class="layui-tab-item layui-show">
                                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                            </div>
                                        </div>
                                        <!-- æ·»åŠ ç”¨äºŽæ‹–æ‹½çš„æ‰‹æŸ„å…ƒç´  -->
                                        <div id="resize" class="resize" title="收缩侧边栏"> </div>
                                        <div class="mid" id="right" style="margin-top:20px;">
                                            <div class="layui-tab layui-tab-card">
                                                <div class="layui-tab-content">
                                                    <div class="layui-tab-item layui-show">
                                                        <!--工艺路线-->
                                                        <table class="layui-hide" id="mainTable_Routing" lay-filter="mainTable_Routing"></table>
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/resize/ResizeLeftRight.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
            //treeTable: 'treeTable'
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','treeTable'], 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
                , treeTable = layui.treeTable
            var sWhere = "";
            var option = "";  //主表格
            var option_Routing = "";  //工艺路线
            var ins;
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //
            var HModName = "SC_BOMReport";
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆäººï¼‰
            var titleData = ["ParentID", "主id", "主物料id", "子id", "子物料id"];
            //初始化界面
            set_ClearBill();
            //#endregion
            //#region å¤´å·¥å…·æ äº‹ä»¶
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();//查询
            });
            //#endregion
            //#region å¤´å·¥å…·æ äº‹ä»¶
            treeTable.on("toolbar(mainTable)", function (obj) {
            });
            //#endregion
            //#endregion
            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            function set_ClearBill() {
                //初始化左列表
                set_InitGrid();
                //初始化人列表
                set_InitGrid_Routing();
                //查询
                get_FastQuery();
            }
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery( ) {
                var HMaterID = $("#HMaterID").val();  //物料编码
                get_Display(HMaterID);
            }
            //#endregion
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HMaterID").val("");
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                var HMaterID = "";
                get_Display(HMaterID);
            }
            //#endregion
            //#region åˆå§‹åŒ–页面
            //初始化左侧列表
            function set_InitGrid() {
                option= {
                    elem: '#mainTable',
                    toolbar: '#toolbarDemo',
                    totalRow: true,
                    cellMinWidth: 90,
                    limit: Number.MAX_VALUE, // é»˜è®¤æ˜¾ç¤ºå…¨éƒ¨
                    defaultToolbar: [], // éšè—é»˜è®¤çš„导出、打印等按钮
                    cols: [],
                    data: []
                };
                treeTable.render(option);
            }
            //初始化工艺列表
            function set_InitGrid_Routing() {
                option_Routing = {
                    elem: '#mainTable_Routing'
                    , toolbar: '#toolbarDemo2'
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                    , data: []
                };
            }
            //#endregion
            //#region BOM查询
            function get_Display(HMaterID) {
                $.ajax({
                    url: GetWEBURL() + '/Sc_ProductReport/Get_BOMReportList',
                    type: "GET",
                    data: { "HMaterID": HMaterID, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var Listcol = [];
                            for (var i = 0; i < data1.list.length; i++) {
                                var data = [];
                                //给空的数组赋值
                                for (var key in data1.list[i].Columns) {
                                    data.push({ "id": data1.list[i].Columns[key].ColmCols, "name": data1.list[i].Columns[key].ColmCols, "Type": data1.list[i].Columns[key].ColmType });
                                }
                                var col = [];
                                col.push({ type: 'checkbox', fixed: 'left' });
                                for (var j = 0; j < data.length; j++) {
                                    if ($.inArray(data[j].name, titleData) > -1) {
                                        col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //隐藏id列
                                    }
                                    else if (data[j].name == '成品物料') {//添加超链接
                                        col.push({
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '成品物料', templet: function (d) {
                                                return '<span style="color: blue;">' + d.成品物料 + '</span>'
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
                                    else if (data[j].name == '子件物料') {//添加超链接
                                        col.push({
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 150, event: '子件物料', templet: function (d) {
                                                return '<span style="color: blue;">' + d.子件物料 + '</span>'
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
                                    else {
                                        switch (data[j].Type) {
                                            //int
                                            case 'DateTime':
                                                col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                                break;
                                            default:
                                                col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 100});
                                        }
                                    }
                                }
                                Listcol.push(col);
                            }
                            var TreeDate = LoadTree(data1.data.h_p_Sc_BOMReportList);
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [Listcol[0]]
                                , data: TreeDate
                                , height: 'full-50'
                                , cellMinWidth: 90
                                , limit: Number.MAX_VALUE//默认显示全部
                                , page: false
                            }
                            treeTable.render(option);
                            //工艺
                            option_Routing = {
                                elem: '#mainTable_Routing'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_Sc_BOMReportList1
                                , height: 'full-80'
                                , cellMinWidth: 90
                            }
                            table.render(option_Routing);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region BOM点击查询 å·¥è‰ºè·¯çº¿
            function getTable_Right(HMaterID) {
                $.ajax({
                    url: GetWEBURL() + '/Sc_ProductReport/Get_BOMReportList_Routing',
                    type: "GET",
                    data: { "HMaterID": HMaterID,"user": sessionStorage["HUserName"] },
                    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' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            //工艺路线
                            option_Routing = {
                                elem: '#mainTable_Routing'
                                , toolbar: '#toolbarDemo2'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , limit: Number.MAX_VALUE//默认显示全部
                                , page: false
                            }
                            table.render(option_Routing);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
           //#endregion
            //#endregion
            //#region ç‰©æ–™å¼¹çª—
            form.on('submit(btnHMater)', function () {
                //页面层-自定义
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "物料列表"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["90%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/公用基础资料/Gy_Material.html' ,'yes']
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                        $("#HMaterID").val(checkStatus.data[0].HItemID);//物料id
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);//物料代码
                        $("#HMaterName").val(checkStatus.data[0].物料名称);//物料名称
                        layer.closeAll();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () { }
                });
            });
            //#endregion
            //#region ç‚¹å‡»è¡Œé€‰ä¸­  +  æŸ¥è¯¢å³ä¾§è¡¨æ ¼
            treeTable.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背景颜色和字体颜色
                    var HMaterID = obj.data.子id == 0 ? obj.data.主物料id : obj.data.子id;
                    getTable_Right(HMaterID);
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                    btndate = [];
                }
            })
            //#endregion
            /**处理树形展示数据,要求有ID和ParentID、title字段**/
            function LoadTree(data) {
                let map = {};
                let treeData = [];
                data.forEach(it => {
                    map[it.id] = it;    //ID为每个节点的id
                })
                //生成结果集
                data.forEach(it => {
                    const parent = map[it.ParentID];   //ParentID为父节点的id
                    if (parent) {
                        if (!Array.isArray(parent.children)) parent.children = [];
                        parent.children.push(it);
                    } else {
                        treeData.push(it)
                    }
                })
                return treeData;
            }
            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            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 = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                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模块
        });
    </script>
</body>
</html>
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMainList.html
@@ -31,12 +31,6 @@
                                    </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 ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
@@ -55,18 +49,26 @@
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                            <!--动态渲染组织-->
                                        </select>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <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 ForFilteringSchemes" 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; width: 185px;">
                                            <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                                <!--动态渲染组织-->
                                            </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>
                                <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-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -55,21 +55,17 @@
                                        <input type="text" class="layui-input ForFilteringSchemes" name="WorkCenter" id="WorkCenter">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                    <div class="layui-input-block">
                                        <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 ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;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>
                                    </div>
                                </div>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                        <div class="layui-input-block">
                                            <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 ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;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>
                                        </div>
                                    </div>
                                    <!--其他条件-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 76px;">物料名称</label>
@@ -106,7 +102,10 @@
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">重置</button>
                                </div>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
@@ -219,16 +218,16 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>多行下推(定额申请单)</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime"><i class="layui-icon layui-icon-set"></i>批改小时产能</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SourceWorkQty" id="btn_SourceWorkQty"><i class="layui-icon layui-icon-set"></i>产线产能</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime"><i class="layui-icon layui-icon-set"></i>批改小时产能</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SourceWorkQty" id="btn_SourceWorkQty"><i class="layui-icon layui-icon-set"></i>产线产能</button>
                            </div>
                        </script>
                    </form>
@@ -493,7 +492,7 @@
                set_InitGrid();
                Organ();
                //查询
                get_FastQuery(1);
                //get_FastQuery(1);
                //获取项目号
                Get_HProject();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
@@ -1396,7 +1395,7 @@
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            });
                            //更新表格缓存的数据
@@ -1482,7 +1481,7 @@
                                        layer.close(index);
                                    }
                                    //layer.closeAll('dialog');
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -1699,7 +1698,7 @@
                if (HProject != '0') {
                    sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                }
                sWhere += " and å·¥åºä»£ç  != '9999' and HBillSubType<>'SUB'"
                //查询语句
                $.ajax({
@@ -1857,7 +1856,7 @@
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });
                            } else {
@@ -2031,7 +2030,7 @@
            //                    if (dataCol[i]) {
            //                        var dataCols = dataCol[i].split('|');
            //                    }
            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
@@ -2467,7 +2466,7 @@
            //#endregion
            //#region äº§çº¿äº§èƒ½
            function set_SourceWorkQty() {
            function set_SourceWorkQty() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
@@ -2491,12 +2490,12 @@
                        })
                    } else {
                        layer.msg('所选工序:' + HProcName + ',不为排产工序!');
                    }
                    }
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
                }
            }
            //#endregion
            //#endregion
            //#endregion
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillListQuery.html
@@ -55,14 +55,28 @@
                                        <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="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: 50%;display: inline-block;" readonly>
                                        <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>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="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: 50%;display: inline-block;" readonly>
                                            <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>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 76px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 107px;">
                                            <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;">
                                            <input type="text" class="layui-input" name="HModel" id="HModel">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
@@ -86,21 +100,6 @@
                                        <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; display: none;">重置</button>
                                </div>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <!--其他条件-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 76px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 107px;">
                                            <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;">
                                            <input type="text" class="layui-input" name="HModel" id="HModel">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
@@ -281,7 +280,7 @@
            //初始化界面
            set_ClearBill();
            //初始化表格
            DisPlay_HideColumn();
            //DisPlay_HideColumn();
            //#endregion
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList_His.html
@@ -53,30 +53,18 @@
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="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>
                                        <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>
                                </div>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;margin-bottom:20px">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="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>
                                            <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>
                                        </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; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                            <!--动态渲染组织-->
                                        </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 class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <!--其他条件-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 76px;">物料名称</label>
@@ -90,6 +78,18 @@
                                            <input type="text" class="layui-input" name="HModel" id="HModel">
                                        </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="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                                <!--动态渲染组织-->
                                            </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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑéÈ¡Ñù»¹Ñùµ¥/QC_TakeSampleCheckBillMainList.html
@@ -152,6 +152,7 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
@@ -193,6 +194,7 @@
                , soulTable = layui.soulTable
            var option = [];
            var sWhere = "";
            var ins;                //用于导出excel
            var HModName = "OA_ErrMsgBackReceiveBillMainList";
            //不需要显示的字段 å¯æ‰©å±•
@@ -232,6 +234,9 @@
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //导出按钮
                    case 'btn_Export': btn_Export();
                        break;
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
@@ -485,7 +490,7 @@
                            option.cols = [col];
                            option.data = data1.data;
                            table.render(option);
                            ins=table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
@@ -645,6 +650,14 @@
                $("#HInitTimeCycle").val("29");
            }
            //#region å¯¼å‡ºExecel
            function btn_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion
            //#region æ–°å¢ž
            function set_AddNew() {
                layer.open({
WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_FiveMenOneRingList.html
@@ -819,7 +819,7 @@
            //#region å¯¼å‡ºExecel
            function btn_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
                table.exportFile(ins.config.id, option_HB_SN.data, "xls");
            }
            //#endregion