spc质量报表

yangle

2024-07-01 772f5bd3cba63a4cb007e12ccb3975834a795fd6

spc质量报表

 WebTM/App_Data/MssqlReportData.cs

@@ -21,6 +21,7 @@
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YSJ测试
    //public const string SqlConnStr = "Data Source=10.11.18.195;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";  //斯莫尔
    public const string SqlConnStr = "Data Source=30.10.7.6;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";  //斯莫尔
    //public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//帅威
    //public const string SqlConnStr = "Data Source=192.168.1.250;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//乔一
    //public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//乔一测试
@@ -29,7 +30,7 @@
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//雅琪诺测试
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特
    //public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪
    public const string SqlConnStr = "Data Source=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//九菱电机
    //public const string SqlConnStr = "Data Source=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//九菱电机

    //public string sServer;
    //public string sDataBase;

 WebTM/WebTM.csproj

@@ -954,6 +954,15 @@
    <Content Include="views\grf\销售调价单不含税.grf" />
    <Content Include="views\grf\销售调价单含税（仅限含税打印）.grf" />
    <Content Include="views\grf\销售退货单测试1.grf" />
    <Content Include="views\grf\aaa.grf" />
    <Content Include="views\grf\包装单物料标识卡%28网页版%29.grf" />
    <Content Include="views\grf\包装单物料标识卡%28网页版%291.grf" />
    <Content Include="views\grf\物料条码%28七行纸大%29_五云.grf" />
    <Content Include="views\grf\白标打印.grf" />
    <Content Include="views\grf\组托单物料标识卡%28网页版%29.grf" />
    <Content Include="views\grf\送货单%28A4纸%29.grf" />
    <Content Include="views\grf\送货单%28标签纸%29.grf" />
    <Content Include="views\grf\送货单.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>

 WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldLowerBillEdit_PDA.html

@@ -439,7 +439,7 @@
                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//保存后保存按钮禁用
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Sc_MouldUpperBill/SaveAddSc_MouldLowerBill_PDA",
                    url: GetWEBURL() + "Sc_MouldUpperBill/AddSc_MouldLowerBill_PDA",
                    async: true,
                    data: { "oMain": oMain },
                    dataType: "json",

 WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldUpperBillEdit_PDA.html

