智云MES-UI前端
parent: 057bd11c | 补丁 | 提交 | show whitespace
yangle
2024-01-12 1c9d495dcc5dc34456d389db3b230e98766d2639 
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
9个文件已修改
891 ■■■■■ 已修改文件
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 314 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/过滤方案设置/Xt_FastICScheme.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/过滤方案设置/Xt_FastICSchemeList.html 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html 139 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_DepartmentList.html


@@ -13,6 +13,7 @@


    <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/HideButton.js"></script>




</head>


<body>


@@ -87,15 +88,16 @@


                        <table class="" id="mainTable" lay-filter="mainTable"></table>


                        <script type="text/html" id="toolbarDemo">


                            <div class="layui-btn-container">


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>反禁用</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>新增</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>编辑</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>删除</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_ref"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>审核</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn_deaudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn_stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn_destop"><i class="layui-icon layui-icon-radio"></i>反禁用</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_hidecolumn"><i class="layui-icon layui-icon-form"></i>列设置</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>


                            </div>


                        </script>


@@ -180,6 +182,11 @@


                        break;


                    //列设置


                    case 'set_HideColumn': get_HideColumn();


                        break;


                    case 'set_HideButton':


                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象


                        var HBillType = "Gy_DepartmentList";


                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);


                        break;


                };


            });


@@ -310,6 +317,12 @@


                            }


                            table.render(option);




                            //刷新按钮显示


                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象


                            var HBillType = "Gy_DepartmentList";


                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);






                            //刷新表格数据


                            DisPlay_HideColumn();






 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html


@@ -160,6 +160,8 @@


                                </div>


                            </div>


                        </div>


                        <!--显示当前过滤方案-->


                        <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now" ></div>


                        <table class="" id="mainTable" lay-filter="mainTable"></table>


                        <script type="text/html" id="toolbarDemo">


                            <!--<div class="layui-btn-container">


@@ -250,9 +252,11 @@




            var option = [];


            var ins;                        //用于导出excel


            var HDefaultFilter = "";


            //是否已经选择了过滤方案


            window.HDefaultFilter = "";


            //选择的过滤方案内码


            window.HInterID_Choose = 0;


            //判断是否有参数传递






            //初始化表格


            DisPlay_HideColumn();


@@ -442,7 +446,8 @@


                set_InitGrid();


                //查询


                get_FastQuery();




                //查询当前登录用户有没有在当前模块设置默认过滤方案


                get_DefaultModule();               


            }


            //#endregion




