合并

ch

2022-09-21 e9d28ac1e750d4321f0b7a73a723931c3d732998

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sb_MouldRepairWorkBillList.html

@@ -136,12 +136,14 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sb_MouldRepairWorkBillList";
            var col = [];
            var titleData = ["hmainid","单据ID", "单据类型", "HMouldID", "HEquipID", "HEmpID", "HManagerID", "HDeptID", "HSupID", "hsubid", "HRepairID", "源单主内码", "源单子内码", "HBillType"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion
     
            //初始化页面加载
            set_ClearBill();
            //初始化表格
            DisPlay_HideColumn();
            ////初始化表格
            //DisPlay_HideColumn();

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //头工具栏事件
@@ -277,26 +279,65 @@
            //查询
            function get_Display(sWhere) {
                var index = layer.load(0);
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },                    
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            for (var i = 0; i < data.length; i++) {
                                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 });
                                    }
                                }
                            }

                            //在列表左边添加勾选框
                            col.unshift({ type: 'checkbox', fixed: 'left' })
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            layer.close(index);

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

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(index);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }

                });
            }

@@ -587,10 +628,10 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["单据ID", "单据类型", "HMouldID", "HEquipID", "HEmpID", "HManagerID", "HDeptID", "HSupID", "hsubid", "HRepairID", "源单主内码", "源单子内码", "HBillType"];//不需要显示的字段 å¯æ‰©å±•
                            /*var titleData = ["单据ID", "单据类型", "HMouldID", "HEquipID", "HEmpID", "HManagerID", "HDeptID", "HSupID", "hsubid", "HRepairID", "源单主内码", "源单子内码", "HBillType"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');

                            
                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                //在数据不为空的情况下进行分割，否则报错
                                if (dataCol[i]) {