合并

ch

2022-01-16 cf866c4946a15efa23b942f90f9f95da7a5d30c2

 WebTM/views/PublicPage/MouldMaintainRuleInterList.html

@@ -36,15 +36,15 @@
                                        <div class="layui-col-xs12 layui-inline">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">周期单位</label>
                                                    <label class="layui-form-label">规程单号</label>
                                                    <div class="layui-input-block">
                                                        <input type="text" class="layui-input" name="HCycleUnit" id="HCycleUnit">
                                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">保养周期</label>
                                                    <label class="layui-form-label">周期单位</label>
                                                    <div class="layui-input-block">
                                                        <input type="text" class="layui-input" name="HCheckCycle" id="HCheckCycle">
                                                        <input type="text" class="layui-input" name="HCycleUnit" id="HCycleUnit">
                                                    </div>
                                                </div>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -87,8 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' "; //树型100046  sessionStorage["OrganizationID"]
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 ";  //列表
            var sWhere = " "; //树型100046  sessionStorage["OrganizationID"]
            var sWhere1 = "";  //列表

            var option = {
                elem: '#mainTable'
@@ -98,16 +98,15 @@
                , cellMinWidth: 90
                , cols: [[
                    { type: 'radio', fixed: 'left' }
                    , { field: 'hmainid', title: 'HInterID', sort: true, hide: true }
                    , { field: 'HCheckCycle', title: '保养周期' }
                    , { field: 'HCycleUnit', title: '周期单位' }
                    , { field: 'hmainid', title: 'HInterID' }
                    , { field: '单据号', title: '单据号' }
                ]]
            };

            var index = layer.load(0, { shade: false });
            //进入页面显示的缓存列表
            $.ajax({
                url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
                url: GetWEBURL() + '/Sc_MouldMaintainRuleBill/GetMouldMaintainRuleList',
                type: "GET",
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
@@ -130,7 +129,7 @@
            form.on('submit(btnSearch)', function (data) {

                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
                    url: GetWEBURL() + '/Sc_MouldMaintainRuleBill/GetMouldMaintainRuleList',
                    type: "GET",
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
@@ -190,13 +189,13 @@
        }

        function SeachFilter(sWhere1) {
            var HCheckCycle = $("#HCheckCycle").val();
            var HBillNo = $("#HBillNo").val();
            var HCycleUnit = $("#HCycleUnit").val();
            if (HCycleUnit) {
                sWhere1 += " and HCheckCycle like '%" + HCheckCycle + "%'";
            if (HBillNo) {
                sWhere1 += " and 单据号 like '%" + HBillNo + "%'";
            }
            if (HCycleUnit) {
                sWhere1 += " and HCycleUnit like '%" + HCycleUnit + "%'";
                sWhere1 += " and 周期单位 like '%" + HCycleUnit + "%'";
            }
            return sWhere1;
        }