@@ -635,6 +640,7 @@


                $.ajax({


                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',


                    type: "GET",


                    async: false,


                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },


                    success: function (data1) {


                        if (data1.count == 1) {


@@ -1016,86 +1022,6 @@


                } else {


                    layer.msg('请选择一行数据编辑！');


                }


            }




            //保存方案


            function set_SaveScheme() {


                var Filter = document.getElementsByClassName("ForFilteringSchemes"); //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)




                var HFilterIdList = "";


                var HFilterIdLists = "";


                var HValue = "";


                var HElement_type = "";


                for (var i = 0; i < Filter.length; i++) {


                    HFilterIdList = Filter[i].id; //过滤条件ID


                    HFilterIdLists += Filter[i].id + ","; //过滤条件ID(拼接)


                    HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值


                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型


                }


                //对数组进行编码


                HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//对 URI è¿›è¡Œç¼–码


                HValue = encodeURI(HValue.substring(0, HValue.length - 1));//对 URI è¿›è¡Œç¼–码


                HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//对 URI è¿›è¡Œç¼–码




                if (HDefaultFilter == "") {


                    layer.open({


                        type: 2


                        , area: ['40%', '80%']


                        , title: '过滤方案'


                        , shift: 0//弹出动画


                        , content: '../../系统管理/过滤方案设置/Xt_FastICScheme.html?OperationType=1&HModuleName=采购订单&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type


                        , btn: ['确定', '取消']


                        , btn1: function (index, layero) {




                            //按钮【按钮一】的回调


                            var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面


                            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"


                            if (checkStatus.data.length === 0) {


                                return layer.msg('请选择数据');


                            }


                            


                            layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的


                        }


                        , btn2: function (index, layero) {


                            //按钮【按钮二】的回调


                            //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­


                        }


                        , end: function () {


                            get_FastQuery()


                        }


                    })


                }


                ;


            }




            //读取方案


            function set_ReadScheme() {


                layer.open({


                    type: 2


                    , area: ['80%', '80%']


                    , title: '过滤方案列表'


                    , shift: 0//弹出动画


                    , content: '../../系统管理/过滤方案设置/Xt_FastICSchemeList.html?HType=HFilterScheme'


                    , btn: ['确定', '取消']


                    , btn1: function (index, layero) {




                        //按钮【按钮一】的回调


                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面


                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"


                        if (checkStatus.data.length === 0) {


                            return layer.msg('请选择数据');


                        }




                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的


                    }


                    , btn2: function (index, layero) {


                        //按钮【按钮二】的回调


                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­


                    }


                    , end: function () {


                        get_FastQuery()


                    }


                })


            }




            // å¤åˆ¶


@@ -1708,13 +1634,235 @@




                return res;


            }




            //获取当前用户的默认过滤方案


            function get_DefaultModule() {


                $.ajax({


                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',


                    type: "GET",


                    data: { "user": sessionStorage["Czybm"], "HModuleName": "采购订单", "HInterID": 0, "Type": "Default" },


                    success: function (data1) {


                        if (data1.count == 1) {


                            var data = data1.data;


                            HInterID_Choose = data[0].hmainid;


                            HInterID = data[0].hmainid


                            HDefaultFilter = data[0].方案名称


                            var HRemark = data[0].备注




                            document.getElementById("HFilterScheme_Now").style.display = "block";


                            document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案：" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';


                            for (let i = 0; i < data.length; i++) {


                                $("#" + data[i].过滤字段ID).val(data[i].过滤值);


                                if (data[i].过滤标签类型 == 'SELECT') {


                                    $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);


                                }


                            }


                            get_FastQuery()


                            form.render("select");


                        } else {


                            document.getElementById("HFilterScheme_Now").style.display = "none";


                            get_FastQuery()


                            form.render("select");


                        }


                    }, error: function () {


                        layer.alert("接口请求失败!", { icon: 5 });


                    }


                });


            }




            //保存方案


            function set_SaveScheme() {


                var index = layer.open()


                var HIsClose_Manual = false;


                var Filter = document.getElementsByClassName("ForFilteringSchemes"); //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)




                var HFilterIdList = "";


                var HFilterIdLists = "";


                var HValue = "";


                var HElement_type = "";


                for (var i = 0; i < Filter.length; i++) {


                    HFilterIdList = Filter[i].id; //过滤条件ID


                    HFilterIdLists += Filter[i].id + ","; //过滤条件ID(拼接)


                    HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值


                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型


                }


                //对数组进行编码


                HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//对 URI è¿›è¡Œç¼–码


                HValue = encodeURI(HValue.substring(0, HValue.length - 1));//对 URI è¿›è¡Œç¼–码


                HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//对 URI è¿›è¡Œç¼–码




                if (HDefaultFilter == "") {


                    layer.open({


                        type: 2


                        , area: ['40%', '80%']


                        , title: '过滤方案'


                        , shift: 0//弹出动画


                        , content: '../../系统管理/过滤方案设置/Xt_FastICScheme.html?OperationType=1&HModuleName=采购订单&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type


                        , cancel: function () {


                            // å³ä¸Šè§’关闭事件的逻辑


                            HIsClose_Manual = true;


                        }


                        , end: function () {


                            if (HIsClose_Manual != true) {


                                get_FastQuery();


                                //显示当前的过滤方案


                                document.getElementById("HFilterScheme_Now").style.display = "block";


                                document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案：" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';                                 


                            }


                        }


                    })


                    layer.close(index)


                } else {


                    layer.confirm('当前已选择过滤方案，是否修改？请选择对应操作', {


                        title: "操作提示",


                        icon: 0,


                        btn: ['新增方案', '保存修改当前方案', '取消']


                    }, function (index, layero) {


                        //新增


                        layer.open({


                            type: 2


                            , area: ['40%', '80%']


                            , title: '过滤方案'


                            , shift: 0//弹出动画


                            , content: '../../系统管理/过滤方案设置/Xt_FastICScheme.html?OperationType=1&HModuleName=采购订单&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type


                            , end: function () {


                                get_FastQuery()              


                                //显示当前的过滤方案


                                document.getElementById("HFilterScheme_Now").style.display = "block";


                                document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案：" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';  


                            }


                        })


                        layer.close(index)


                    }, function (index) {


                        var Filter_Edit = document.getElementsByClassName("ForFilteringSchemes"); //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)


                        for (var i = 0; i < Filter_Edit.length; i++) {


                            HFilterIdList = Filter_Edit[i].id; //过滤条件ID


                            HFilterIdLists += Filter_Edit[i].id + ","; //过滤条件ID(拼接)


                            HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值


                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型


                        }


                        //对数组进行编码


                        HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//对 URI è¿›è¡Œç¼–码


                        HValue = encodeURI(HValue.substring(0, HValue.length - 1));//对 URI è¿›è¡Œç¼–码


                        HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//对 URI è¿›è¡Œç¼–码


                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["HUserName"] + ';' + 3;




                        //修改


                        $.ajax({


                            type: "POST",


                            url: GetWEBURL() + "/Xt_FastICScheme/save", //方法所在页面和方法名


                            async: true,


                            data: { "oMain": sMainSub },


                            dataType: "json",


                            success: function (data) {


                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ


                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {


                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);


                                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引


                                        parent.layer.close(index); //再执行关闭


                                    });


                                }


                                else {




                                }


                                layer.closeAll("loading");


                            },


                            error: function (err) {






                            }


                        });


                        layer.close(index)


                    }, function (index) {


                        //取消


                        layer.alert('取消')


                        layer.close(index)


                    });


                }




            }




            //读取方案


            function set_ReadScheme() {


                var HIsClose_Manual = false;


                var Filter = document.getElementsByClassName("ForFilteringSchemes"); //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)




                var HFilterIdList = "";


                var HFilterIdLists = "";


                var HValue = "";


                var HElement_type = "";


                for (var i = 0; i < Filter.length; i++) {


                    HFilterIdList = Filter[i].id; //过滤条件ID


                    HFilterIdLists += Filter[i].id + ","; //过滤条件ID(拼接)


                    HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值


                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型


                }


                //对数组进行编码


                HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//对 URI è¿›è¡Œç¼–码


                HValue = encodeURI(HValue.substring(0, HValue.length - 1));//对 URI è¿›è¡Œç¼–码


                HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//对 URI è¿›è¡Œç¼–码




                layer.open({


                    type: 2


                    , area: ['80%', '80%']


                    , title: '过滤方案列表'


                    , shift: 0//弹出动画


                    , content: '../../系统管理/过滤方案设置/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type


                    , cancel: function () {


                        // å³ä¸Šè§’关闭事件的逻辑


                        HIsClose_Manual = true;


                    }


                    , end: function () {


                        if (HIsClose_Manual != true) {


                            get_FastQuery()


                            form.render("select");


                        }


                    }


                })


            }


            //#endregion




            //以上是layui模块






        });


        // è¿‡æ»¤æ–¹æ¡ˆè¿”回数据


        function HFilterScheme(obj)  //返回过滤方案


        {


            var HInterID = obj[0].hmainid;


            HInterID_Choose = obj[0].hmainid;


            $.ajax({


                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',


                type: "GET",


                data: { "user": sessionStorage["Czybm"], "HModuleName": "采购订单", "HInterID": HInterID, "Type": "Select" },


                success: function (data1) {


                    if (data1.count == 1) {


                        var data = data1.data;


                        //赋值过滤方案名称


                        HDefaultFilter = data[0].方案名称


                        var HRemark = data[0].备注


                        //显示当前的过滤方案


                        document.getElementById("HFilterScheme_Now").style.display = "block";


                        document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案：" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>'; 


                        HInterID = data[0].hmainid


                        //根据选择的过滤方案回填数据到列表过滤条件


                        for (let i = 0; i < data.length; i++) {


                            $("#" + data[i].过滤字段ID).val(data[i].过滤值);


                            if (data[i].过滤标签类型 == 'SELECT') {


                                $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);


                            }


                        }




                    } else {


                        layer.close(ajaxLoad);


                        layer.alert(data1.code + data1.Message, { icon: 5 });


                    }


                }, error: function () {


                    layer.close(ajaxLoad);


                    layer.alert("接口请求失败!", { icon: 5 });


                }


            });


        }


    </script>




