SRM-LAYUI.git - Gitblit

parent: ba5b9f28 | 补丁 | 提交 | ignore whitespace

2022-02-25 fa81723ece156a1bf7df0652d65c61bc255c6dc0

采购订单、送货单页面查询条件及影藏列调整

4个文件已修改

	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html	85 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html	98 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html	66 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html

@@ -8,6 +8,11 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <style type="text/css">
        .layui-input-block {
            width: 200px;
        }
    </style>
</head>
<body>

@@ -45,31 +50,31 @@
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料编码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">规格型号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HModel" id="HModel">
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">关闭状态</label>
                                    <div class="layui-input-block">
                                        <select id="HClStatus" name="HClStatus" lay-filter="">
@@ -78,19 +83,19 @@
                                            <option value="已关闭">已关闭</option>
                                        </select>
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDate1" id="HDate1">
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">交货时间</label>
                                    <div class="layui-input-block">
@@ -107,7 +112,7 @@
                                        </select>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                <div class="layui-inline">
                                    <label class="layui-form-label">委外组织</label>
                                    <div class="layui-input-block">
                                        <select id="HSUBORGID" name="HSUBORGID" lay-filter="">
@@ -115,8 +120,8 @@
                                            <option value="">组织2</option>
                                        </select>
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">是否已下推送货单</label>
                                    <div class="layui-input-block">
                                        <select id="HISGenerate" name="HISGenerate" lay-filter="">
