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

wtt

2024-10-28 07cf94734c36d4eae6ddbc4dd338bf5af81a2193

 WebTM/views/Éú²ú¹ÜÀí/¼ðÁÏÅäË͵¥/JIT_ComplementGoodsList.html

@@ -11,13 +11,10 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <style>
        .layui-row .layui-btn layui-btn-normal {
            margin: 0px 10px;
        }

        .layui-inline {
            margin: 0px 80px;
        }
    </style>
</head>
@@ -33,116 +30,199 @@
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">下查</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ylan" id="Ylan">预览</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Dyin" id="Dyin">打印</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cx" id="Cx">查询</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Jlps" id="Jlps">拣料配送</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">删除</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">隐藏列设置</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <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="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" 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: 85px;">物料名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
                                            </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="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <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="text" class="layui-input" name="HGD" lay-verify="HGD" id="HGD" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGD" id="btnHGD" 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: 85px;padding: 9px 18px;">仓库</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HWHName" lay-verify="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHName" id="btnHWHName" 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: 85px;">当前组织</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="Organization" id="Organization" lay-verify="Organization">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">拣料日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;text-align:center;">—</label>
                                            <div class="layui-input-block" style="margin-left: 118px;">
                                                <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
                                            </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="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptName" id="btnHDeptName" 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-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">拣料状态</label>
                                            <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
                                                <select name="HJLStatus" lay-verify="HJLStatus" id="HJLStatus">
                                                    <option value="全部">全部</option>
                                                    <option value="已拣料">已拣料</option>
                                                    <option value="未拣料">未拣料</option>
                                                </select>
                                            </div>
                                        </div>
                                        <!--<div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 90px;">
                                                <input type="checkbox" name="ps" id="ps" lay-skin="primary" lay-filter="ps" title="仅显示未完全配送">
                                            </div>
                                        </div>-->
                                    </div>
                                    <div class="layui-row" style="text-align: center; margin-bottom: 20px;">
                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">查询</button>
                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jlps" id="Jlps">拣料配送</button>
                                    </div>
                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                    <div class="layui-collapse">
                        <div class="layui-colla-item">
                            <div class="layui-colla-title layui-inline">
                                <div class="layui-inline">
                                    <span>更多</span>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label">拣料状态</label>
                                <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
                                    <select name="HJLStatus" lay-verify="HJLStatus" id="HJLStatus">
                                        <option value="全部">全部</option>
                                        <option value="已拣料">已拣料</option>
                                        <option value="未拣料" selected="selected">未拣料</option>
                                    </select>
                                </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;">
                                    </select>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">拣料日期</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">—</label>
                                <div class="layui-input-block" style="margin-left: 118px;">
                                    <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                </div>
                            </div>
                            <div class="layui-colla-content" style="padding: 0px; margin-left: 5%;">
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料代码</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" 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: 85px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
                                            <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
                                        </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="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;">
                                    <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="text" class="layui-input" name="HGD" lay-verify="HGD" id="HGD" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGD" id="btnHGD" 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: 85px;">仓库</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="text" class="layui-input" name="HWHName" lay-verify="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHName" id="btnHWHName" style="padding: 0 10px;">
                                                <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: 85px;">部门</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptName" id="btnHDeptName" style="padding: 0 10px;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 80px;">当前组织</label>
                                        <div class="layui-input-block" style="margin-left: 110px; width: 185px;">
                                            <select name="Organization" id="Organization" lay-verify="Organization">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <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" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <table class="" id="mainTable" lay-filter="mainTable"></table>
                        </div>
                    </div>

                </form>
            </div>
        </div>
@@ -155,17 +235,19 @@
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
    }).use(['index', 'form', 'laydate', 'table', 'element','soulTable'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , soulTable = layui.soulTable
            , element = layui.element;
        //查询条件
        var sWhere = "";
        var option = [];
        var HModName = "JIT_ComplementGoods";
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -207,13 +289,51 @@
            btnJlps();
        })

        //删除
        form.on('submit(set_DeleteBill)', function () {
            set_DeleteBill();
        })

        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridCellCheck(obj); //行内快捷键筛选
        })

        //#endregion
        //上查
        form.on('submit(Sc)', function () {
            set_Sc(); 
        })

        //下查
        form.on('submit(Xc)', function () {
            set_Xc();
        })

        //隐藏列设置
        form.on('submit(HideColumn)', function () {
            get_HideColumn();
        })


        //#endregion
        //日期间隔下拉列表监听
        form.on('select(HInitTimeCycle)', function (data) {
            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
            //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
            if (HInitTimeCycle != -1) {
                $('#HBeginDate').prop('disabled', true);
                $('#HEndDate').prop('disabled', true);

                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                //执行查询方法
                get_FastQuery();
            } else {
                $('#HBeginDate').prop('disabled', false);
                $('#HEndDate').prop('disabled', false);
            }
        });
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

        //初始化界面
