Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js
===================================================================
diff -u -r24898 -r24907
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24898)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24907)
@@ -31,8 +31,8 @@
 
     }
 })
-var grid,grid01,grid02,grid03,dataView,dataView1;
-var options = {
+var grid,grid01,grid02,grid03,dataView,dataView1,options;
+options = {
     enableCellNavigation: true,
     enableColumnReorder: false,
     rowHeight: 35,
@@ -43,54 +43,8 @@
     enableForHeaderCells:true
 };
 var data =[],columns = [],visibleColumns = [];
-//动态计算表格列宽
-var DATAGRID_MIN_HEIGHT = 0;
-var DATAGRID_MIN_WIDTH = 300;
-var DATAGRID_BOTTOM_PADDING = 20;
-function attachAutoResizeDataGrid(grid, gridId, gridContainerId) {
-    var gridDomElm = $('#' + gridId);
-    if (!gridDomElm || typeof gridDomElm.offset() === "undefined") {
-        return null;
-    }
-    resizeToFitBrowserWindow(grid, gridId, gridContainerId);
-    $(window).on("resize", function () {
-        resizeToFitBrowserWindow(grid, gridId, gridContainerId);
-        resizeToFitBrowserWindow(grid, gridId, gridContainerId);
-    });
-}
-function destroyAutoResize() {
-    $(window).trigger('resize').off('resize');
-}
-function calculateGridNewDimensions(gridId, gridContainerId) {
-    // var availableHeight = $(window).height() - $('#' + gridId).offset().top - DATAGRID_BOTTOM_PADDING-$('#pager').height()-window.parent.$(".head-index").height()-window.parent.$(".content-index").height()-$('.gridBtn').height()+10;
-    var availableHeight = $(window).height() - $('#' + gridId).offset().top - DATAGRID_BOTTOM_PADDING-$('.content_body').height()-window.parent.$(".head-index").height()-window.parent.$(".content-index").height()+40
 
-    var availableWidth = $('#' + gridContainerId).width();
-    var newHeight = availableHeight;
-    var newWidth = availableWidth;
-    if (newHeight < DATAGRID_MIN_HEIGHT) {
-        newHeight = DATAGRID_MIN_HEIGHT;
-    }
-    if (newWidth < DATAGRID_MIN_WIDTH) {
-        newWidth = DATAGRID_MIN_WIDTH;
-    }
 
-    return {
-        height: newHeight,
-        width: newWidth
-    };
-}
-function resizeToFitBrowserWindow(grid, gridId, gridContainerId) {
-    var newSizes = calculateGridNewDimensions(gridId, gridContainerId);
-    if (newSizes) {
-        $('#' + gridId).height(newSizes.height);
-        $('#' + gridId).width(newSizes.width);
-        if (new RegExp('MSIE [6-8]').exec(navigator.userAgent) === null && grid) {
-            grid.resizeCanvas();
-        }
-    }
-}
-
 //主页
 function HomeList(){
     var checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"});
@@ -231,115 +185,199 @@
 
         }
     )