@@ -125,7 +130,7 @@
                                            <option value="否">否</option>
                                        </select>
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -548,32 +553,32 @@
                    sqlWhere += " and 状态 like ^^%" + $("#HStatus").val() + "%^^";
                if ($("#HBillNo").val() != "")
                    sqlWhere += " and 单据号 like ^^%" + $("#HBillNo").val() + "%^^";
                //if ($("#HShortNumber").val() != "")
                //    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
                if ($("#HShortNumber").val() != "")
                    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
                if ($("#HNumber").val() != "")
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                //if ($("#HName").val() != "")
                //    sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
                //if ($("#HModel").val() != "")
                //    sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
                //if ($("#HClStatus").val() != "")
                //    sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
                //if ($("#HSUBORGID").val() != "")
                //    sqlWhere += " and 委外组织 like ^^%" + $("#HSUBORGID").val() + "%^^";
                //if ($("#HDate1").val() != "") {
                //    sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";
                //}
                //if ($("#HDate2").val() != "") {
                //    sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
                //}
                //if ($("#HISGenerate").val() != "") {
                //    if ($("#HISGenerate").val() == "是") {
                //        sqlWhere += " and 未关联数量 <= 0";
                //    }
                //    else if ($("#HISGenerate").val() == "否") {
                //        sqlWhere += " and 未关联数量 > 0";
                //    }
                //}
                if ($("#HName").val() != "")
                    sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
                if ($("#HModel").val() != "")
                    sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
                if ($("#HClStatus").val() != "")
                    sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
                if ($("#HSUBORGID").val() != "")
                    sqlWhere += " and 委外组织 like ^^%" + $("#HSUBORGID").val() + "%^^";
                if ($("#HDate1").val() != "") {
                    sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";
                }
                if ($("#HDate2").val() != "") {
                    sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
                }
                if ($("#HISGenerate").val() != "") {
                    if ($("#HISGenerate").val() == "是") {
                        sqlWhere += " and 未关联数量 <= 0";
                    }
                    else if ($("#HISGenerate").val() == "否") {
                        sqlWhere += " and 未关联数量 > 0";
                    }
                }
                var Time = $("#Time").val();
                if (Time > 0) {
                    var dd = new Date();

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html

@@ -57,19 +57,19 @@
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                <div class="layui-inline">
                                    <label class="layui-form-label">产品名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>-->
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">规格型号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HModel" id="HModel">
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                <div class="layui-inline">
                                    <label class="layui-form-label">关闭状态</label>
                                    <div class="layui-input-block">
                                        <select id="HClStatus" name="HClStatus" lay-filter="">
@@ -78,7 +78,7 @@
                                            <option value="已关闭">已关闭</option>
                                        </select>
                                    </div>
                                </div>-->
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
@@ -91,7 +91,7 @@
                                        <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">交货时间</label>
                                    <div class="layui-input-block">
                                        <select id="Time" name="Time" lay-filter="">
@@ -105,7 +105,7 @@
                                            <option value="8" selected="">长期交货</option>
                                        </select>
                                    </div>
                                </div>
                                </div>-->

                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">采购组织</label>
@@ -125,7 +125,7 @@
                                        </select>
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                <div class="layui-inline">
                                    <label class="layui-form-label">是否已下推送货单</label>
                                    <div class="layui-input-block">
                                        <select id="HISGenerate" name="HISGenerate" lay-filter="">
@@ -134,7 +134,7 @@
                                            <option value="否" selected="">否</option>
                                        </select>
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -257,7 +257,7 @@
                , { field: '状态', title: '状态', sort: true, fixed: true }
                , { field: '单据号', title: '单据号', width: 180, sort: true, fixed: 'left' }
                , { field: '日期', title: '日期', width: 180, sort: true, fixed: 'left' }
                , { field: '供应商', title: '供应商', width: 180, sort: true, fixed: 'left' }
                  , { field: '供应商', title: '供应商', width: 180, sort: true, fixed: 'left', hide: true }

                , { field: '物料代码', title: '物料代码', width: 180, sort: true }
                , { field: '物料名称', title: '物料名称', width: 180, sort: true }
@@ -494,12 +494,12 @@
                    sqlWhere += " and 单据号 like ^^%" + $("#HBillNo").val() + "%^^";
                if ($("#HNumber").val() != "")
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                //if ($("#HName").val() != "")
                //    sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
                if ($("#HName").val() != "")
                    sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
                //if ($("#HModel").val() != "")
                //    sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
                //if ($("#HClStatus").val() != "")
                //    sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
                if ($("#HClStatus").val() != "")
                    sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
                //if ($("#HPURCHASEORGID").val() != "")
                //    sqlWhere += " and 采购组织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
                //if ($("#HDate1").val() != "") {
@@ -508,43 +508,43 @@
                //if ($("#HDate2").val() != "") {
                //    sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
                //}
                //if ($("#HISGenerate").val() != "") {
                //    if ($("#HISGenerate").val() == "是") {
                //        sqlWhere += " and 未关联数量 <= 0";
                //    }
                //    else if ($("#HISGenerate").val() == "否") {
                //        sqlWhere += " and 未关联数量 > 0";
                //    }
                if ($("#HISGenerate").val() != "") {
                    if ($("#HISGenerate").val() == "是") {
                        sqlWhere += " and 未关联数量 <= 0";
                    }
                    else if ($("#HISGenerate").val() == "否") {
                        sqlWhere += " and 未关联数量 > 0";
                    }
                }
                //var Time = $("#Time").val();
                //var dd = new Date();
                //var dt;
                //switch (Time) {
                //    case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
                //    case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
                //    case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
                //    case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
                //    case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
                //    case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
                //    case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
                //    default: dd = new Date(dd.setDate(dd.getDate()));
                //}
                var Time = $("#Time").val();
                var dd = new Date();
                var dt;
                switch (Time) {
                    case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
                    case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
                    case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
                    case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
                    case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
                    case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
                    case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
                    default: dd = new Date(dd.setDate(dd.getDate()));
                }
                dt = dd.getFullYear().toString();
                if (dd.getMonth() + 1 < 10) {
                    dt = dt + "-0" + (dd.getMonth() + 1).toString();
                }
                else {
                    dt = dt + "-0" + (dd.getMonth() + 1).toString();
                }
                if (dd.getDate() < 10) {
                    dt = dt + "-0" + dd.getDate().toString();
                }
                else {
                    dt = dt + "-" + dd.getDate().toString();
                }
                if (Time != 8) {
                    sqlWhere += " and 交货日期 <= ^^" + dt + "^^";
                }
                //dt = dd.getFullYear().toString();
                //if (dd.getMonth() + 1 < 10) {
                //    dt = dt + "-0" + (dd.getMonth() + 1).toString();
                //}
                //else {
                //    dt = dt + "-0" + (dd.getMonth() + 1).toString();
                //}
                //if (dd.getDate() < 10) {
                //    dt = dt + "-0" + dd.getDate().toString();
                //}
                //else {
                //    dt = dt + "-" + dd.getDate().toString();
                //}
                //if (Time != 8) {
                //    sqlWhere += " and 交货日期 <= ^^" + dt + "^^";
                //}
                sql = sqlWhere;
                //从第一页开始
                _cur_page = 1;

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html

@@ -10,11 +10,11 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">

    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">

    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">

    <style type="text/css">

        .layui-input-block {

            width: 200px;

        }

    </style>

        <style type="text/css">

            .layui-input-block {

                width: 200px;

            }

        </style>

</head>

<body>



@@ -66,12 +66,12 @@
                                        <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">

                                    </div>

                                </div>

                                <div class="layui-inline">

                                <!--<div class="layui-inline">

                                    <label class="layui-form-label">物料编码</label>

                                    <div class="layui-input-block">

                                        <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">

                                    </div>

                                </div>

                                </div>-->

                                <div class="layui-inline">

                                    <label class="layui-form-label">物料代码</label>

                                    <div class="layui-input-block">

@@ -84,12 +84,12 @@
                                        <input type="text" class="layui-input" name="HName" id="HName">

                                    </div>

                                </div>

                                <div class="layui-inline">

                                <!--<div class="layui-inline">

                                    <label class="layui-form-label">规格型号</label>

                                    <div class="layui-input-block">

                                        <input type="text" class="layui-input" name="HModel" id="HModel">

                                    </div>

                                </div>

                                </div>-->

                                <div class="layui-inline">

                                    <label class="layui-form-label">单据状态</label>

                                    <div class="layui-input-block">

@@ -103,18 +103,18 @@
                                    </div>

                                </div>



                                <div class="layui-inline">

                                <!--<div class="layui-inline">

                                    <label class="layui-form-label">开始日期</label>

                                    <div class="layui-input-block">

                                        <input type="text" class="layui-input" name="HDate1" id="HDate1">

                                    </div>

                                </div>

                                <div class="layui-inline">

                                </div>-->

                                <!--<div class="layui-inline">

                                    <label class="layui-form-label">结束日期</label>

                                    <div class="layui-input-block">

                                        <input type="text" class="layui-input" name="HDate2" id="HDate2">

                                    </div>

                                </div>

                                </div>-->

                                <!--<div class="layui-inline">

        <label class="layui-form-label">状态</label>

        <div class="layui-input-block">

@@ -126,7 +126,7 @@
        </div>

    </div>-->



                                <div class="layui-inline">

                                <!--<div class="layui-inline">

                                    <label class="layui-form-label">采购组织</label>

                                    <div class="layui-input-block">

                                        <select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">

@@ -134,7 +134,7 @@
                                            <option value="">组织2</option>

                                        </select>

                                    </div>

                                </div>

                                </div>-->

                                <div class="layui-inline">

                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">

                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>

@@ -285,18 +285,18 @@
                    , { field: '金额', title: '金额', width: 100, sort: true, hide: true }

                    , { field: '日期', title: '日期', width: 150, sort: true }

                    , { field: '批次', title: '批次', width: 150, sort: true }

                    , { field: '生产日期', title: '生产日期', width: 150, sort: true }

                    , { field: '预计到货日期', title: '预计到货日期', width: 150, sort: true }

                    , { field: '生产日期', title: '生产日期', width: 150, sort: true, hide: true}

                    , { field: '预计到货日期', title: '预计到货日期', width: 150, sort: true, hide: true}

                    , { field: '源单主内码', title: '源单主ID', width: 100, hide: true }

                    , { field: '源单子内码', title: '源单子ID', width: 100, hide: true }

                    , { field: '源单单号', title: '源单单号', width: 180 }

                    , { field: '源单类型', title: '源单类型', width: 80 }

                    , { field: '源单类型', title: '源单类型', width: 80, hide: true}

                    , { field: '采购订单号', title: '采购订单号', width: 180, sort: true, hide: true }

                    , { field: '委外订单号', title: '委外订单号', width: 180, sort: true, hide: true }

                    , { field: '变更状态', title: '变更状态', sort: true }

                    , { field: '收料组织', title: '收料组织', sort: true }

                    , { field: '采购组织', title: '采购组织', sort: true }

                    , { field: '需求组织', title: '需求组织', sort: true }

                    , { field: '收料组织', title: '收料组织', sort: true, hide: true}

                    , { field: '采购组织', title: '采购组织', sort: true, hide: true}

                    , { field: '需求组织', title: '需求组织', sort: true, hide: true }

                ]]

                , page: true //是否显示分页

                , limits: [10, 20, 50, 100]