@@ -222,9 +342,23 @@
            set_InitGrid();
            get_Display(sWhere);
            Organ();
            //时间初始化
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));

            //初始化日期间隔、开始日期、结束日期
            setSelect_HInitTimeCycle();
            //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
            if (HInitTimeCycle != -1) {
                $('#HBeginDate').prop('disabled', true);
                $('#HEndDate').prop('disabled', true);
            } else {
                $('#HBeginDate').prop('disabled', false);
                $('#HEndDate').prop('disabled', false);
            }

            //根据日期间隔设置开始时间与结束时间
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            DisPlay_HideColumn();
        }
        //获取组织
        function Organ() {
@@ -240,6 +374,7 @@
                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                        }
                        $("#Organization").append(Organization);
                        $("#Organization").val(sessionStorage["OrganizationID"]);
                        form.render('select');
                    }
                    layer.closeAll("loading");
@@ -251,29 +386,34 @@
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 350
                , height: 'full-120'
                , page: true
                , totalRow: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , done: function (res, curr, count) {
                    soulTable.render(this);
                }
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: '拣料单日期', title: '拣料单日期', width: 150, templet: "<div>{{d.拣料单日期 ==null ?'':layui.util.toDateString(d.拣料单日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '拣料配送单号', title: '生产订单号', width: 170 }
                    , { field: '配送人', title: '配送人', width: 170 }
                    , { field: '制单人', title: '制单人', width: 260, }
                    , { field: '制单日期', title: '制单日期', width: 160, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '物料代码', title: '物料代码', width: 160 }
                    , { field: '物料名称', title: '物料名称', width: 160 }
                    , { field: '规格型号', title: '规格型号', width: 160 }
                    , { field: '拣料数量', title: '拣料数量', width: 160 }
                    , { field: '已调拨数量', title: '已调拨数量', width: 160 }
                    , { field: '计量单位', title: '计量单位', width: 160 }
                    , { field: '车间', title: '车间', width: 160 }
                    , { field: '工段', title: '工段', width: 160 }
                    , { field: '备注', title: '备注', width: 160 }
                    , { field: '调出仓库', title: '调出仓库', width: 160 }
                    , { field: '调出仓位', title: '调出仓位', width: 160 }
                    , { field: '拣料单日期', title: '拣料单日期', width: 150, templet: "<div>{{d.拣料单日期 ==null ?'':layui.util.toDateString(d.拣料单日期, 'yyyy-MM-dd')}}</div>" ,sort:true}
                    , { field: '拣料配送单号', title: '生产订单号', width: 170 ,sort:true}
                    , { field: '配送人', title: '配送人', width: 170, sort: true}
                    , { field: '制单人', title: '制单人', width: 260,  sort: true}
                , { field: '制单日期', title: '制单日期', width: 160, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>", sort: true}
                , { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true, sort: true}
                , { field: '物料代码', title: '物料代码', width: 160, sort: true}
                , { field: '物料名称', title: '物料名称', width: 160, sort: true}
                    , { field: '规格型号', title: '规格型号', width: 160, sort: true}
                    , { field: '拣料数量', title: '拣料数量', totalRow: true,width: 160, sort: true}
                    , { field: '已调拨数量', title: '已调拨数量', totalRow: true, width: 160, sort: true}
                    , { field: '计量单位', title: '计量单位', width: 160, sort: true}
                    , { field: '车间', title: '车间', width: 160, sort: true}
                    , { field: '工段', title: '工段', width: 160, sort: true}
                    , { field: '备注', title: '备注', width: 160, sort: true}
                    , { field: '调出仓库', title: '调出仓库', width: 160, sort: true}
                    , { field: '调出仓位', title: '调出仓位', width: 160, sort: true}
                ]]
            };
        }
@@ -291,7 +431,7 @@
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });

                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -302,7 +442,7 @@
                }
            });
        }
      

        //物料
        function btnMaterial() {
            layer.open({
@@ -412,16 +552,57 @@
                return layer.msg("请选择一条数据");
            }
            else {
                var HBillNo = CheckStatus.data[0].拣料配送单号;
                var hmainid = CheckStatus.data[0].hmainid;

                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , area: ['100%', '100%']//大小
                    , area: ['90%', '90%']//大小
                    , title: '配送单列表'//标题
                    , shift: 2//弹出动画
                    , maxmin: true
                    , content: "../../生产管理/拣料配送单/JIT_ComplementGoodsBill.html?HBillNo=" + HBillNo
                    , content: "../../生产管理/拣料配送单/JIT_ComplementGoodsBill.html?hmainid=" + hmainid
                    ,end: function () {
                        get_FastQuery();
                    }
                })
            }
        }

        //删除
        function set_DeleteBill() {
            var CheckStatus = table.checkStatus("mainTable");

            if (CheckStatus.data.length != 1) {
                return layer.msg("请选择一条数据!")
            } else {
                layer.confirm('您确定要删除吗？', {
                    btn: ['确定', '取消'] //按钮
                    , btn1: function (index) {
                        var HInterID = CheckStatus.data[0].hmainid; //获取编号
                        var HEntryID = CheckStatus.data[0].Hsubid; //获取第几条子数据
                        $.ajax({
                            url: GetWEBURL() + '/Sc_ComplementGoods/DelComplementGoodsList'
                            , type: "GET"
                            , data: { "HInterID": HInterID, "HEntryID": HEntryID, "HOrgID": sessionStorage["OrganizationID"], "User": sessionStorage["HUserName"] }
                            , success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        ////重载tree
                                        //tree.reload('treeDepartment', {});
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
                            }
                        })
                    }
                })
            }
        }
