送测登记台账,增加超链接,增加人员履历报表,报表跳转工艺参数根据传入参数进行筛选,技能考核增加事业部字段

zrg

2024-10-18 01f011755efdd6a210d086bb57827396630feda0

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_TechnologyParameterList.html

@@ -115,6 +115,8 @@
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            var HProcName = "";
            var HMaterName = "";
            var Organization = sessionStorage["Organization"]
            var HModName = "Gy_TechnologyParameterList";
            //不需要显示的字段 å¯æ‰©å±•
@@ -122,6 +124,11 @@
            var params = get_UrlVars();
            var Type = params[params[0]] == null ? "HTechParam" : params[params[0]];
            var OperationType = params[params[1]] == null ? 1 : params[params[1]];  //1为直接列表模块打开  2为从其他模块打开基础资料列表
            var HEquipNumber = params[params[2]] == null ? "" : params[params[2]];  //设备
             HProcName = params[params[3]] == null ? "" : params[params[3]];  //工序
             HMaterName = params[params[4]] == null ? "" : params[params[4]];  //物料
            HProcName = decodeURI(HProcName);
            HMaterName = decodeURI(HMaterName);
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
@@ -142,7 +149,17 @@
            set_InitGrid();

            //加载数据到网格
            get_Display(sWhere);
            if (OperationType == 2) {
                sWhere = {
                    HEquipNumber: HEquipNumber,
                    HProcName: HProcName,
                    HMaterName: HMaterName
                }
                get_Display1(JSON.stringify(sWhere));
            } else {
                get_Display(sWhere);
            }
           
            
            //#endregion

@@ -391,6 +408,78 @@
                layer.close(wait);
            }
            //#endregion

            //#region å…¶ä»–页面自动过滤工艺参数   ç‰©æ–™+工序+设备
            function get_Display1(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                //加载数据到网格
                $.ajax({
                    url: GetWEBURL() + '/Gy_TechnologyParameter/list1',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, 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: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);

                            if ($("#ColName option").length < 1) {
                                ColFilter();                               
                            }
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                layer.close(wait);
            }
            //#endregion

            //#region æ–°å¢ž
            function set_AddNew() {
                layer.open({