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

YL

2021-11-29 4ece667df879a0e8179f641e8365932fe3d7ec65

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -59,24 +59,43 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                            <input type="text" class="layui-input" name="HBillno" id="HBillno" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">供应商信息</label>
                                        <div class="layui-input-inline">
                                            <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                            <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                            </button>
                                        <label class="layui-form-label">业务员</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">协同状态</label>
                                        <div class="layui-input-block">
                                            <select name="HXTStatus" lay-filter="HXTStatus" style="width:190px;">
                                                <option value="" selected>全部</option>
                                                <option value="未确认">未确认</option>
                                                <option value="已确认">已确认</option>
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">反馈状态</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
@@ -324,13 +343,16 @@
            //加载网格
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                if (sWhere == "") {
                    var HBeginDate = $("#HBeginDate").val();//开始日期
                    var HEndDate = $("#HEndDate").val();//结束日期
                    if (HBeginDate) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                    }
                    if (HEndDate) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                    }
                    sWhere += " and ä¸šåŠ¡çŠ¶æ€ = '未分配' and ä¾›åº”商协同状态 ='未确认' ";
                }
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/list',
@@ -917,7 +939,12 @@
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val(); //单据号
                var HSupID = $("#HSupID").val();       //供应商信息
                var HEmpID = $("#HEmpID").val();
                var HMaterNumber = $("#HMaterNumber").val();
                var HMaterName = $("#HMaterName").val();
                var HXTStatus = $("select[name='HXTStatus']").val();
                var HXTFKStatus = $("#HXTFKStatus").val();

                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //全部
@@ -944,8 +971,22 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HSupID) {
                    sWhere += " and HSupID = '" + HSupID + "'";
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HMaterName) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + HMaterName + "%'";
                }
                if (HEmpID) {
                    sWhere += " and ä¸šåŠ¡å‘˜ like '%" + HEmpID + "%'";
                }
                if (HXTStatus) {
                    sWhere += " and ä¾›åº”商协同状态 like '%" + HXTStatus + "%'";

                }
                if (HXTFKStatus) {
                    sWhere += " and åé¦ˆçŠ¶æ€ like '%" + HXTFKStatus + "%'";

                }
                var index = layer.load(0);
                get_Display(sWhere);
@@ -958,8 +999,9 @@
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HSupName").val("");
                $("#HSupID").val("");
                $("#HEmpID").val("");
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                sWhere = "";
                get_Display(sWhere);
            }