@@ -550,24 +550,24 @@
                    sqlWhere += " and 源单单号 like ^^%" + $("#HBillNoFrom").val() + "%^^";

                if ($("#HInnerBillNo").val() != "")

                    sqlWhere += " and 送货单号 like ^^%" + $("#HInnerBillNo").val() + "%^^";

                if ($("#HShortNumber").val() != "")

                    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";

                //if ($("#HShortNumber").val() != "")

                //    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";

                if ($("#HNumber").val() != "")

                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";

                if ($("#HName").val() != "")

                    sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";

                if ($("#HModel").val() != "")

                    sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";

                //if ($("#HModel").val() != "")

                //    sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";

                if ($("#HClStatus").val() != "")

                    sqlWhere += " and 单据状态 like ^^%" + $("#HClStatus").val() + "%^^";

                if ($("#HPURCHASEORGID").val() != "")

                    sqlWhere += " and 采购组织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";

                if ($("#HDate1").val() != "") {

                    sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";

                }

                if ($("#HDate2").val() != "") {

                    sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";

                }

                //if ($("#HPURCHASEORGID").val() != "")

                //    sqlWhere += " and 采购组织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";

                //if ($("#HDate1").val() != "") {

                //    sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";

                //}

                //if ($("#HDate2").val() != "") {

                //     sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";

                //}



                sql = sqlWhere;

                //从第一页开始


 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html

