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

yusijie

2024-03-20 2f55e014a562ca2625e6ba3e3cc999c7d08c59c1

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Xs_SeOrderBillList.html

@@ -84,15 +84,15 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">部门</label>
                                            <label class="layui-form-label">物料代码</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID" id="HDeptID" style="width:190px;">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">主管</label>
                                            <label class="layui-form-label">物料名称</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID" id="HMangerID" style="width:190px;">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
@@ -459,6 +459,7 @@
                        , { field: '金额', title: '金额', sort: true, totalRow: true }
                        , { field: '价税合计', title: '价税合计', sort: true, totalRow: true }
                        , { field: '表头备注', title: '表头备注', sort: true }
                        , { field: '剩余订金', title: '剩余订金', sort: true, totalRow: true }
                        , { field: '关联数量', title: '销售出库关联数量', sort: true, totalRow: true }
                        , { field: '未关联数量', title: '销售出库未关联数量', sort: true, totalRow: true }
                        , { field: '生产关联数量', title: '生产关联数量', sort: true, totalRow: true }
@@ -577,7 +578,8 @@
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HCusID = $("#HCusID").val();
                var HDeptID = $("#HDeptID").val();
                var HHMaterNumber = $("#HMaterNumber").val();
                var HMaterName = $("#HMaterName").val();
                var HMangerID = $("#HMangerID").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
@@ -616,11 +618,11 @@
                if (HCusID) {
                    sWhere += " and å®¢æˆ· like '%" + HCusID + "%'";
                }
                if (HDeptID) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDeptID + "%'";
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HMangerID) {
                    sWhere += " and ä¸»ç®¡ like '%" + HMangerID + "%'";
                if (HMaterName) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + HMaterName + "%'";
                }
                if (GetDataCols != "") {
                    sWhere += GetDataCols;
@@ -643,8 +645,8 @@
                $("#HDate1").val("");//结束日期
                $("#HBillNo").val("");//
                $("#HCusID").val("");
                $("#HDeptID").val("");
                $("#HMangerID").val("");
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
@@ -830,7 +832,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            $("#btnSearch").trigger('click');
                            //$("#btnSearch").trigger('click');
                        }
                        , cancel: function () {

@@ -868,7 +870,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            $("#btnSearch").trigger('click');
                            //$("#btnSearch").trigger('click');
                        }
                        , cancel: function () {

@@ -907,7 +909,7 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            $("#btnSearch").trigger('click');
                            //$("#btnSearch").trigger('click');
                        }
                        , cancel: function () {

@@ -973,7 +975,7 @@
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                            //$("#btnSearch").trigger('click');
                        }
                    })
                } else {
@@ -1035,7 +1037,7 @@
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                            //$("#btnSearch").trigger('click');
                        }
                    })
                } else {
@@ -1097,7 +1099,7 @@
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                            //$("#btnSearch").trigger('click');
                        }
                    })
                } else {