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

yusijie

2024-01-11 158efa85c58bbefeff3e1419c23d22a88f2dac26

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

 WebTM/WebTM.csproj

@@ -643,6 +643,7 @@
    <Content Include="views\grf\销售订单变更单2.grf" />
    <Content Include="views\grf\不良类型.grf" />
    <Content Include="views\grf\异常类型.grf" />
    <Content Include="views\grf\生产订单领料状态报表.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>

 WebTM/views/grf/Éú²ú¶©µ¥ÁìÁÏ״̬±¨±í.grf

New file
@@ -0,0 +1,236 @@
{
    "Version":"6.5.0.0",
    "Title":"1a.简单表格",
    "Author":"锐浪报表软件",
    "Description":"演示一个最基本的列表报表。",
    "Font":{
        "Name":"宋体",
        "Size":90000,
        "Weight":400,
        "Charset":134
    },
    "Printer":{
        "LeftMargin":1,
        "TopMargin":1,
        "RightMargin":1,
        "BottomMargin":1
    },
    "DetailGrid":{
        "FixCols":20,
        "AppendBlankRow":true,
        "AppendBlankRowAtLast":true,
        "AppendBlankCol":true,
        "AppendBlankColWidth":40,
        "GrowToBottom":true,
        "Recordset":{
            "Field":[
                {
                    "Name":"生产订单"
                },
                {
                    "Name":"日期"
                },
                {
                    "Name":"车间"
                },
                {
                    "Name":"物料编码"
                },
                {
                    "Name":"物料名称"
                },
                {
                    "Name":"规格型号"
                },
                {
                    "Name":"计量单位"
                },
                {
                    "Name":"数量"
                },
                {
                    "Name":"订单状态"
                },
                {
                    "Name":"领料状态"
                }
            ]
        },
        "Column":[
            {
                "Name":"Column1",
                "Width":3.175
            },
            {
                "Name":"Column2",
                "Width":3.59833
            },
            {
                "Name":"Column3",
                "Width":2.98979
            },
            {
                "Name":"Column4",
                "Width":3.38667
            },
            {
                "Name":"Column5",
                "Width":3.01625
            },
            {
                "Name":"Column6"
            },
            {
                "Name":"Column7"
            },
            {
                "Name":"Column8"
            },
            {
                "Name":"Column9"
            },
            {
                "Name":"Column10"
            }
        ],
        "ColumnContent":{
            "Height":0.608542,
            "ColumnContentCell":[
                {
                    "Column":"Column1",
                    "DataField":"生产订单"
                },
                {
                    "Column":"Column2",
                    "DataField":"日期"
                },
                {
                    "Column":"Column3",
                    "DataField":"车间"
                },
                {
                    "Column":"Column4",
                    "DataField":"物料编码"
                },
                {
                    "Column":"Column5",
                    "DataField":"物料名称"
                },
                {
                    "Column":"Column6",
                    "DataField":"规格型号"
                },
                {
                    "Column":"Column7",
                    "DataField":"计量单位"
                },
                {
                    "Column":"Column8",
                    "DataField":"数量"
                },
                {
                    "Column":"Column9",
                    "DataField":"订单状态"
                },
                {
                    "Column":"Column10",
                    "DataField":"领料状态"
                }
            ]
        },
        "ColumnTitle":{
            "Height":0.608542,
            "ColumnTitleCell":[
                {
                    "GroupTitle":false,
                    "Column":"Column1",
                    "TextAlign":"TopCenter",
                    "Text":"生产订单"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column2",
                    "TextAlign":"TopCenter",
                    "Text":"日期\r\n"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column3",
                    "TextAlign":"TopCenter",
                    "Text":"车间"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column4",
                    "TextAlign":"TopCenter",
                    "Text":"物料编码"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column5",
                    "TextAlign":"TopCenter",
                    "Text":"物料名称"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column6",
                    "TextAlign":"MiddleCenter",
                    "Text":"规格型号"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column7",
                    "TextAlign":"MiddleCenter",
                    "Text":"计量单位"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column8",
                    "TextAlign":"MiddleCenter",
                    "Text":"数量"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column9",
                    "TextAlign":"MiddleCenter",
                    "Text":"订单状态"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column10",
                    "TextAlign":"MiddleCenter",
                    "Text":"领料状态"
                }
            ]
        }
    },
    "ReportHeader":[
        {
            "Name":"ReportHeader2",
            "Height":2.01083,
            "Control":[
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox1",
                    "Left":7.19667,
                    "Top":0.608542,
                    "Width":6.61458,
                    "Height":0.582083,
                    "Font":{
                        "Name":"宋体",
                        "Size":157500,
                        "Weight":400,
                        "Charset":134
                    },
                    "Text":"生产订单领料状态报表"
                }
            ]
        }
    ],
    "ReportFooter":[
        {
            "Name":"ReportFooter1",
            "Height":1.5875
        }
    ]
}

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_ProdOrderPickingStatusReport.html