</body>




 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html


@@ -1016,7 +1016,7 @@


                                for (let i = 0; i < data.length; i++) {


                                    arr.push({


                                        "HMaterID": data[i].物料ID, "HMaterCode": data[i].物料代码, "HMaterName": data[i].物料名称, "HMaterSpec": data[i].规格型号,


                                        "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": data[i].生产资源ID, "HSourceCode": data[i].生产资源代码,


                                        "HUnitID": data[i].单位ID, "HUnitCode": data[i].计量单位代码, "HUnitName": data[i].计量单位, "HSourceID": data[i].生产资源ID, "HSourceCode": data[i].生产资源代码,


                                        "HSourceName": data[i].生产资源名称, "HWorkerid": data[i].操作员ID, "HWorkerCode": data[i].操作员代码,


                                        "HWorkerName": data[i].操作员名称, "HQty": data[i].产量, "HBadQty": data[i].不良数量 == '' ? 0 : data[i].不良数量, "HICMOBillNo": data[i].生产订单号,


                                        "HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": "", "HSourceInterID": data[i].HICMOInterID, "HSourceEntryID": data[i].HICMOEntryID, "HSourceBillNo": data[i].生产订单号,




 WebTM/views/ϵͳ¹ÜÀí/¹ýÂË·½°¸ÉèÖÃ/Xt_FastICScheme.html


@@ -43,7 +43,7 @@


                                            <div class="layui-inline">


                                                <label class="layui-form-label">模块名称：</label>


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


                                                    <input class="layui-input" name="HBillName" lay-verify="HBillName" id="HBillName" readonly>


                                                    <input class="layui-input" name="HBillName" lay-verify="HBillName" id="HBillName" style="background-color:#eeebeb" readonly>


                                                </div>


                                            </div>


                                            <div class="layui-inline">


@@ -144,7 +144,7 @@


                        //console.log(d.data);


                        $("#HInterID").val(d.data[0].HInterID);


                        $("#HCreateDate").val(Format(new Date(), "yyyy-MM-dd"));


                        $("#HUserCode").val(sessionStorage["HUserName"]);


                        $("#HUserCode").val(sessionStorage["Czybm"]);


                    }


                });


            }