@@ -439,6 +620,79 @@
            var HDeptName = $("#HDeptName").val(); //部门
            var HJLStatus = $("#HJLStatus").val(); //拣料状态
            var user = sessionStorage["HUserName"]; //制单人
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like'%" + ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + ColContent + "%'";
                        break;
                    default:
                        com = "" + Comparator + "'" + ColContent + "'";
                        break;
                }
                sWhere += " and " + ColName + " " + com;
            }
            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like'%" + ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator) {
                    case "7":
                        com2 = "like'%" + ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }
            sWhere = {
                MaterialNumber: MaterialNumber,
                MaterialName: MaterialName,
@@ -450,7 +704,7 @@
                HEndDate: HEndDate,
                HDeptName: HDeptName,
                HJLStatus: HJLStatus,
                user: user
                user: user,
            };
            get_Display(JSON.stringify(sWhere));
            sWhere = "";
@@ -493,7 +747,210 @@
                }
            })
        }
     

        //上查
        function set_Sc() {
            var CheckStatus = table.checkStatus("mainTable");

            if (CheckStatus.data.length != 1) {
                return layer.msg("请选择一条数据!")
            } else {

                var HInterID = CheckStatus.data[0].hmainid; //获取编号
                var HMaterID = CheckStatus.data[0].HMaterID;

                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '叫料单清单'
                    , shift: 0//弹出动画
                    , content: '../生产叫料平台/JIT_HlpBillList.html?HSourceInterID=' + HInterID + '&HMaterID=' + HMaterID + '&Type=2'
                })
            }
        }

        //下查
        function set_Xc() {
            var CheckStatus = table.checkStatus("mainTable");

            if (CheckStatus.data.length != 1) {
                return layer.msg("请选择一条数据!")
            } else {

                var HInterID = CheckStatus.data[0].hmainid; //获取编号
                var HMaterID = CheckStatus.data[0].HMaterID;

                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '配送单清单'
                    , shift: 0//弹出动画
                    , content: '../生产叫料平台/JIT_HlpBillList.html?HSourceInterID=' + HInterID + '&HMaterID=' + HMaterID + '&Type=3'
                })
            }
        }

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

        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.cols[0][i]["title"] + ",";
            }

            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }

        //显示列数据
        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 = ["HMaterID"];//不需要显示的字段 å¯æ‰©å±•

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

                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["field"], 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 });
                }
            })
        }


        //#region ä»»æ„å­—段过滤：列名显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
            for (var i = 1; i < option.cols[0].length; i++) {
                if (option.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                }
            }
            $("#ColName").empty();
            $("#ColName").append(Organization);
            $("#ColName1").empty();
            $("#ColName1").append(Organization);
            $("#ColName2").empty();
            $("#ColName2").append(Organization);

            form.render('select');
        }
        //#endregion

        //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
        function setSelect_HInitTimeCycle() {
            var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist数组包含与时间相关的整数值
            var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"];  //itilelist与valuelist值相对于的表，且作为下拉框文本显示

            var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';//定义字符串HInitTimeCycle_ArrayList ä½œç”¨äºŽä¸‹æ‹‰åˆ—çš„html内容 åŒ…含option元素，值为—1，且在下拉框显示任意间隔
            for (var i = 0; i < valueList.length; i++) {                                   // éåŽ†valueList  æ•°ç»„  ä½¿æ¯ä¸€ä¸ªå€¼ç”Ÿæˆä¸€ä¸ªå¯¹åº”option元素
                HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// æŠŠç”Ÿæˆçš„option元素添加入HInitTimeCycle_ArrayList字符串中
            }

            $("#HInitTimeCycle").empty();           //使用jquery的empty方法清空HInitTimeCycle_ArrayList <select>元素的值
            $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //使用append方法构建之前HInitTimeCycle_ArrayList字符串 çš„内容传入HInitTimeCycle  
            form.render('select');       //调用 é‡æ–°æ¸²æŸ“select元素

            $("#HInitTimeCycle").val("29");   //使用jQuery的val()方法将下拉列表的选中值设置为"29   ï¼Œä¸”显示《近三時天》
        }
            //#endregion
        //#endregion

    });