Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css =================================================================== diff -u -r24760 -r24762 --- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css (.../slick.grid.css) (revision 24760) +++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css (.../slick.grid.css) (revision 24762) @@ -34,7 +34,7 @@ overflow: hidden; -o-text-overflow: ellipsis; text-overflow: ellipsis; - height: 16px; + height: 26px; line-height: 16px; margin: 0; padding: 4px; @@ -109,6 +109,7 @@ position: absolute; border: 0px; width: 100%; + } .slick-cell, .slick-headerrow-column , .slick-footerrow-column{ @@ -125,6 +126,7 @@ margin: 0; white-space: nowrap; cursor: default; + font-size: 14px; } .slick-cell, .slick-headerrow-column{ border-bottom-color: silver; Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/SlickGridRecord.js =================================================================== diff -u --- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/SlickGridRecord.js (revision 0) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/SlickGridRecord.js (revision 24762) @@ -0,0 +1,372 @@ +var grid,dataView; +var columns = []; +var loader = new Slick.Data.RemoteModel(); +var loadingIndicator = null; +var data = []; +var options = { + enableCellNavigation: true, + enableColumnReorder: false, + rowHeight: 28, + editable: false, + enableAddRow: false, + forceFitColumns: true, + checked:true, + enableForHeaderCells:true +}; +//动态计算表格列宽 +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()+90; + 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 () { + $.support.cors = true; + var checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"}); + columns.push(checkboxSelector.getColumnDefinition()); + columns.push( + { + field: 'id', + name: 'ID', + align:'center', + sortable: true, + minWidth: 100, + }, + { + id: "patientName", + name: "病人", + field: "patientName", + width: 120, + minWidth: 120, + cssClass: "cell-title", + sortable: true, + minWidth: 100, + formatter: function (value,row,index,columnDef,dataContext){ + return ''+dataContext.patientName+' ' + }, + }, + { id: "status", + field: 'status', + name: '状态', + sortable: true, + cssClass: "cell-title", + minWidth: 100, + + }, + { + field: 'hospitalNum', + name: '住院号', + sortable: true, + id: "hospitalNum", + cssClass: "cell-title", + minWidth: 100, + formatter: function (value,row,index,columnDef,dataContext){ + return ''+dataContext.hospitalNum+' ' + }, + }, + { + field: 'treatmentNum', + name: '诊疗号', + sortable: true, + id: "treatmentNum", + cssClass: "cell-title", + minWidth: 100, + formatter: function (value,row,index,columnDef,dataContext){ + return ''+dataContext.treatmentNum+' ' + }, + }, + { + field: 'operationTimeStr', + name: '手术时间', + id: "operationTimeStr", + cssClass: "cell-title", + sortable: true, + minWidth: 100, + }, + { + field: 'patientAge', + name: '年龄', + id: "patientAge", + cssClass: "cell-title", + sortable: true, + minWidth: 100, + }, + { + field: 'patientIDCard', + name: '身份证号码', + id: "patientIDCard", + cssClass: "cell-title", + sortable: true, + minWidth: 100, + }, + { + field: 'doctorName', + name: '医生', + id: "doctorName", + cssClass: "cell-title", + sortable: true, + minWidth: 100, + }, + { + field: 'operation', + name: '手术名称', + id: "operation", + cssClass: "cell-title", + sortable: true, + minWidth: 100, + + }, + { + field: 'operator', + name: '录入人', + id: "operator", + cssClass: "cell-title", + sortable: true, + minWidth: 100, + + }, + { + field: 'depart', + name: '录入科室', + id: "depart", + cssClass: "cell-title", + sortable: true, + minWidth: 100, + + }, + { + field: 'enteringDateStr', + name: '录入时间', + id: "enteringDateStr", + cssClass: "cell-title", + sortable: true, + minWidth: 100, + + }, + { + field: 'applicationTimeStr', + name: '申请时间', + id: "applicationTimeStr", + cssClass: "cell-title", + sortable: true, + minWidth: 100, + + }, + { + field: 'remark', + name: '备注', + id: "remark", + cssClass: "cell-title", + sortable: true, + minWidth: 100, + + } + ) + //将id列隐藏 + var visibleColumns = [];//定义一个数组存放显示的列 + 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: "最后一页" + }; + 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, + }); + } + pageIng(url,pagercontent,grid,'',mytranslation,'',order); + //事件 + 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,''); + }); + $("#txtSearch").keyup(function (e) { + if (e.which == 13) { + var Thisvleu=$(this).val(); + pageIng(url,pagercontent,grid,'',mytranslation,'',order,Thisvleu,''); + } + }); + //获取数据 + grid.onSelectedRowsChanged.subscribe(function(){ + var selectedRows = grid.getSelectedRows();//点击选中的数据 + + if(selectedRows==''){ + $('.DeleteInput').val(''); + }else{ + var itemId = new Array(); + var dataview = grid.getData();//得到的数据 + for (var i = 0; i < selectedRows.length; i++) { + itemId.push(dataview[selectedRows[i]].id) + $('.DeleteInput').val(JSON.stringify(itemId)); + } + } + + }) + //删除 + $('.DeleteBtn').on('click',function(){ + if($('.DeleteInput').val()==''){ + alert('请选择一行数据'); + }else{ + var idcards= $('.DeleteInput').val() + $.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) + } + } + }) + } + }); + //添加数据 + $('.AddRecord').click(function(){ + var addhospitalNum = $('#addhospitalNum').val();//住院号 + var addtreatmentNum =$('#addtreatmentNum').val();//诊疗号 + var addwashHandNurse =$('#addwashHandNurse').val();//洗手护士 + var addcircuitNurse =$('#addcircuitNurse').val()//巡回护士 + var adddepart =$('#adddepart').val()//科室 + var addoperationRoom =$('#addoperationRoom').val()//手术间 + var addpatientAge=$('#addpatientAge').val()//年纪 + var patientSex =$('#addSelect').val();//性别 + var addpatientArea =$('#addpatientArea').val();//病区 + var addroomNumber =$('#addroomNumber').val()//病室 + var addbedNumber =$('#addbedNumber').val()//床位 + var addpatientIDCard =$('#addpatientIDCard').val();//身份证 + var adddoctorName =$('#adddoctorName').val();//医生 + var addspecialInfection=$('#addspecialInfection').val();//特殊感染类型 + var addoperation =$('#addoperation').val();//手术名称 + var addoperationScheduleId =$('#addoperationScheduleId').val();//手术单号 + var addoperationTime =$('#addoperationTime').val();//手术时间 + var addvisitId =$('#addvisitId').val();//住院次数 + var addenteringTime=$('#addenteringTime').val(); // enteringDateStr录入时间 + var addoperator =$('#addoperator').val();//录入人 + var addreviewer =$('#addreviewer').val() // 缺审核人 + var addapplicationTime =$('#addapplicationTime').val();// 申请时间 + var addremark =$('#addremark').val();//备注 + var addreviewTime =$('#addreviewTime').val();//审核时间 + var addpatientName =$('#addpatientName').val();//姓名 + var tempBarcode =$('#tempBarcode').val();//机械报信息 + var recordGoodsArray = [];//[{"barcode":"003"}] + var allTableData = $('#addGoods-table').bootstrapTable('getData'); + + for(var i=0;ix洗手护士不能为空') + $ ('#Alert').show ().delay (1500).fadeOut (); + return; + } + if(addcircuitNurse==''){ + $('#Alert').html('x巡回护士不能为空') + $ ('#Alert').show ().delay (1500).fadeOut (); + return; + } + if(addhospitalNum==''&&addtreatmentNum==''&&addpatientName==''){ + $('#Alert').html('x请输入诊疗号或者住院号或者病人姓名') + $ ('#Alert').show ().delay (1500).fadeOut (); + }else{ + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/saveUseRecord.mhtml', + type:'post', + async:false, + dataType:'json', + data:{hospitalNum:addhospitalNum,treatmentNum :addtreatmentNum,addwashHandNurse:addwashHandNurse, + circuitNurse:addcircuitNurse,depart:adddepart,operationRoom:addoperationRoom,patientAge:addpatientAge,patientSex:patientSex,patientArea:addpatientArea,roomNumber:addroomNumber, + patientIDCard:addpatientIDCard,bedNumber:addbedNumber,doctorName:adddoctorName,surgeon:adddoctorName,specialInfection:addspecialInfection,operation:addoperation, + operationScheduleId:addoperationScheduleId,operationTimeStr:addoperationTime,visitId:addvisitId,enteringDateStr:addenteringTime,operator:addoperator, + remark:addremark,patientName:addpatientName,applicationTime:addapplicationTime,items:recordGoodsArrays,departCoding:currentOrgUnitCode}, + success:function(data){ + if(data.success===true){ + $("#mymodal-data").modal('hide'); + window.location.href = window.location.href; + }else{ + alert(data.message) + } + } + }) + } + + }) +}); Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp =================================================================== diff -u -r24760 -r24762 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp (.../index.jsp) (revision 24760) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp (.../index.jsp) (revision 24762) @@ -14,34 +14,281 @@ + + + + + + + -
-
-
- - - - - +
+
+
+ + + + + +
+
+
+ +
+
+
-
-
- -
-
-
-
+ + + + + - @@ -65,305 +312,11 @@ - - + + + + + + \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js =================================================================== diff -u -r24760 -r24762 --- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js (.../slick.enhancementpager.js) (revision 24760) +++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js (.../slick.enhancementpager.js) (revision 24762) @@ -26,7 +26,7 @@ url: urls, type: 'get', cache: false, - data: { "limit": paramObj.limt, "offset": 1 }, + data: { "limit": paramObj.limt, "offset": 0 }, dataType: "text", crossDomain: true, timeout: waiting, @@ -203,11 +203,14 @@ } function getData(changedvalue, url, pagertype, params, waiting) { var pagesize = $('.recordsperpage').val(); + if(!pagesize){ + pagesize = 25; + } // var pagesize = paramObj.limt; var pageindex = changedvalue; var postedData = {}; postedData['limit'] = pagesize; - postedData['offset'] = pageindex; + postedData['offset'] = (pageindex - 1) * pagesize; // if (params !== null && params != undefined) if (params !== null) { $.each(params, function (k, v) {