@@ -158,7 +158,7 @@


                data.field.HStopflag = isStopCheck;//将数组合并成字符串


                var oMain = JSON.stringify(data.field)




                var sMainSub = oMain + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["HUserName"];


                var sMainSub = oMain + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + OperationType;


                $.ajax(


                    {


                        type: "POST",


@@ -168,6 +168,8 @@


                        dataType: "json",


                        success: function (data) {


                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ


                                sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] = $("#HName").val();


                                sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] = $("#HRemark").val();


                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {


                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);


                                    var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引




 WebTM/views/ϵͳ¹ÜÀí/¹ýÂË·½°¸ÉèÖÃ/Xt_FastICSchemeList.html


@@ -30,6 +30,7 @@


                            <div class="layui-btn-container">


                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btn-Add"><i class="layui-icon layui-icon-form"></i>新增</button>


                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>                                


                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnExit" id="btn-Exit"><i class="layui-icon layui-icon-form"></i>退出</button>


                            </div>


                        </script>


                    </form>


@@ -41,7 +42,30 @@


    <script src="../../../layuiadmin/Scripts/json2.js"></script>


    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>


    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>


    <script src="../../../layuiadmin/PubCustom.js"></script>




    <script>


        function getUrlVars() {


            var vars = [], hash;


            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');


            for (var i = 0; i < hashes.length; i++) {


                hash = hashes[i].split('=');


                vars.push(hash[0]);


                vars[hash[0]] = hash[1];


            }


            return vars;


        }


        var params = getUrlVars();


        var Type = params[params[0]];




        HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type






        var OperationType = params[params[0]];//操作类型


        var HFilterIdLists = params[params[1]];//过滤条件ID


        var HValue = params[params[2]];//过滤条件中输入的值


        var HElement_type = params[params[3]];//通过标签id获取标签类型




        layui.config({


            base: '../../../layuiadmin/' //静态资源所在路径


        }).extend({


@@ -62,7 +86,7 @@


            var Organization = sessionStorage["Organization"]


            var HModName = "Xt_FastICSchemeList";


            //不需要显示的字段 å¯æ‰©å±•


            var titleData = ["HItemID"];


            var titleData = ["hmainid", "过滤字段ID", "过滤标签类型","过滤值"];


            //#endregion




            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½


@@ -80,6 +104,9 @@


                        break;                   


                    //删除


                    case 'btndelete': set_DeleteBill();


                        break;


                    //退出


                    case 'btnExit': set_Exit();


                        break;                   


                };


            });


@@ -108,11 +135,11 @@


                var data = [];


                data.push(obj.data);


                switch (Type) {


                    case "HAccCus":  //返回结算单位


                        parent.GetHAccCusValue(data);


                    case "HFilterScheme":  //返回过滤方案


                        parent.HFilterScheme(data);


                        break;


                    default:


                        parent.GetHSupValue(data);      //返回 å®¢æˆ·


                        parent.HFilterScheme(data);      //返回 å®¢æˆ·


                }


                var index = parent.layer.getFrameIndex(window.name);


                parent.layer.close(index);