@@ -441,7 +441,7 @@
                                     $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//保存后保存按钮禁用
                            $.ajax({
                                type: "POST",
                                url: GetWEBURL() + "Sc_MouldUpperBill/SaveAddSc_MouldUpperBill_PDA",
                                url: GetWEBURL() + "Sc_MouldUpperBill/AddSc_MouldUpperBill_PDA",
                                async: true,
                                data: { "oMain": oMain },
                                dataType: "json",

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_InspectionFormReport.html

@@ -15,6 +15,7 @@
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
@@ -55,9 +56,11 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">工序</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HProcName" id="HProcName">
                                    <label class="layui-form-label">样本数</label>
                                    <div class="layui-input-block">
                                        <select name="limit" id="limit" lay-verify="required" lay-search class="layui-input">
                                            <!--动态渲染车间-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -69,21 +72,25 @@
                                    <div class="layui-row" style="margin-top:10px;">
                                        <!--其他条件-->
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料代码</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
                                                <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </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="HMaterName" id="HMaterName">
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
                                            </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="HMaterModel" id="HMaterModel">
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -95,9 +102,13 @@
                                    </div>
                                    <div class="layui-row" style="margin-top:5px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">检验项目</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验项目</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCheckItem" id="HCheckItem">
                                                <input type="hidden" class="layui-input" lay-verify="HQCCheckItemID" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
                                                <input type="text" class="layui-input" name="HQCCheckItemNumber" id="HQCCheckItemNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHQCCheckItemID" id="btnHQCCheckItemID" style="padding: 0 10px;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -175,7 +186,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {

            //#region å…¬å…±å˜é‡
            var $ = layui.$
@@ -187,6 +198,7 @@
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
                , soulTable = layui.soulTable
            //查询条件
            var sWhere = "";
            var option = [];
@@ -215,6 +227,19 @@
                        break;
                };
            });

            //#region äº§å“ç¼–码
            form.on('submit(btnHMaterID)', function (data) {
                btnHMaterID();
            });
        //#endregion

            //#region æ£€éªŒé¡¹ç›®
            form.on('submit(btnHQCCheckItemID)', function (data) {
                btnHQCCheckItemID();
            });
        //#endregion

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
@@ -269,101 +294,74 @@
            //初始化界面
            function set_ClearBill() {
                get_Dept();
                get_Limit();
                //初始化时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                //初始化表格
                set_InitGrid();
                //加载数据到网格
                get_Display();
                //get_FastQuery();
                DisPlay_HideColumn();
                set_Line();
                //set_Line();
            }

            //初始化表格
            function set_InitGrid() {
                var columns = [];

                columns.push({ type: 'numbers', title: '序号' });
            
                //获取两个月期之间的相差
                var time1 = Date.parse(new Date($("#HBeginDate").val()));//开始时间
                var time2 = Date.parse(new Date($("#HEndDate").val()));//结束时间
                var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
                //获取年
                var yyyy = new Date($("#HBeginDate").val()).getFullYear();
                //获取月份
                var MM = new Date($("#HBeginDate").val()).getMonth() + 1;
                //获取开始月份的最大天数
                var SumMonth = new Date(yyyy, MM, 0).getDate(); //动态两月之差
                //获取开始日期的天数
                var HBEGINDATE = new Date(new Date($("#HBeginDate").val())).getDate(); //获取开始日期天数

                var k = 0;//收集循环次数
                for (var j = 0; j <= (Days - k); j++) {
                    columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
                    //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                    if (MM == 12 && (HBEGINDATE + j) == 31) {
                        yyyy += 1;
                        MM = 1;
                        SumMonth = new Date(yyyy, MM, 0).getDate();
                        HBEGINDATE = 0;
                        k += j;
                        j = 0;
                    } else if ((HBEGINDATE + j) == SumMonth) { //跨月 æœˆæ•°åŠ ä¸€  å¤©æ•°ä»Žä¸€å¼€å§‹
                        HBEGINDATE = 0;
                        MM += 1;
                        SumMonth = new Date(yyyy, MM, 0).getDate();
                        k += j;
                        j = 0;
                    }
                }

                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-430'
                    //, page: true
                    , height: 'full-50'
                    , cellMinWidth: 90
                    , limit: 500
                    , totalRow: true
                    , cellMinWidth: 70
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left', totalRowText: '∑X' }
                        ,{ field: 'xh', title: '序号' }
                        , { field: '1', title: '1' , totalRow: true}
                        , { field: '2', title: '2' , totalRow: true}
                        , { field: '3', title: '3' , totalRow: true}
                        , { field: '4', title: '4' , totalRow: true}
                        , { field: '5', title: '5' , totalRow: true}
                        , { field: '6', title: '6' , totalRow: true}
                        , { field: '7', title: '7' , totalRow: true}
                        , { field: '8', title: '8' , totalRow: true}
                        , { field: '9', title: '9', totalRow: true}
                        , { field: '10', title: '10' , totalRow: true}
                        , { field: '11', title: '11' , totalRow: true}
                        , { field: '12', title: '12' , totalRow: true}
                        , { field: '13', title: '13' , totalRow: true}
                        , { field: '14', title: '14' , totalRow: true}
                        , { field: '15', title: '15' , totalRow: true}
                        , { field: '16', title: '16' , totalRow: true}
                        , { field: '17', title: '17' , totalRow: true}
                        , { field: '18', title: '18' , totalRow: true}
                        , { field: '19', title: '19' , totalRow: true}
                        , { field: '20', title: '20' , totalRow: true}
                        , { field: '21', title: '21' , totalRow: true}
                        , { field: '22', title: '22' , totalRow: true}
                        , { field: '23', title: '23' , totalRow: true}
                        , { field: '24', title: '24' , totalRow: true}
                        , { field: '25', title: '25', totalRow: true}
                    ]]
                    , data: []
                }
                var sj = [];
                for (let i = 0; i < 5; i++) {
                    var obj = {
                        xh : i+1,
                        1: (Math.random() * (15 - 13) ).toFixed(2),
                        2: (Math.random() * (15 - 13) ).toFixed(2),
                        3: (Math.random() * (15 - 13) ).toFixed(2),
                        4: (Math.random() * (15 - 13) ).toFixed(2),
                        5: (Math.random() * (15 - 13) ).toFixed(2),
                        6: (Math.random() * (15 - 13) ).toFixed(2),
                        7: (Math.random() * (15 - 13) ).toFixed(2),
                        8: (Math.random() * (15 - 13) ).toFixed(2),
                        9: (Math.random() * (15 - 13) ).toFixed(2),
                        10: (Math.random() * (15 - 13) ).toFixed(2),
                        11: (Math.random() * (15 - 13) ).toFixed(2),
                        12: (Math.random() * (15 - 13) ).toFixed(2),
                        13: (Math.random() * (15 - 13) ).toFixed(2),
                        14: (Math.random() * (15 - 13) ).toFixed(2),
                        15: (Math.random() * (15 - 13) ).toFixed(2),
                        16: (Math.random() * (15 - 13) ).toFixed(2),
                        17: (Math.random() * (15 - 13) ).toFixed(2),
                        18: (Math.random() * (15 - 13) ).toFixed(2),
                        19: (Math.random() * (15 - 13) ).toFixed(2),
                        20: (Math.random() * (15 - 13) ).toFixed(2),
                        21: (Math.random() * (15 - 13) ).toFixed(2),
                        22: (Math.random() * (15 - 13) ).toFixed(2),
                        23: (Math.random() * (15 - 13) ).toFixed(2),
                        24: (Math.random() * (15 - 13) ).toFixed(2),
                        25: (Math.random() * (15 - 13) ).toFixed(2)
                    };
                    sj.push(obj);
                }
                option.data = sj;


                    , loading: false
                    , cols: [columns]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
                };
                table.render(option);
            }

            //加载网格
            function get_Display(sWhere) {
                sWhere = $("#HYear").val();
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/QC_CustomerAppealReport/QC_InspectionFormReport',
@@ -371,34 +369,8 @@
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '汇总' });
                            //判断是否是纯英文
                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
                            for (var i = 0; i < data.length; i++) {
                                if (!patrn.test(data[i].name)) {
                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //隐藏列
                                }
                                else {
                                    switch (data[i].Type) {
                                        case 'DateTime':
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                    }
                                }
                            }

                            option.cols = [col];
                            option.data = data1.data;

                            table.render(option);
                            layer.close(wait);
                        } else {
@@ -563,18 +535,8 @@
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            if (sessionStorage["OrganizationID"] == 100014) {
                                HDeptName += '<option  style="color:blue;"  value="2679633" >水箱一条流</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592361" >部件油冷器巴</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592371" >小车装芯巴</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592374" >小车总成巴</option>';
                                HDeptName += '<option  style="color:blue;"  value="1743766" >卡车装芯巴</option>';
                                HDeptName += '<option  style="color:blue;"  value="1743767" >卡车总成巴</option>';
                                HDeptName += '<option  style="color:blue;"  value="2679647" >卡车水箱一条流</option>';
                            } else {
                                for (var i = 0; i < data.length; i++) {
                                    HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                                }
                            for (var i = 0; i < data.length; i++) {
                                HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                            }

                            $("#HDeptName").append(HDeptName);
@@ -585,70 +547,104 @@
                })
            }

            //样本数量
            function get_Limit() {
                var limit = "";
                for (var i = 1; i <= 50; i++) {
                    limit += '<option  style="color:blue;"  value="' + i + '" >' + i + '</option>';
                }
                $("#limit").append(limit);
                form.render('select');
            }

            //快速过滤
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//流转卡号
                var HICMOBillNo = $("#HICMOBillNo").val(); //批号
                var HWorkShopID = $("#HDeptName").val();//车间
                var F_BSV_WYID = $("#F_BSV_WYID").val();//唯一ID
                var HMaterNumber = $("#HMaterNumber").val();//物料代码
                var HState = $("#HState").val();//状态
                var HSTATUS = $("#HSTATUS").val();//生产订单状态
                var HOrgID = sessionStorage["OrganizationID"];
                var checkWRuku = $("input[name='checkWRuku']").prop("checked");//复选框
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var sWhere1 = "";
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like''%" + ColContent + "%''";
                            break;
                        case "8":
                            com = "like''%" + ColContent + "''";
                            break;
                        case "9":
                            com = "like''" + ColContent + "%''";
                            break;
                        case "10":
                            com = "not like''%" + ColContent + "%''";
                            break;
                        default:
                            com = "" + Comparator + "''" + ColContent + "''";
                            break;
                    }
                    sWhere1 += " and " + ColName + " " + com;
                var HDeptID = $("#HDeptName").val();//车间
                var limit = $("#limit").val();//样本数
                var HMaterID = $("#HMaterID").val();//物料
                var HQCCheckItemID = $("#HQCCheckItemID").val();//检验项目

                if (limit == 0) {
                    return layer.msg("样本数量不能为0!");
                }

                if (checkWRuku) {
                    checkWRuku = 1;
                } else {
                    checkWRuku = 0;
                if (HMaterID == 0) {
                    return layer.msg("物料不能为空!");
                }

                if (HQCCheckItemID == 0) {
                    return layer.msg("检验项目不能为空!");
                }

                sWhere = {
                    HBeginDate: HBeginDate
                    , HEndDate: HEndDate
                    , HICMOBillNo: HICMOBillNo
                    , HWorkShopID: HWorkShopID
                    , F_BSV_WYID: F_BSV_WYID
                    , HMaterNumber: HMaterNumber
                    , HOrgID: HOrgID
                    , HBillNo: HBillNo
                    , IsTrue: checkWRuku
                    , HState: HState
                    , HSTATUS: HSTATUS
                    , sWhere1: sWhere1
                    , HDeptID: HDeptID
                    , limit: limit
                    , HMaterID: HMaterID
                    , HQCCheckItemID: HQCCheckItemID
                }

                //get_Display(JSON.stringify(sWhere));
                get_Display(JSON.stringify(sWhere));
                //调用接口后清空sWhere缓存
                sWhere = "";
            }

            //物料列表
            function btnHMaterID() {
                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , area: ['90%', '90%']//大小
                    , title: '物料列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Material.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('请选择数据');
                        }
                        //获取数据
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);
                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        $("#HMaterModel").val(checkStatus.data[0].规格型号);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //检验项目列表
            function btnHQCCheckItemID() {
                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , area: ['90%', '90%']//大小
                    , title: '检验项目列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_CheckItem.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('请选择数据');
                        }
                        //获取数据
                        $("#HQCCheckItemID").val(checkStatus.data[0].HItemID);
                        $("#HQCCheckItemNumber").val(checkStatus.data[0].代码);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }


            //重置过滤条件
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//开始日期
@@ -666,32 +662,6 @@
                $("input[name='checkWRuku']").prop("checked", false);
                form.render()
                sWhere = "";
            }

            //物料
            function get_btnHMaterID() {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '物料'
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../Baseset/基础资料/Gy_MaterialList.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('请选择数据');
                        }
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                })
            }

            //隐藏列设置

 WebTM/views/³µ¼ä¹ÜÀí/²úÏß/MES_ProductionLinePackaging.html