-    //将id列隐藏
-    for (var i = 0; i < columns.length; i++) {
-        if (i!=1){
-            visibleColumns.push(columns[i]);//将columns的列push进去
-        }
-    }
-    var mytranslation = {
-        pagelabel: "页",
-        currentpage: "当前页",
-        refresh: "刷新",
-        recordstatelabel: "显示",
-        currentrecords: "显示/隐藏当前记录状态",
-        perpage: "每页条数",
-        pageminus: "上一页",
-        pageplus: "下一页",
-        resultset_first: "第一页",
-        resultset_prev: "上一页",
-        resultset_next: "下一页",
-        resultset_last: "最后一页"
+
+    var options = {
+        enableCellNavigation: true,
+        enableColumnReorder: false,
+        forceFitColumns: true,
+        rowHeight:35,
     };
-    dataView = new Slick.Data.DataView({inlineFilters: true});
-    grid = new Slick.Grid("#myGrid", dataView, visibleColumns, options);
-    attachAutoResizeDataGrid(grid, "myGrid", "gridContainer");
-    grid.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
-    grid.registerPlugin(checkboxSelector);
-    var pagercontent =$("#pager");
-    var url=WWWROOT+'/disinfectSystem/useRecord/useRecordController/findUseRecordList.mhtml';
-    var search='',searchFields='',order ='desc';
-    function pageIng(remoteUrl,container,datagrid,pagerType,trans,params,order,search,searchFields){
-        new Slick.Controls.EnhancementPager({
-            container: container,
-            remoteUrl:remoteUrl,
-            datagrid: datagrid,
-            pagerType: pagerType,
-            trans: trans, //i18n support
-            params:params,
-            limt:25,
-            order:order,
-            search:search,
-            searchFields:searchFields,
+    //自适应
+    var DATAGRID_MIN_HEIGHT = 180;
+    var DATAGRID_MIN_WIDTH = 300;
+    var DATAGRID_BOTTOM_PADDING = 20;
+    function attachAutoResizeDataGrid(grid, gridId, gridContainerId) {
+        var gridDomElm = $('#' + gridId);
+        if (!gridDomElm || typeof gridDomElm.offset() === "undefined") {
+            return null;
+        }
+        resizeToFitBrowserWindow(grid, gridId, gridContainerId);
+        $(window).on("resize", function () {
+            resizeToFitBrowserWindow(grid, gridId, gridContainerId);
+            resizeToFitBrowserWindow(grid, gridId, gridContainerId);
         });
+
     }
-    pageIng(url,pagercontent,grid,'',mytranslation,'',order);
-    dataView.beginUpdate();
-    dataView.setItems(data);
-    dataView.endUpdate();
-    grid.render();
-    //事件
-    grid.onClick.subscribe(function(e, args){
-        var gridDatastr=[grid.getData()]
-        // console.log(gridDatastr)
-        var id=gridDatastr[0][args.row].id;
-        AjaxModal(id)
-        RecordGoodes(id)
-        grid.render();
-        $('.detailsId').val(id)
+    function destroyAutoResize() {
+        $(window).trigger('resize').off('resize');
+    }
+    function calculateGridNewDimensions(gridId, gridContainerId) {
+        var availableHeight = $(window).height() - $('#' + gridId).offset().top - DATAGRID_BOTTOM_PADDING-window.parent.$(".head-index").height()-window.parent.$(".content-index").height();
+        var availableWidth = $('#' + gridContainerId).width();
 
-    })
-    grid.onSort.subscribe(function (e, args) {
-        order=(args.sortCol.field, args.sortAsc ? 1 : -1);
-        var Thisvleu=$('#txtSearch').val();
-        pageIng(url,pagercontent,grid,'',mytranslation,'',order,Thisvleu,'');
-    });
-    grid.onSelectedRowsChanged.subscribe(function(e,args){
-        var selectedRows = args.rows;//点击选中的数据
-        if(selectedRows==''){
-            $('.DeleteInput').val('');
-            $('.detailsId').val('');
-        }else{
-            var itemId = new Array();
-            var GridData = grid.getData();//得到的数据
-            for (var i = 0; i < selectedRows.length; i++) {
-                itemId.push(GridData[selectedRows[i]].id)
-                $('.DeleteInput').val(JSON.stringify(itemId));
-                $('.detailsId').val(GridData[selectedRows[i]].id)
-                $('.detailsStatus').val(GridData[selectedRows[i]].status)
-            }
+        var newHeight = availableHeight;
+        var newWidth = availableWidth;
 
+        if (newHeight < DATAGRID_MIN_HEIGHT) {
+            newHeight = DATAGRID_MIN_HEIGHT;
         }
-    })
-    $("#txtSearch").keyup(function (e) {
-        if (e.which == 13) {
-            var Thisvleu=$(this).val();
-            pageIng(url,pagercontent,grid,'',mytranslation,'',order,Thisvleu,'');
+        if (newWidth < DATAGRID_MIN_WIDTH) {
+            newWidth = DATAGRID_MIN_WIDTH;
         }
-    });
-    //delete
-    $('.DeleteBtn').on('click',function(){
-        if($('.DeleteInput').val()==''){
-            alert('请选择一行数据');
+
+        return {
+            height: newHeight,
+            width: newWidth
+        };
+    }
+    function resizeToFitBrowserWindow(grid, gridId, gridContainerId) {
+        var newSizes = calculateGridNewDimensions(gridId, gridContainerId);
+        if (newSizes) {
+            $('#' + gridId).height(newSizes.height);
+            $('#' + gridId).width(newSizes.width);
+            if (new RegExp('MSIE [6-8]').exec(navigator.userAgent) === null && grid) {
+                grid.resizeCanvas();
+            }
+        }
+    }
+//配置
+    function isIEPreVer8() { var v = navigator.appVersion.match(/MSIE ([\d.]+)/i); return (v ? v[1] < 8 : false); }
+    var sortcol = "name";
+    var sortdir = 1;
+    var percentCompleteThreshold = 0;
+    var searchString = "";
+    function requiredFieldValidator(value) {
+        if (value == null || value == undefined || !value.length) {
+            return {valid: false, msg: "This is a required field"};
+        }
+        else {
+            return {valid: true, msg: null};
+        }
+    }
+    function myFilter(item, args) {
+        if (item["percentComplete"] < args.percentCompleteThreshold) {
             return false;
-        }else{
-            var idcards= $('.DeleteInput').val()
-            $('.deleteModalStr').click(function(){
-                $.ajax({
-                    url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/deleteUseRecord.mhtml?useRecordIds='+idcards,
-                    type:'get',
-                    dataType:'json',
-                    success:function(data){
-                        if(data.success===true){
-                            window.location.href = window.location.href;
-                        }else{
-                            alert(data.message)
+        }
+
+        if (args.searchString != "" && item["name"].indexOf(args.searchString) == -1) {
+            return false;
+        }
+
+        return true;
+    }
+    $(function () {
+        $.support.cors = true;
+        dataView = new Slick.Data.DataView({ inlineFilters: true });
+        grid = new Slick.Grid("#myGrid", dataView, columns, options);
+        attachAutoResizeDataGrid(grid, "myGrid", "gridContainer");
+        grid.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
+        grid.registerPlugin(checkboxSelector);
+        var mytranslation = {
+            pagelabel: "页",
+            currentpage: "当前页",
+            refresh: "刷新",
+            recordstatelabel: "显示",
+            currentrecords: "显示/隐藏当前记录状态",
+            perpage: "每页条数",
+            pageminus: "上一页",
+            pageplus: "下一页",
+            resultset_first: "第一页",
+            resultset_prev: "上一页",
+            resultset_next: "下一页",
+            resultset_last: "最后一页"
+        };
+        var pagercontent =$("#pager");
+        var url=WWWROOT+'/disinfectSystem/useRecord/useRecordController/findUseRecordList.mhtml';
+        var search='',searchFields='',order ='desc';
+        function pageIng(remoteUrl,container,datagrid,pagerType,trans,params,order,search,searchFields){
+            new Slick.Controls.EnhancementPager({
+                container: container,
+                remoteUrl:remoteUrl,
+                datagrid: datagrid,
+                pagerType: pagerType,
+                trans: trans, //i18n support
+                params:params,
+                limt:25,
+                order:order,
+                search:search,
+                searchFields:searchFields,
+            });
+        }
+        pageIng(url,pagercontent,grid,'',mytranslation,'',order,'','');
+        dataView.beginUpdate();
+        dataView.setItems(data);
+        dataView.setFilterArgs({
+            percentCompleteThreshold: percentCompleteThreshold,
+            searchString: searchString
+        });
+        dataView.setFilter(myFilter);
+        dataView.endUpdate();
+        dataView.syncGridSelection(grid, true);
+        $("#gridContainer").resizable();
+        //事件
+        grid.onClick.subscribe(function(e, args){
+            var gridDatastr=[grid.getData()]
+            // console.log(gridDatastr)
+            var id=gridDatastr[0][args.row].id;
+            AjaxModal(id)
+            RecordGoodes(id)
+            grid.render();
+            $('.detailsId').val(id)
+
+        })
+        grid.onSort.subscribe(function (e, args) {
+            order=(args.sortCol.field, args.sortAsc ? 1 : -1);
+            var Thisvleu=$('#txtSearch').val();
+            pageIng(url,pagercontent,grid,'',mytranslation,'',order,Thisvleu,'');
+        });
+        grid.onSelectedRowsChanged.subscribe(function(e,args){
+            var selectedRows = args.rows;//点击选中的数据
+            if(selectedRows==''){
+                $('.DeleteInput').val('');
+                $('.detailsId').val('');
+            }else{
+                var itemId = new Array();
+                var GridData = grid.getData();//得到的数据
+                for (var i = 0; i < selectedRows.length; i++) {
+                    itemId.push(GridData[selectedRows[i]].id)
+                    $('.DeleteInput').val(JSON.stringify(itemId));
+                    $('.detailsId').val(GridData[selectedRows[i]].id)
+                    $('.detailsStatus').val(GridData[selectedRows[i]].status)
+                }
+
+            }
+        })
+        $("#txtSearch").keyup(function (e) {
+            if (e.which == 13) {
+                var Thisvleu=$(this).val();
+                pageIng(url,pagercontent,grid,'',mytranslation,'',order,Thisvleu,'');
+            }
+        });
+        //delete
+        $('.DeleteBtn').on('click',function(){
+            if($('.DeleteInput').val()==''){
+                alert('请选择一行数据');
+                return false;
+            }else{
+                var idcards= $('.DeleteInput').val()
+                $('.deleteModalStr').click(function(){
+                    $.ajax({
+                        url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/deleteUseRecord.mhtml?useRecordIds='+idcards,
+                        type:'get',
+                        dataType:'json',
+                        success:function(data){
+                            if(data.success===true){
+                                window.location.href = window.location.href;
+                            }else{
+                                alert(data.message)
+                            }
                         }
-                    }
+                    })
                 })
-            })
 
-        }
+            }
+        });
+
     });
 }
 //调用