@@ -153,17 +180,6 @@


                    , limits: [50, 500, 5000, 50000]


                    , limit: 50


                    , cellMinWidth: 90


                    //, cols: [[


                    //    { type: 'radio', fixed: 'left' }


                    //    , { field: '选择', title: '选择', sort: true, hide: true }


                    //    , { field: 'HItemID', title: 'HItemID', hide: true }


                    //    , { field: '供应商代码', title: '供应商代码' }


                    //    , { field: '供应商名称', title: '供应商名称' }


                    //    , { field: '条码编号', title: '条码编号' }


                    //    , { field: '组织名称', title: '组织名称' }


                    //    , { field: '明细标记', title: '明细标记' }


                    //    , { field: '禁用标记', title: '禁用标记' }


                    //]]


                };


            }


            //查询


@@ -173,7 +189,7 @@


                $.ajax({


                    url: GetWEBURL() + '/Xt_FastICScheme/list',


                    type: "GET",


                    data: { "user": sessionStorage["HUserName"], "HModuleName": "采购订单"  },


                    data: { "user": sessionStorage["Czybm"], "HModuleName": "采购订单" },


                    success: function (data1) {


                        if (data1.count == 1) {


                            var data = [];


@@ -288,31 +304,41 @@


            function set_DeleteBill() {


                var checkStatus = table.checkStatus('mainTable')


                    , data = checkStatus.data;


                if (checkStatus.data.length === 1) {


                    var ModRightNameDelete = "Gy_Supplier_Delete";


                if (checkStatus.data.length > 0) {




                    var hmainid = "";


                    for (let i = 0; i < data.length; i++) {


                        hmainid += data[i].hmainid + ",";


                    }


                    //对数组进行编码


                    hmainid = encodeURI(hmainid.substring(0, hmainid.length - 1));//对 URI è¿›è¡Œç¼–码




                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {


                        var wait = layer.load();


                        //逻辑删除方法


                        $.ajax({


                            url: GetWEBURL() + '/Gy_Supplier/Delete_Json',


                            url: GetWEBURL() + '/Xt_FastICScheme/DeltetXt_FastICScheme',


                            type: "GET",


                            //async: true,


                            data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },


                            data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },


                            success: function (result) {


                                if (result.count == 1) {


                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {


                                    layer.msg(result.Message, { icon: 1 }, function () {


                                        // å¾—到frame索引


                                        var index = layer.getFrameIndex(window.name);


                                        //关闭当前frame


                                        layer.close(index);


                                        layer.close(wait);


                                        //修改为功后刷新界面


                                        window.location.reload();


                                    });


                                } else {


                                    layer.alert(result.code + result.Message, { icon: 5 });


                                    layer.close(wait);


                                }


                            }, error: function () {


                                layer.alert("接口请求失败!", { icon: 5 });


                                layer.close(wait);


                            }


                        })


                        });


                    })


                }


                else {


@@ -323,24 +349,26 @@


            //新增按钮


            function set_AddNew() {


                layer.open({


                    type: 2,


                    skin: 'layui-layer-rim', //加上边框


                    title: '新增过滤方案',


                    closeBtn: 1,


                    shift: 2,


                    area: ['100%', '100%'],


                    maxmin: true,


                    content: '../../系统管理/过滤方案设置/Xt_FastICScheme.html',


                    end: function () {


                        //刷新页面,


                        location.reload();


                    },


                    success: function (layero, index) {




                    type: 2


                    , area: ['40%', '80%']


                    , title: '过滤方案'


                    , shift: 0//弹出动画


                    , content: '../../系统管理/过滤方案设置/Xt_FastICScheme.html?OperationType=1&HModuleName=采购订单&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type


                    , cancel: function () {


                        // å³ä¸Šè§’关闭事件的逻辑


                        HIsClose_Manual = true;


                    }


                });


                    , end: function () {


                        if (HIsClose_Manual != true) {


                            get_FastQuery();


            }




                    }


                })


            }


            //退出按钮


            function set_Exit() {


                Pub_Close(1);


            }


           




            //#endregion




 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckBill.html


@@ -93,6 +93,13 @@


                                                        <input type="text" name="HMainProcName" id="HMainProcName" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="">


                                                    </div>


                                                </div>


                                                <div class="layui-inline">


                                                    <label class="layui-form-label">判断结论</label>


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


                                                        <input type="radio" name="HLastResult" id="HLastResult" value="1" title="合格" checked>


                                                        <input type="radio" name="HLastResult" id="HLastResult" value="0" title="不合格">


                                                    </div>


                                                </div>


                                                <div class="layui-colorpicker-xs" style="margin-top:15px">


                                                    <label class="layui-form-label"> å¤‡æ³¨</label>


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




 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_PatrolProcCheckBillList.html


@@ -37,101 +37,97 @@


                                    </div>


                                    <!--第一层过滤-->


                                    <div class="layui-inline">


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


                                        <div class="layui-input-block" style="width:120px">


                                        <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="HBillNo" id="HBillNo">


                                        </div>


                                    </div>


                                    <div class="layui-inline">


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


                                        <div class="layui-input-block" style="width:120px">


                                        <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="HDate1" id="HDate1">


                                        </div>


                                    </div>


                                    <div class="layui-inline">


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


                                        <div class="layui-input-block" style="width:120px">


                                        <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="HDate2" id="HDate2">


                                        </div>


                                    </div>


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


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


                                    </button>


                                    <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-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="text" class="layui-input" name="HNumber" id="HNumber">


                                                </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="HName" id="HName">


                                                </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="HModel" id="HModel">


                                                </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="HName1" id="HName1">


                                                </div>


                                            </div>


                                        </div>


                                        <!--第三排过滤-->


                                        <div class="layui-row" style="margin-top:5px">


                                            <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="HName2" id="HName2">


                                                </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="HName3" id="HName3">


                                                </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="HProcExchBillNo" id="HProcExchBillNo">


                                                </div>


                                            </div>


                                            <div class="layui-inline" style="width: 85px;">


                                        <label class="layui-form-label">判定结论</label>


                                        <div class="layui-input-block" style="width:120px">


                                                <div class="layui-input-block" style="width:190px;">


                                            <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">


                                                <option value=""></option>


                                                <option value="合格">合格</option>


                                                <option value="不合格">不合格</option>


                                            </select>


                                        </div>




                                    </div>


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


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


                                    </button>


                                    <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" 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" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">物料名称</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


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


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">质检员</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </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" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">生产名称</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">工序流转卡</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </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" style="width:120px">


                                                <div class="layui-input-block" style="margin-left: 120px;">


                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">


                                                    </select>


                                                </div>


                                            </div>


                                            <div class="layui-inline" style="width:120px">


                                            <div class="layui-inline">


                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">


                                                    <option value="0" selected="selected"></option>


                                                    <option value="=">=</option>


@@ -146,7 +142,7 @@


                                                    <option value="10">不包含</option>


                                                </select>


                                            </div>


                                            <div class="layui-inline" style="width:120px">


                                            <div class="layui-inline">


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


                                            </div>


                                        </div>


@@ -281,8 +277,12 @@


                    , { field: '表头备注 ', title: '表头备注', width: 105, sort: true }


                    , { field: '制单人', title: '制单人', width: 160, sort: true }


                    , { field: '制单日期', title: '制单日期', width: 160, sort: true }


                    , { field: '判定结论', title: '判定结论', sort: true }


                    , { field: '生产资源名称', title: '生产资源名称', sort: true }


                    , { field: '生产资源代码', title: '生产资源代码', sort: true }


                    , { field: '检验项目代码', title: '检验项目代码', sort: true }


                    , { field: '检验项目名称', title: '检验项目名称', sort: true }


                    , { field: '工序流转卡号', title: '工序流转卡号', sort: true }


                    , { field: '产品内码', title: '产品内码', sort: true }


                    , { field: '产品名称', title: '产品名称', sort: true }


                    , { field: '产品型号', title: '产品型号', width: 115, sort: true }


@@ -514,21 +514,21 @@


                if (HBillNo)


                    sqlWhere += " and å•æ®å· like '%" + HBillNo + "%'";


                if (HNumber)


                    sqlWhere += " and ç‰©æ–™ç¼–码 like '%" + HNumber + "%'";


                    sqlWhere += " and äº§å“å†…码 like '%" + HNumber + "%'";


                if (HName)


                    sqlWhere += " and ç‰©æ–™åç§° like '%" + HName + "%'";


                    sqlWhere += " and äº§å“åç§° like '%" + HName + "%'";


                if (HModel)


                    sqlWhere += " and è§„格型号 like '%" + HModel + "%'";


                    sqlWhere += " and äº§å“åž‹å· like '%" + HModel + "%'";


                if (HLastResult)


                    sqlWhere += " and åˆ¤å®šç»“论 like '" + HLastResult + "%'";


                if (HName1)


                    sqlWhere += " and è´¨æ£€å‘˜åç§° like '%" + HName1 + "%'";


                    sqlWhere += " and æ£€éªŒå‘˜åç§° like '%" + HName1 + "%'";


                if (HName2)


                    sqlWhere += " and æ£€éªŒé¡¹ç›® like '%" + HName2 + "%'";


                    sqlWhere += " and æ£€éªŒé¡¹ç›®åç§° like '%" + HName2 + "%'";


                if (HName3)


                    sqlWhere += " and ç”Ÿäº§èµ„源名称 like '%" + HName3 + "%'";


                if (HProcExchBillNo)


                    sqlWhere += " and å·¥åºæµè½¬å¡ like '%" + HProcExchBillNo + "%'";


                    sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";




                if (HDate1) {


                    sqlWhere += " and æ—¥æœŸ >= '" + HDate1 + "'";




 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillList.html


@@ -39,101 +39,97 @@


                                    </div>


                                    <!--第一层过滤-->


                                    <div class="layui-inline">


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


                                        <div class="layui-input-block" style="width:120px">


                                        <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="HBillNo" id="HBillNo">


                                        </div>


                                    </div>


                                    <div class="layui-inline">


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


                                        <div class="layui-input-block" style="width:120px">


                                        <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="HDate1" id="HDate1">


                                        </div>


                                    </div>


                                    <div class="layui-inline">


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


                                        <div class="layui-input-block" style="width:120px">


                                        <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="HDate2" id="HDate2">


                                        </div>


                                    </div>


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


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


                                    </button>


                                    <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-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="text" class="layui-input" name="HNumber" id="HNumber">


                                                </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="HName" id="HName">


                                                </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="HModel" id="HModel">


                                                </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="HName1" id="HName1">


                                                </div>


                                            </div>


                                        </div>


                                        <!--第三排过滤-->


                                        <div class="layui-row" style="margin-top:5px">


                                            <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="HName2" id="HName2">


                                                </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="HName3" id="HName3">


                                                </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="HProcExchBillNo" id="HProcExchBillNo">


                                                </div>


                                            </div>


                                            <div class="layui-inline" style="width: 85px;">


                                        <label class="layui-form-label">判定结论</label>


                                        <div class="layui-input-block" style="width:120px">


                                                <div class="layui-input-block" style="width:190px;">


                                            <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">


                                                <option value=""></option>


                                                <option value="合格">合格</option>


                                                <option value="不合格">不合格</option>


                                            </select>


                                        </div>




                                    </div>


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


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


                                    </button>


                                    <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" 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" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">物料名称</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


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


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">质检员</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </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" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">生产名称</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">工序流转卡</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </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" style="width:120px">


                                                <div class="layui-input-block" style="margin-left: 120px;">


                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">


                                                    </select>


                                                </div>


                                            </div>


                                            <div class="layui-inline" style="width:120px">


                                            <div class="layui-inline">


                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">


                                                    <option value="0" selected="selected"></option>


                                                    <option value="=">=</option>


@@ -148,7 +144,7 @@


                                                    <option value="10">不包含</option>


                                                </select>


                                            </div>


                                            <div class="layui-inline" style="width:120px">


                                            <div class="layui-inline">


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


                                            </div>


                                        </div>


@@ -333,7 +329,7 @@


                if (HBillNo)


                    sqlWhere += " and å•æ®å· like '%" + HBillNo + "%'";


                if (HNumber)


                    sqlWhere += " and ç‰©æ–™ç¼–码 like '%" + HNumber + "%'";


                    sqlWhere += " and ç‰©æ–™ä»£ç  like '%" + HNumber + "%'";


                if (HName)


                    sqlWhere += " and ç‰©æ–™åç§° like '%" + HName + "%'";


                if (HModel)


@@ -343,11 +339,11 @@


                if (HName1)


                    sqlWhere += " and è´¨æ£€å‘˜åç§° like '%" + HName1 + "%'";


                if (HName2)


                    sqlWhere += " and æ£€éªŒé¡¹ç›® like '%" + HName2 + "%'";


                    sqlWhere += " and æ£€éªŒé¡¹ç›®åç§° like '%" + HName2 + "%'";


                if (HName3)


                    sqlWhere += " and ç”Ÿäº§èµ„源名称 like '%" + HName3 + "%'";


                if (HProcExchBillNo)


                    sqlWhere += " and å·¥åºæµè½¬å¡ like '%" + HProcExchBillNo + "%'";


                    sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";




                if (HDate1) {


                    sqlWhere += " and æ—¥æœŸ >= '" + HDate1 + "'";




 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList.html


@@ -39,102 +39,99 @@


                                    </div>


                                    <!--第一层过滤-->


                                    <div class="layui-inline">


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


                                        <div class="layui-input-block" style="width:120px">


                                        <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="HBillNo" id="HBillNo">


                                        </div>


                                    </div>


                                    <div class="layui-inline">


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


                                        <div class="layui-input-block" style="width:120px">


                                        <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="HDate1" id="HDate1">


                                        </div>


                                    </div>


                                    <div class="layui-inline">


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


                                        <div class="layui-input-block" style="width:120px">


                                        <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="HDate2" id="HDate2">


                                        </div>


                                    </div>


                                    


                                    <div class="layui-inline" >


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


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


                                        </button>


                                    </div>


                                  


                                    <div class="layui-colla-content">


                                        <!--第二排过滤-->


                                        <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="text" class="layui-input" name="HNumber" id="HNumber">


                                                </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="HName" id="HName">


                                                </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="HModel" id="HModel">


                                                </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="HName1" id="HName1">


                                                </div>


                                            </div>


                                        </div>


                                        <!--第三排过滤-->


                                        <div class="layui-row" style="margin-top:5px">


                                            <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="HName2" id="HName2">


                                                </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="HName3" id="HName3">


                                                </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="HProcExchBillNo" id="HProcExchBillNo">


                                                </div>


                                            </div>


                                            <div class="layui-inline" style="width: 85px;">


                                        <label class="layui-form-label">判定结论</label>


                                        <div class="layui-input-block" style="width:120px">


                                                <div class="layui-input-block" style="width:190px;">


                                            <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">


                                                <option value=""></option>


                                                <option value="合格">合格</option>


                                                <option value="不合格">不合格</option>


                                            </select>


                                        </div>


                                        


                                    </div>


                                    <div class="layui-inline">


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


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


                                        </button>


                                    </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" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">物料名称</label>


                                                <div class="layui-input-block" style="width:120px" >


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


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


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">质检员</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </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" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">生产名称</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </div>


                                            <div class="layui-inline">


                                                <label class="layui-form-label">工序流转卡</label>


                                                <div class="layui-input-block" style="width:120px">


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


                                                </div>


                                            </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" style="width:120px">


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


                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">


                                                    </select>


                                                </div>


                                            </div>


                                            <div class="layui-inline" style="width:120px">


                                            <div class="layui-inline">


                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">


                                                    <option value="0" selected="selected"></option>


                                                    <option value="=">=</option>


@@ -149,7 +146,7 @@


                                                    <option value="10">不包含</option>


                                                </select>


                                            </div> 


                                            <div class="layui-inline" style="width:120px">


                                            <div class="layui-inline" style="margin-left: 120px;">


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


                                            </div>


                                        </div>


@@ -792,7 +789,7 @@


                if (HBillNo)


                    sqlWhere += " and å•æ®å· like '%" + HBillNo+ "%'";


                if (HNumber)


                    sqlWhere += " and ç‰©æ–™ç¼–码 like '%" + HNumber + "%'";


                    sqlWhere += " and ç‰©æ–™ä»£ç  like '%" + HNumber + "%'";


                if (HName)


                    sqlWhere += " and ç‰©æ–™åç§° like '%" + HName + "%'";


                if (HModel)


@@ -802,11 +799,11 @@


                if (HName1)


                    sqlWhere += " and è´¨æ£€å‘˜åç§° like '%" + HName1 + "%'";


                if (HName2)


                    sqlWhere += " and æ£€éªŒé¡¹ç›® like '%" + HName2 + "%'";


                    sqlWhere += " and æ£€éªŒé¡¹ç›®åç§° like '%" + HName2 + "%'";


                if (HName3)


                    sqlWhere += " and ç”Ÿäº§èµ„源名称 like '%" + HName3 + "%'";


                if (HProcExchBillNo)


                    sqlWhere += " and å·¥åºæµè½¬å¡ like '%" + HProcExchBillNo + "%'";


                    sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";




                if (HDate1) {


                    sqlWhere += " and æ—¥æœŸ >= '" + HDate1 + "'";