@@ -8,6 +8,11 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <style type="text/css">
        .layui-input-block {
            width: 200px;
        }
    </style>
</head>
<body>

@@ -58,19 +63,19 @@
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>-->
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">规格型号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HModel" id="HModel">
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                <div class="layui-inline">
                                    <label class="layui-form-label">关闭状态</label>
                                    <div class="layui-input-block">
                                        <select id="HClStatus" name="HClStatus" lay-filter="">
@@ -79,7 +84,7 @@
                                            <option value="已关闭">已关闭</option>
                                        </select>
                                    </div>
                                </div>-->
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
@@ -251,7 +256,7 @@
                    , { field: '单据号', title: '单据号', width: 150, sort: true/*, fixed: 'left' */ }
                    , { field: '日期', title: '日期', width: 120, sort: true/*, fixed: 'left' */ }
                    , { field: 'HSupID', title: 'HSupID', width: 180, hide: true }
                    , { field: '供应商', title: '供应商', width: 180, sort: true/*, fixed: 'left' */ }
                    , { field: '供应商', title: '供应商', width: 180, sort: true/*, fixed: 'left' */, hide: true }
                    , { field: '计划跟踪单号', title: '计划跟踪单号', sort: true, hide: true }
                    , { field: 'F_xbkf_Combo', title: '自定义标识', width: 120 }
                    , { field: 'FSHDD', title: '送货地点', width: 120 }