@@ -14,6 +14,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
@@ -98,6 +99,8 @@
                        <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="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-radio"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm"  id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>-->
                            </div>
@@ -109,6 +112,7 @@
    </div>

    <script>
        var OptionData = [];
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -128,6 +132,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var ins;//存储数据  å¯¼å‡ºåŠŸèƒ½éœ€è¦ç”¨åˆ°çš„参数
            var HModName = "Sc_ProdOrderPickingStatusReport";
            //#endregion

@@ -148,6 +153,12 @@
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //导出按钮
                    case 'btn_Export': get_Export();
                        break;
                    //打印
                    case 'btn-print': get_PrintReport();
                        break;
                };
            });
@@ -234,6 +245,8 @@
                            option.cols = [col];
                            option.data = data1.data;
                            table.render(option);
                            ins = table.render(option);

                            layer.close(wait);
                        } else {
                            layer.close(wait);
@@ -274,6 +287,57 @@
                $("#HMaterModel").val("");
                sWhere = " ";
                get_FastQuery();
            }

            //导出Execel
            function get_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }

            //打印
            function get_PrintReport() {

                var data = table.cache['mainTable']
                if (data.length > 0) {
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=0&MyMsg=0&Type=Sc_ProdOrderPickingStatusReport', 'yes']
                        , resize: false
                        , end: function () {
                            if (OptionData.length > 0) {
                                var GrfName = OptionData[0].HName;

                                var dataPrint = [];
                                for (var i = 0; i < data.length; i++) {
                                    dataPrint.push(data[i])
                                }

                                var Customer = {
                                    "Table": dataPrint
                                }

                                var args = {
                                    type: "preview",
                                    //showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可
                                    report: urlAddRandomNo("../../grf/" + GrfName + ".grf"),
                                    data: Customer
                                };

                                webapp_ws_ajax_run(args);
                                OptionData = [];
                            }

                        }
                    })
                } else {
                    layer.msg("无数据,无法打印!");
                }

            }

            //物料
@@ -410,6 +474,10 @@

            //#endregion
        });
        //双击返回生产资源
        function ReportPrint(data) {
            OptionData = data
        }
    </script>
</body>
</html>

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/BadQueryReport.html

@@ -186,6 +186,11 @@
            get_FastQuery();
        });

        //重置
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });

        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法