@@ -39,6 +39,7 @@
                            </div>
                        </div>
                        <button type="button" lay-submit="" lay-filter="Print" id="Print" class="layui-btn layui-btn-radius">打印</button>
                        <button type="button" lay-submit="" lay-filter="Print2" id="Print2" hidden="hidden" ></button>
                        <div class="layui-inline" style="width: 200px;">
                            <div class="layui-input-block">
                                <select name="PrintName" lay-verify="required" id="PrintName">
@@ -1028,7 +1029,7 @@
            });

            //打印按钮
            form.on('submit(Print)', function (data) {//退出
            form.on('submit(Print2)', function (data) {//退出
                //打开打印模板
                var linterid = $("#HInterID").val();
                //var linterid = "28973";
@@ -1089,6 +1090,17 @@
                })
            });

            //打印按钮
            form.on('submit(Print)', function (data) {//退出
                //打开打印模板
                var linterid = $("#HInterID").val();
                var Type = "HBarCodePrint";
                var OpenTmp = "白标打印1";
                //var ReportViewer = document.getElementById("ReportViewer");
                window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                $("#Print2").click();
            });

            //监听表格中行工具事件
            table.on('tool(smjl-table)', function (obj) { //注：tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                var data = obj.data //获得当前行数据

 WebTM/views/³µ¼ä¹ÜÀí/²úÏß/MES_ProductionLinePackagingList.html

@@ -445,7 +445,7 @@
                ////var linterid = $("#HInterID").val();
                ////var linterid = "28973";
                var Type = "HBarCodePrint";
                var OpenTmp = "白标打印";
                var OpenTmp = "白标打印1";
                //var ReportViewer = document.getElementById("ReportViewer");
                window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
            });

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_CF.html

@@ -158,6 +158,14 @@
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">项目号</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">摘要</label>
                                                <div class="layui-input-inline">
                                                    <textarea placeholder="请输入摘要" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
@@ -166,7 +174,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">备注</label>
                                                <div class="layui-input-inline">
                                                    <textarea placeholder="请输入备注" class="layui-textarea" name="HRemark" id="HRemark"   style="background-color:#efefef4d;" readonly></textarea>
                                                    <textarea placeholder="请输入备注" class="layui-textarea" name="HRemark" id="HRemark" style="background-color:#efefef4d;" readonly></textarea>
                                                </div>
                                            </div>
                                        </div>
@@ -406,6 +414,7 @@
                            , "HWorkShopID": d.data[0].HWorkShopID
                            , "HExplanation": d.data[0].摘要
                            , "HRemark": d.data[0].表头备注
                            , "HProjectNum": d.data[0].项目号
                        });

                        layer.close(ajaxLoad);