@@ -265,11 +270,11 @@
                    , { field: '交货日期', title: '交货日期', width: 180, sort: true }
                    , { field: '关联数量', title: '关联数量', sort: true }
                    , { field: '未关联数量', title: '未关联数量', sort: true }
                    , { field: '剩余入库数量', title: '剩余入库数量', sort: true }
                    , { field: '剩余收料数量', title: '剩余收料数量', sort: true }
                    , { field: '剩余入库数量', title: '剩余入库数量', sort: true, hide: true}
                    , { field: '剩余收料数量', title: '剩余收料数量', sort: true, hide: true}
                    , { field: '关闭状态', title: '关闭状态', sort: true }
                    , { field: '变更状态', title: '变更状态', sort: true }
                    , { field: '采购组织', title: '采购组织', sort: true }
                    , { field: '采购组织', title: '采购组织', sort: true, hide: true}
                    , { field: '确认人', title: '确认人', sort: true, hide: true }
                    , { field: '确认日期', title: '确认日期', sort: true, hide: true }
                    , { field: '驳回人', title: '驳回人', sort: true, hide: true }
@@ -640,12 +645,12 @@
                //    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
                if ($("#HNumber").val() != "")
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                //if ($("#HName").val() != "")
                //    sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
                if ($("#HName").val() != "")
                    sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
                //if ($("#HModel").val() != "")
                //    sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
                //if ($("#HClStatus").val() != "")
                //    sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
                if ($("#HClStatus").val() != "")
                    sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
                //if ($("#HPURCHASEORGID").val() != "")
                //    sqlWhere += " and 采购组织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
                //if ($("#HDate1").val() != "") {

			@@ -8,6 +8,11 @@
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
			<style type="text/css">
			.layui-input-block {
			width: 200px;
			}
			</style>
			</head>
			<body>

			@@ -45,31 +50,31 @@
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			<!--<div class="layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">物料编码</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
			</div>
			</div>-->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">物料代码</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			</div>
			<!--<div class="layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">物料名称</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HName" id="HName">
			</div>
			</div>-->
			<!--<div class="layui-inline">
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">规格型号</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HModel" id="HModel">
			</div>
			</div>-->
			<!--<div class="layui-inline">
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">关闭状态</label>
			<div class="layui-input-block">
			<select id="HClStatus" name="HClStatus" lay-filter="">
			@@ -78,19 +83,19 @@
			<option value="已关闭">已关闭</option>
			</select>
			</div>
			</div>-->
			<!--<div class="layui-inline">
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">开始日期</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDate1" id="HDate1">
			</div>
			</div>-->
			<!--<div class="layui-inline">
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">结束日期</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDate2" id="HDate2">
			</div>
			</div>-->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">交货时间</label>
			<div class="layui-input-block">
			@@ -107,7 +112,7 @@
			</select>
			</div>
			</div>
			<!--<div class="layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">委外组织</label>
			<div class="layui-input-block">
			<select id="HSUBORGID" name="HSUBORGID" lay-filter="">
			@@ -115,8 +120,8 @@
			<option value="">组织2</option>
			</select>
			</div>
			</div>-->
			<!--<div class="layui-inline">
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">是否已下推送货单</label>
			<div class="layui-input-block">
			<select id="HISGenerate" name="HISGenerate" lay-filter="">
			@@ -125,7 +130,7 @@
			<option value="否">否</option>
			</select>
			</div>
			</div>-->
			</div>
			<div class="layui-inline">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			@@ -548,32 +553,32 @@
			sqlWhere += " and 状态 like ^^%" + $("#HStatus").val() + "%^^";
			if ($("#HBillNo").val() != "")
			sqlWhere += " and 单据号 like ^^%" + $("#HBillNo").val() + "%^^";
			//if ($("#HShortNumber").val() != "")
			// sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
			if ($("#HShortNumber").val() != "")
			sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
			if ($("#HNumber").val() != "")
			sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
			//if ($("#HName").val() != "")
			// sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
			//if ($("#HModel").val() != "")
			// sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
			//if ($("#HClStatus").val() != "")
			// sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
			//if ($("#HSUBORGID").val() != "")
			// sqlWhere += " and 委外组织 like ^^%" + $("#HSUBORGID").val() + "%^^";
			//if ($("#HDate1").val() != "") {
			// sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";
			//}
			//if ($("#HDate2").val() != "") {
			// sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
			//}
			//if ($("#HISGenerate").val() != "") {
			// if ($("#HISGenerate").val() == "是") {
			// sqlWhere += " and 未关联数量 <= 0";
			// }
			// else if ($("#HISGenerate").val() == "否") {
			// sqlWhere += " and 未关联数量 > 0";
			// }
			//}
			if ($("#HName").val() != "")
			sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
			if ($("#HModel").val() != "")
			sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
			if ($("#HClStatus").val() != "")
			sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
			if ($("#HSUBORGID").val() != "")
			sqlWhere += " and 委外组织 like ^^%" + $("#HSUBORGID").val() + "%^^";
			if ($("#HDate1").val() != "") {
			sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";
			}
			if ($("#HDate2").val() != "") {
			sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
			}
			if ($("#HISGenerate").val() != "") {
			if ($("#HISGenerate").val() == "是") {
			sqlWhere += " and 未关联数量 <= 0";
			}
			else if ($("#HISGenerate").val() == "否") {
			sqlWhere += " and 未关联数量 > 0";
			}
			}
			var Time = $("#Time").val();
			if (Time > 0) {
			var dd = new Date();

			@@ -57,19 +57,19 @@
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			</div>
			<!--<div class="layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">产品名称</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HName" id="HName">
			</div>
			</div>-->
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">规格型号</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HModel" id="HModel">
			</div>
			</div>-->
			<!--<div class="layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">关闭状态</label>
			<div class="layui-input-block">
			<select id="HClStatus" name="HClStatus" lay-filter="">
			@@ -78,7 +78,7 @@
			<option value="已关闭">已关闭</option>
			</select>
			</div>
			</div>-->
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">开始日期</label>
			<div class="layui-input-block">
			@@ -91,7 +91,7 @@
			<input type="text" class="layui-input" name="HDate2" id="HDate2">
			</div>
			</div>-->
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">交货时间</label>
			<div class="layui-input-block">
			<select id="Time" name="Time" lay-filter="">
			@@ -105,7 +105,7 @@
			<option value="8" selected="">长期交货</option>
			</select>
			</div>
			</div>
			</div>-->

			<!--<div class="layui-inline">
			<label class="layui-form-label">采购组织</label>
			@@ -125,7 +125,7 @@
			</select>
			</div>
			</div>-->
			<!--<div class="layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">是否已下推送货单</label>
			<div class="layui-input-block">
			<select id="HISGenerate" name="HISGenerate" lay-filter="">
			@@ -134,7 +134,7 @@
			<option value="否" selected="">否</option>
			</select>
			</div>
			</div>-->
			</div>
			<div class="layui-inline">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			@@ -257,7 +257,7 @@
			, { field: '状态', title: '状态', sort: true, fixed: true }
			, { field: '单据号', title: '单据号', width: 180, sort: true, fixed: 'left' }
			, { field: '日期', title: '日期', width: 180, sort: true, fixed: 'left' }
			, { field: '供应商', title: '供应商', width: 180, sort: true, fixed: 'left' }
			, { field: '供应商', title: '供应商', width: 180, sort: true, fixed: 'left', hide: true }

			, { field: '物料代码', title: '物料代码', width: 180, sort: true }
			, { field: '物料名称', title: '物料名称', width: 180, sort: true }
			@@ -494,12 +494,12 @@
			sqlWhere += " and 单据号 like ^^%" + $("#HBillNo").val() + "%^^";
			if ($("#HNumber").val() != "")
			sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
			//if ($("#HName").val() != "")
			// sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
			if ($("#HName").val() != "")
			sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
			//if ($("#HModel").val() != "")
			// sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
			//if ($("#HClStatus").val() != "")
			// sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
			if ($("#HClStatus").val() != "")
			sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
			//if ($("#HPURCHASEORGID").val() != "")
			// sqlWhere += " and 采购组织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
			//if ($("#HDate1").val() != "") {
			@@ -508,43 +508,43 @@
			//if ($("#HDate2").val() != "") {
			// sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
			//}
			//if ($("#HISGenerate").val() != "") {
			// if ($("#HISGenerate").val() == "是") {
			// sqlWhere += " and 未关联数量 <= 0";
			// }
			// else if ($("#HISGenerate").val() == "否") {
			// sqlWhere += " and 未关联数量 > 0";
			// }
			if ($("#HISGenerate").val() != "") {
			if ($("#HISGenerate").val() == "是") {
			sqlWhere += " and 未关联数量 <= 0";
			}
			else if ($("#HISGenerate").val() == "否") {
			sqlWhere += " and 未关联数量 > 0";
			}
			}
			//var Time = $("#Time").val();
			//var dd = new Date();
			//var dt;
			//switch (Time) {
			// case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
			// case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
			// case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
			// case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
			// case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
			// case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
			// case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
			// default: dd = new Date(dd.setDate(dd.getDate()));
			//}
			var Time = $("#Time").val();
			var dd = new Date();
			var dt;
			switch (Time) {
			case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
			case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
			case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
			case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
			case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
			case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
			case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
			default: dd = new Date(dd.setDate(dd.getDate()));
			}
			dt = dd.getFullYear().toString();
			if (dd.getMonth() + 1 < 10) {
			dt = dt + "-0" + (dd.getMonth() + 1).toString();
			}
			else {
			dt = dt + "-0" + (dd.getMonth() + 1).toString();
			}
			if (dd.getDate() < 10) {
			dt = dt + "-0" + dd.getDate().toString();
			}
			else {
			dt = dt + "-" + dd.getDate().toString();
			}
			if (Time != 8) {
			sqlWhere += " and 交货日期 <= ^^" + dt + "^^";
			}
			//dt = dd.getFullYear().toString();
			//if (dd.getMonth() + 1 < 10) {
			// dt = dt + "-0" + (dd.getMonth() + 1).toString();
			//}
			//else {
			// dt = dt + "-0" + (dd.getMonth() + 1).toString();
			//}
			//if (dd.getDate() < 10) {
			// dt = dt + "-0" + dd.getDate().toString();
			//}
			//else {
			// dt = dt + "-" + dd.getDate().toString();
			//}
			//if (Time != 8) {
			// sqlWhere += " and 交货日期 <= ^^" + dt + "^^";
			//}
			sql = sqlWhere;
			//从第一页开始
			_cur_page = 1;

			@@ -10,11 +10,11 @@
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
			<style type="text/css">
			.layui-input-block {
			width: 200px;
			}
			</style>
			<style type="text/css">
			.layui-input-block {
			width: 200px;
			}
			</style>
			</head>
			<body>

			@@ -66,12 +66,12 @@
			<input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">物料编码</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
			</div>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">物料代码</label>
			<div class="layui-input-block">
			@@ -84,12 +84,12 @@
			<input type="text" class="layui-input" name="HName" id="HName">
			</div>
			</div>
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">规格型号</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HModel" id="HModel">
			</div>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">单据状态</label>
			<div class="layui-input-block">
			@@ -103,18 +103,18 @@
			</div>
			</div>

			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">开始日期</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDate1" id="HDate1">
			</div>
			</div>
			<div class="layui-inline">
			</div>-->
			<!--<div class="layui-inline">
			<label class="layui-form-label">结束日期</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDate2" id="HDate2">
			</div>
			</div>
			</div>-->
			<!--<div class="layui-inline">
			<label class="layui-form-label">状态</label>
			<div class="layui-input-block">
			@@ -126,7 +126,7 @@
			</div>
			</div>-->

			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">采购组织</label>
			<div class="layui-input-block">
			<select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">
			@@ -134,7 +134,7 @@
			<option value="">组织2</option>
			</select>
			</div>
			</div>
			</div>-->
			<div class="layui-inline">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			@@ -285,18 +285,18 @@
			, { field: '金额', title: '金额', width: 100, sort: true, hide: true }
			, { field: '日期', title: '日期', width: 150, sort: true }
			, { field: '批次', title: '批次', width: 150, sort: true }
			, { field: '生产日期', title: '生产日期', width: 150, sort: true }
			, { field: '预计到货日期', title: '预计到货日期', width: 150, sort: true }
			, { field: '生产日期', title: '生产日期', width: 150, sort: true, hide: true}
			, { field: '预计到货日期', title: '预计到货日期', width: 150, sort: true, hide: true}
			, { field: '源单主内码', title: '源单主ID', width: 100, hide: true }
			, { field: '源单子内码', title: '源单子ID', width: 100, hide: true }
			, { field: '源单单号', title: '源单单号', width: 180 }
			, { field: '源单类型', title: '源单类型', width: 80 }
			, { field: '源单类型', title: '源单类型', width: 80, hide: true}
			, { field: '采购订单号', title: '采购订单号', width: 180, sort: true, hide: true }
			, { field: '委外订单号', title: '委外订单号', width: 180, sort: true, hide: true }
			, { field: '变更状态', title: '变更状态', sort: true }
			, { field: '收料组织', title: '收料组织', sort: true }
			, { field: '采购组织', title: '采购组织', sort: true }
			, { field: '需求组织', title: '需求组织', sort: true }
			, { field: '收料组织', title: '收料组织', sort: true, hide: true}
			, { field: '采购组织', title: '采购组织', sort: true, hide: true}
			, { field: '需求组织', title: '需求组织', sort: true, hide: true }
			]]
			, page: true //是否显示分页
			, limits: [10, 20, 50, 100]
			@@ -550,24 +550,24 @@
			sqlWhere += " and 源单单号 like ^^%" + $("#HBillNoFrom").val() + "%^^";
			if ($("#HInnerBillNo").val() != "")
			sqlWhere += " and 送货单号 like ^^%" + $("#HInnerBillNo").val() + "%^^";
			if ($("#HShortNumber").val() != "")
			sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
			//if ($("#HShortNumber").val() != "")
			// sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
			if ($("#HNumber").val() != "")
			sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
			if ($("#HName").val() != "")
			sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
			if ($("#HModel").val() != "")
			sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
			//if ($("#HModel").val() != "")
			// sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
			if ($("#HClStatus").val() != "")
			sqlWhere += " and 单据状态 like ^^%" + $("#HClStatus").val() + "%^^";
			if ($("#HPURCHASEORGID").val() != "")
			sqlWhere += " and 采购组织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
			if ($("#HDate1").val() != "") {
			sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";
			}
			if ($("#HDate2").val() != "") {
			sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
			}
			//if ($("#HPURCHASEORGID").val() != "")
			// sqlWhere += " and 采购组织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
			//if ($("#HDate1").val() != "") {
			// sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";
			//}
			//if ($("#HDate2").val() != "") {
			// sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
			//}

			sql = sqlWhere;
			//从第一页开始