@@ -248,9 +253,9 @@
                            }
                        }
                        table.render(option1);
                        if ($("#HBardCode").val() != "" && data1.data.length != 0) {
                            $("#HICMOBillNo").val(data1.data[0]["生产订单号"]);
                            $("#HProcExchBillNo").val(data1.data[0]["流转卡"]);
                        if ($("#HMaterNumber").val() != "" && data1.data.length != 0) {
                            $("#HMaterName").val(data1.data[0]["物料名称"]);
                            $("#HMaterModel").val(data1.data[0]["物料规格"]);
                        }


@@ -506,6 +511,20 @@
            sWhere = "";//调用接口后清空sWhere缓存
        }


        function set_ClearQuery() {
            $("#HMaterNumber").val("");
            $("#HMaterName").val("");
            $("#HMaterModel").val("");
            $("#HBatchNo").val("");
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            form.render('select');

            sWhere = "";
        }

        //隐藏列设置
        function get_HideColumn() {
            var colName = "";

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA.html

@@ -37,7 +37,7 @@
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnAdd">新增</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnCancel">退出</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49.5%; float: left; background-color: white;height:430px;">
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49.5%; float: left; background-color: white;height:450px;">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">当前工单</li>
                        </ul>
@@ -96,10 +96,13 @@
                                        </div>
                                        <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" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;" readonly>
                                                    <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
                                                <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">生产资源</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
@@ -118,10 +121,25 @@
                                                </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" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;" readonly>
                                                    <input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess" value="0">
                                                <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">维修工序</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" name="HProName" id="HProName" lay-verify="HProName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" class="layui-input" name="HProcess" lay-verify="HProcess" id="HProcess" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcess" id="btnHProcess" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">不良工序</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" name="HBadProcName" id="HBadProcName" lay-verify="HBadProcName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" class="layui-input" name="HBadProcID" lay-verify="HBadProcID" id="HBadProcID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBadProc" id="btnHBadProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
                                            </div>
                                        </div>
@@ -156,7 +174,7 @@
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab" style="width: 50%; float: left; background-color: white; margin-left: 0.5%; height: 430px;">
                    <div class="layui-tab" style="width: 50%; float: left; background-color: white; margin-left: 0.5%; height: 450px;">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">采集信息</li>
                        </ul>
@@ -205,10 +223,13 @@
                                                </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="HBadTypeName" lay-verify="HBadTypeName" id="HBadTypeName" style="background-color:#efefef4d;" readonly>
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">不良类型</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" lay-verify="HBadTypeName" name="HBadTypeName" id="HBadTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HBadTypeID" id="HBadTypeID" lay-verify="HBadTypeID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBadTypeID" id="btnHBadTypeID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
                                            </div>
                                        </div>
@@ -218,7 +239,7 @@
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" lay-verify="HBadResultName" name="HBadResultName" id="HBadResultName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HBadResultID" id="HBadResultID" lay-verify="HBadResultID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadResult" id="btnSearchHBadResult" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBadResult" id="btnHBadResult" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
@@ -349,6 +370,19 @@
            $('#HBarCodeSN').on('keydown', function (event) {
                var HBarCode = $('#HBarCodeSN').val();
                if (event.keyCode == 13) {
                    if ($("#HSourceID").val() == "0") {
                        layer.msg("生产资源不能为空！")
                        return;
                    }
                    if ($("#HProcess").val() == "0"){
                        layer.msg("维修工序不能为空！")
                        return;
                    }
                    if ($("#HBadProcID").val() == "0"){
                        layer.msg("不良工序不能为空！")
                        return;
                    }

                    if (!HBarCode) {
                        layer.msg("条形码不能为空！")
                        return;
@@ -373,9 +407,36 @@
                get_checkSearchHBadReason();
            });

            //选择不良类型按钮
            form.on('submit(btnHBadTypeID)', function () {
                get_btnHBadTypeID();
            });

            //选择不良后果按钮
            form.on('submit(btnHBadResult)', function () {
                btnHBadResult();
            });


            // æ¢é…ä»¶
            form.on('submit(ChangeMater)', function (data) {
                get_checkSearchChangeMater();
            });


            //选择生产资源
            form.on('submit(btnHSource)', function () {
                btnHSource();
            });

            //选择维修工序按钮
            form.on('submit(btnHProcess)', function () {
                btnHProc(0);
            });

            //选择不良工序按钮
            form.on('submit(btnHBadProc)', function () {
                btnHProc(1);
            });

            //子表行内事件
@@ -738,6 +799,64 @@
                }
            }

            //生产资源选择页面
            function btnHSource() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '生产资源列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Source.html', 'yes']
                    , 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('请选择数据');
                        }
                        //获取数据
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);

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

            //工序选择页面
            function btnHProc(num) {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工序列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                    , 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 != 1) {
                            return layer.msg('请选择一条数据');
                        }
                        if (num == 0) {
                            //获取数据
                            $("#HProcess").val(checkStatus.data[0].HItemID);//
                            $("#HProName").val(checkStatus.data[0].工序名称);//
                        } else if (num == 1) {
                            $("#HBadProcID").val(checkStatus.data[0].HItemID);//
                            $("#HBadProcName").val(checkStatus.data[0].工序名称);//
                        }
                       

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

            //不良原因选择页面
            function get_checkSearchHBadReason() {
                layer.open({
@@ -767,6 +886,64 @@
                })
            }

            //不良类型选择
            function get_btnHBadTypeID() {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"                           //加上边框
                    , title: "不良类型列表"                             //标题
                    , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2                                          //弹出动画
                    , area: ["90%", "90%"]                              //窗体大小
                    , maxmin: true                                      //设置最大最小按钮是否显示
                    , content: ["../../../views/基础资料/生产基础资料/Gy_BadType.html", "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                        if (checkStatus.data.length != 1) {
                            return layer.msg("请选择一条数据");
                        }

                        $("#HBadTypeID").val(checkStatus.data[0].HItemID);//内码
                        $("#HBadTypeName").val(checkStatus.data[0].不良类型名称);//名称
                        layer.close(index);//关闭弹窗
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //不良后果选择
            function btnHBadResult() {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"                           //加上边框
                    , title: "不良后果列表"                             //标题
                    , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2                                          //弹出动画
                    , area: ["90%", "90%"]                              //窗体大小
                    , maxmin: true                                      //设置最大最小按钮是否显示
                    , content: ["../../../views/基础资料/生产基础资料/Gy_BadResult.html", "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                        if (checkStatus.data.length != 1) {
                            return layer.msg("请选择一条数据");
                        }

                        $("#HBadResultID").val(checkStatus.data[0].HItemID);//内码
                        $("#HBadResultName").val(checkStatus.data[0].不良后果名称);//名称
                        layer.close(index);//关闭弹窗
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //换配件页面
            function get_checkSearchChangeMater() {
                var HBarCode = $("#HBarCode").val();

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/RetrospectiveQueryReport.html

@@ -223,6 +223,11 @@
            get_FastQuery();
        });

        //重置
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });

        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法
@@ -666,6 +671,8 @@
                com = " and (" + ColName + " " + com + ")";
            }

            sWhere += com;

            get_Display2(sWhere);
            get_Display5(sWhere);
            if (HBardCode != "") {
@@ -678,6 +685,18 @@
            sWhere = "";//调用接口后清空sWhere缓存
        }

        function set_ClearQuery() {
            $("#HICMOBillNo").val("");
            $("#HBardCode").val("");
            $("#HProcExchBillNo").val("");
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            form.render('select');

            sWhere = "";
        }

        //隐藏列设置
        function get_HideColumn() {
            var colName = "";