Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css =================================================================== diff -u -r24762 -r24850 --- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css (.../slick.grid.css) (revision 24762) +++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css (.../slick.grid.css) (revision 24850) @@ -34,15 +34,18 @@ overflow: hidden; -o-text-overflow: ellipsis; text-overflow: ellipsis; - height: 26px; - line-height: 16px; + /*height: 26px;*/ + /*line-height: 16px;*/ margin: 0; padding: 4px; - border-right: 1px solid silver; + /*border-right: 1px solid silver;*/ border-left: 0px !important; border-top: 0px !important; border-bottom: 0px !important; float: left; + background: #f1eef0; + height: 35px; + line-height: 28px; } .slick-headerrow-column.ui-state-default, .slick-footerrow-column.ui-state-default { @@ -114,8 +117,8 @@ .slick-cell, .slick-headerrow-column , .slick-footerrow-column{ position: absolute; - border: 1px solid transparent; - border-right: 1px dotted silver; + /*border: 1px solid transparent;*/ + /*border-right: 1px dotted silver;*/ border-bottom-color: silver; overflow: hidden; -o-text-overflow: ellipsis; Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js =================================================================== diff -u -r24799 -r24850 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js (.../record.js) (revision 24799) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js (.../record.js) (revision 24850) @@ -590,6 +590,7 @@ } var recordGoodsArrays= JSON.stringify(recordGoodsArray) + */ if(hospitalNum==''&&treatmentNum==''&&patientName==''){ $('#Alert').html('x请输入诊疗号或者住院号或者病人姓名') $ ('#Alert').show ().delay (1500).fadeOut (); Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/css/smoothness/jquery-ui-1.11.3.custom.css =================================================================== diff -u -r24760 -r24850 --- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/css/smoothness/jquery-ui-1.11.3.custom.css (.../jquery-ui-1.11.3.custom.css) (revision 24760) +++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/css/smoothness/jquery-ui-1.11.3.custom.css (.../jquery-ui-1.11.3.custom.css) (revision 24850) @@ -866,10 +866,10 @@ .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - border: 1px solid #d3d3d3; - background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x; - font-weight: normal; - color: #555555; + /*border: 1px solid #d3d3d3;*/ + /*background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;*/ + /*font-weight: normal;*/ + /*color: #555555;*/ } .ui-state-default a, .ui-state-default a:link, @@ -883,7 +883,7 @@ .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - border: 1px solid #999999; + /*border: 1px solid #999999;*/ background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x; font-weight: normal; color: #212121; Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js =================================================================== diff -u -r24807 -r24850 --- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js (.../slick.enhancementpager.js) (revision 24807) +++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js (.../slick.enhancementpager.js) (revision 24850) @@ -10,8 +10,6 @@ */ -/* - (function ($) { function EnhancementPager(paramObj) { var waiting = parseInt(paramObj.waiting); @@ -25,266 +23,6 @@ }else{ urls+=("&order=desc") } - $.ajax({ - url: urls, - type: 'get', - cache: false, - data: { "limit": paramObj.limt, "offset": 0 }, - dataType: "text", - crossDomain: true, - timeout: waiting, - beforeSend: function() { - paramObj.container.html(' '); - }, - error: function (XMLHttpRequest, textStatus, errorThrown) { - paramObj.container.html('Error! ' + errorThrown + ''); - }, - success: function (data) { - var dataObj = JSON.parse(data) - var total =dataObj.total; - pagecount = parseInt(Math.floor(parseFloat(total / paramObj.limt)) + 1); - initPager(pagecount, paramObj.pagerType, paramObj.trans, waiting); - getData(1, urls, paramObj.pagerType, paramObj.params, waiting); - } - }); - function initPager(pagecount, pagertype, trans, waiting) { - paramObj.container.html(''); - $('\ -  \ - Page\ - \ -  / \ - #\ -  \ - \ -  \ - Display  / \ - ').appendTo(paramObj.container); - $('.currentpage').keydown(function (e) { - if (e.keyCode == 13) { - var changedvalue = 1; - if (isNaN(parseInt($(".currentpage").val()))) { - $(".currentpage").val(changedvalue); - } else { - changedvalue = parseInt($(".currentpage").val()); - if (changedvalue < 1) { - changedvalue = 1; - } - if (changedvalue > parseInt($("#totalpages").text())) { - changedvalue = parseInt($("#totalpages").text()); - } - $('.currentpage').val(changedvalue); - } - getData(changedvalue, urls, pagertype, paramObj.params, waiting); - } - }); - if (pagertype == "slider") { - $(' \ - \ -  \ -  ').insertBefore($('.pagelabel')); - if (trans !== null && trans !== undefined) { - $.each(trans, function (k, v) { - if (k != "resultset_first" && k != "resultset_prev" && k != "resultset_next" && k != "resultset_last") { - if (k == "pagelabel" || k == "recordstatelabel") { - $('.' + k).text(v); - } else { - $('.' + k).attr("title", v); - } - } - }); - } - $(".pagerslider").slider({ - range: "min", - value: 1, - step: 1, - min: 1, - max: pagecount, - slide: function (event, ui) { - $(".currentpage").css("width", ui.value.toString().length * 7 + "px"); - var pd = ui.value; - $(".currentpage").val(pd); - }, - stop: function (event, ui) { - var changedvalue = ui.value; - getData(changedvalue, urls, pagertype, paramObj.params, waiting); - } - }); - $(".pageplus").click(function () { - if (isNaN(parseInt($(".currentpage").val()))) { - $(".currentpage").val(1); - } - var changedvalue = parseInt($(".currentpage").val()) + 1; - if (changedvalue > parseInt($("#totalpages").text())) { - changedvalue = parseInt($("#totalpages").text()); - } - getData(changedvalue, urls, pagertype, paramObj.params, waiting); - }); - $(".pageminus").click(function () { - if (isNaN(parseInt($(".currentpage").val()))) { - $(".currentpage").val(1); - } - var changedvalue = parseInt($(".currentpage").val()) - 1; - if (changedvalue < 1) { - changedvalue = 1; - } - getData(changedvalue, urls, pagertype, paramObj.params, waiting); - }); - } else { - $('\ - \ -  ').insertBefore($('.pagelabel')); - $(' \ - \ - ').insertAfter($('#totalpages')); - if (trans !== null && trans !== undefined) { - $.each(trans, function (k, v) { - if (k != "pageminus" && k != "pageplus") { - if (k == "pagelabel" || k == "recordstatelabel") { - $('.' + k).text(v); - } else { - $('.' + k).attr("title", v); - } - } - }); - } - $(".resultset_first").click(function () { - var changedvalue = 1; - getData(changedvalue, urls, pagertype, paramObj.params, waiting); - }); - $(".resultset_prev").click(function () { - if (isNaN(parseInt($(".currentpage").val()))) { - $(".currentpage").val(1); - } - var changedvalue = parseInt($(".currentpage").val()) - 1; - if (changedvalue < 1) { - changedvalue = 1; - } - getData(changedvalue, urls, pagertype, paramObj.params, waiting); - }); - $(".resultset_next").click(function () { - if (isNaN(parseInt($(".currentpage").val()))) { - $(".currentpage").val(1); - } - var changedvalue = parseInt($(".currentpage").val()) + 1; - if (changedvalue > parseInt($("#totalpages").text())) { - changedvalue = parseInt($("#totalpages").text()); - } - getData(changedvalue, urls, pagertype, paramObj.params, waiting); - }); - $(".resultset_last").click(function () { - var changedvalue = parseInt($("#totalpages").text()); - getData(changedvalue, urls, pagertype, paramObj.params, waiting); - }); - } - - $('.recordsperpage').change(function(value,label){ - var changedvalue = 1; - getData(changedvalue, urls, pagertype, paramObj.params, waiting); - }) - $(".refresh").click(function () { - if (isNaN(parseInt($(".currentpage").val()))) { - $(".currentpage").val(1); - } - var changedvalue = parseInt($(".currentpage").val()); - if (changedvalue < 1) { - changedvalue = 1; - } - if (changedvalue > parseInt($("#totalpages").text())) { - changedvalue = parseInt($("#totalpages").text()); - } - getData(changedvalue, urls, pagertype, paramObj.params, waiting); - }); - $(".currentrecords").click(function () { - $(".recordstate").toggle("fast"); - }); - } - 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 - 1) * pagesize; - // if (params !== null && params != undefined) - if (params !== null) { - $.each(params, function (k, v) { - postedData[k] = v; - }); - } - $.ajax({ - url: url, - type: 'get', - cache: false, - dataType: "text", - crossDomain: true, - data: postedData, - timeout: waiting, - beforeSend: function() { - $("#dataloading").attr("disabled","disabled"); - $('#dataloading').removeClass('refresh'); - $('#dataloading').addClass('dataloading'); - }, - error: function (XMLHttpRequest, textStatus, errorThrown) { - paramObj.container.html('Error! ' + errorThrown + ''); - }, - success: function (data) { - var dataObj = JSON.parse(data) - var total =dataObj.total; - var rows = dataObj.rows; - paramObj.datagrid.setData(rows); - paramObj.datagrid.render(); - $(".currentpage").css("width", changedvalue.toString().length * 7 + "px"); - $(".currentpage").val(changedvalue); - var currentvalue = changedvalue; - var pagesize = parseInt($('.recordsperpage').val()); - // var pagesize = parseInt(paramObj.limt); - var fromvalue = (currentvalue - 1) * pagesize + 1; - var tovalue = fromvalue + pagesize - 1; - if (tovalue > total) { - tovalue = total; - } - $("#recordsegment").text(fromvalue + "-" + tovalue); - $("#totalrecords").text(total); - var totalpages = parseInt(Math.floor(parseFloat(total / pagesize)) + 1); - $("#totalpages").text(totalpages); - if (pagertype == "slider") { - $(".pagerslider").slider("value", changedvalue); - $(".pagerslider").slider("option", "max", totalpages); - } - $("#dataloading").removeAttr("disabled"); - $('#dataloading').removeClass('dataloading'); - $('#dataloading').addClass('refresh'); - } - }); - } - } - $.extend(true, window, { Slick: { Controls: { EnhancementPager: EnhancementPager}} }); -})(jQuery); - -*/ - -(function ($) { - function EnhancementPager(paramObj) { - var waiting = parseInt(paramObj.waiting); - if (isNaN(waiting)) { - waiting = 30000; - } - var urls = paramObj.remoteUrl+"?search="+paramObj.search+"&searchFields="+paramObj.searchFields; - var sortdir = paramObj.order; - if(sortdir<0){ - urls+=("&order=asc") - }else{ - urls+=("&order=desc") - } var totalAll; //设置默认值 var pagesize = $('.recordsperpage').val(); Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick-default-theme.css =================================================================== diff -u -r24802 -r24850 --- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick-default-theme.css (.../slick-default-theme.css) (revision 24802) +++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick-default-theme.css (.../slick-default-theme.css) (revision 24850) @@ -7,16 +7,16 @@ .slick-header-columns { background: url('images/header-columns-bg.gif') repeat-x center bottom; - border-bottom: 1px solid silver; + /*border-bottom: 1px solid silver;*/ } .slick-header-column { - background: url('images/header-columns-bg.gif') repeat-x center bottom; - border-right: 1px solid silver; + /*background: url('images/header-columns-bg.gif') repeat-x center bottom;*/ + /*border-right: 1px solid silver;*/ } .slick-header-column:hover, .slick-header-column-active { - background: white url('images/header-columns-over-bg.gif') repeat-x center bottom; + /*background: white url('images/header-columns-over-bg.gif') repeat-x center bottom;*/ } .slick-headerrow { @@ -37,7 +37,7 @@ position: absolute; background: white; border: 0px; - line-height: 20px; + line-height: 35px; } .slick-row.selected { @@ -92,8 +92,8 @@ } .slick-cell.active { - border-color: gray; - border-style: solid; + /*border-color: gray;*/ + /*border-style: solid;*/ } .slick-sortable-placeholder { @@ -131,6 +131,6 @@ to { box-shadow: none; } } .slick-column-name{ - /*color:#689d61;*/ + color:#689d61; font-size: 14px; } \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp =================================================================== diff -u -r24798 -r24850 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp (.../index.jsp) (revision 24798) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp (.../index.jsp) (revision 24850) @@ -32,23 +32,26 @@ - + <%----%> + +
- - +
+
@@ -67,12 +70,12 @@ Close -

使用记录

+

使用记录

- 基础数据 -
-
+
-
+
+
+
@@ -538,6 +536,22 @@
+ + + +
@@ -563,7 +577,7 @@
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord1.js =================================================================== diff -u --- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord1.js (revision 0) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord1.js (revision 24850) @@ -0,0 +1,1215 @@ +//公共 +$('#addHandle').click(function(){ + $('#adddepart').val(currentOrgUnitName)//科室 + $('#adddepart').attr('disabled',true) + $('#addoperator').val(currentUserFullName) +}) +var grid,grid01,grid02,grid03,dataView; +var options = { + enableCellNavigation: true, + enableColumnReorder: false, + rowHeight: 28, + editable: false, + enableAddRow: false, + forceFitColumns: true, + checked:true, + 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"}); + 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, 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列隐藏 + 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); + dataView.beginUpdate(); + dataView.setItems(data); + dataView.endUpdate(); + grid.render(); + + //事件 + grid.onClick.subscribe(function(e, args){ + // AjaxModal(205); + // RecordGoodes(205); + dataView.beginUpdate(); + dataView.setItems(data); + dataView.endUpdate(); + grid.render(); + }) + 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('请选择一行数据'); + }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) + } + } + }) + } + }); + +} +//调用 +$(function(){ + HomeList(); + addGoodsGrid(); +}); +/*add addGoodsGrid list table*/ + +function addGoodsGrid(){ + var AddData = [], columns1=[],visibleColumns1=[]; + var checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"}); + columns1.push(checkboxSelector.getColumnDefinition()); + columns1.push( + { + id:'id', + field:'Id', + name:'id', + cssClass: "cell-title", + }, + { id:'barcode', + field: 'barcode', + name: '条码', + cssClass: "cell-title", + + }, + { + id:'showTousseName', + field: 'showTousseName', + name: '名称', + cssClass: "cell-title", + }, + { + id:'isUrgentForUseRecord', + field: 'isUrgentForUseRecord', + name: '加急', + cssClass: "cell-title", + width:50, + minWidth: 50, + }, + { + id:'amount', + field: 'amount', + name: '数量', + cssClass: "cell-title", + }, + { + id:'packageType', + field: 'packageType', + name: '包装类型', + cssClass: "cell-title", + }, + { + id:'idCardUseAmount', + field: 'idCardUseAmount', + name: '批次', + cssClass: "cell-title", + }, + { + id:'validUntilStr', + field: 'validUntil', + name: '失效日期', + cssClass: "cell-title", + }, + { + id:'Img', + field: 'Img', + name: '图片', + formatter: function (value,row,index){ + return ' 图片' + }, + cssClass: "cell-title", + }, + { + id:'includeImplant', + field: 'includeImplant', + name: '植入物是使用情况', + cssClass: "cell-title", + }, + { + id:'types', + field: 'types', + name: '操作', + formatter:function(index,row,value){ + return '删除' + }, + cssClass: "cell-title", + } + ); + for (var i = 0; i < columns1.length; i++) { + if (i!=1){ + visibleColumns1.push(columns1[i]);//将columns的列push进去 + } + } + dataView = new Slick.Data.DataView({inlineFilters: true}); + grid01 = new Slick.Grid("#addGoodsGrid", dataView, visibleColumns1, options); + grid01.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 + grid01.registerPlugin(checkboxSelector); + $('#tempBarcode').keydown(function(e){ + if(e.keyCode=='13'){ + if($(this).val()==""){ + alert('请输入条码') + return false; + }else{ + if($('.Barcode').val()==$(this).val()){ + alert('不能重复输入条码') + }else{ + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?barcode='+$(this).val(), + type:'get', + dataType:'json', + success:function(data){ + if(data.success===true){ + var database =data.data; + // var databaseGood ={"id":(Math.round(Math.random() * 10000)),}; + var databaseGood ={"id":data.data.barcode} + $.each(database,function(k,v){ + databaseGood[k]=v; + }) + dataView.addItem(databaseGood); + console.log(databaseGood) + $('.Barcode').val(data.data.barcode) + grid01.invalidateRows(); + grid01.render(); + $('.RecordGoodes').val(JSON.stringify(grid01.getData().getItems())) + $('#tempBarcode').val('') + }else{ + alert(data.message) + } + } + }) + } + } + } + }) + dataView.setItems(AddData); + dataView.endUpdate(); +}; +/* save Data*/ +function KeyBoard(){ + 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=[]; + var allTableData =$('.RecordGoodes').val(); + var allTableDataJson=[] + + if(!allTableData){ + allTableDataJson; + }else{ + allTableDataJson= JSON.parse(allTableData) + } + for(var i=0;ix巡回护士不能为空'); + // $ ('#Alert').show ().delay (1500).fadeOut (); + alert('巡回护士不能为空'); + return; + } + if(addhospitalNum==''&&addtreatmentNum==''&&addpatientName==''){ + // $('#Alert').html('x请输入诊疗号或者住院号或者病人姓名') + // $ ('#Alert').show ().delay (1500).fadeOut (); + alert('请输入诊疗号或者住院号或者病人姓名'); + }else{ + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/saveUseRecord.mhtml', + type:'post', + async:false, + dataType:'json', + data:{hospitalNum:addhospitalNum,treatmentNum :addtreatmentNum,washHandNurse: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) + } + } + }) + } +} +$('.AddRecord').click(function(){ + KeyBoard(); +}); +//审核 +$('.BtnExamine').click(function(){ + if($('.DeleteInput').val()==''){ + alert('请选择一条数据'); + return false; + }else{ + if($('.detailsStatus').val()==='已审核'){ + alert('本条记录已经通过审核'); + return false; + } + if($('.detailsStatus').val()==='已申请'){ + alert('本条记录已经通过申请'); + return false; + }else{ + $('.examineAlert').click(function(){ + var idcards= $('.DeleteInput').val(); + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewMultiUseRecord.mhtml', + type:'get', + dataType:'json', + async:false, + data:{useRecordIds:idcards}, + success:function(data){ + if(data.success===true){ + window.location.href = window.location.href; + }else{ + alert(data.message) + return false; + } + } + }) + }) + } + + } +}); +//生成申请单 +$('.Createapplication').click(function(){ + if($('.DeleteInput').val()==''){ + alert('请选择一条数据'); + return false; + }else{ + if($('.detailsStatus').val()==='已申请'){ + alert('本条记录已经通过申请'); + return false; + }else{ + $('.Createapplication').click(function(){ + var idcards= $('.DeleteInput').val(); + var departAll=''; + var departCoding=''; + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewAndConvertMuitiUseRecordForm.mhtml', + type:'get', + dataType:'json', + async:false, + data:{operator:currentUserFullName,useRecordIds:idcards,depart:departAll,departCoding:currentOrgUnitCode}, + success:function(data){ + if(data.success===true){ + $("#Createapplication").modal('hide'); + window.location.href = window.location.href; + }else{ + alert(data.message) + } + } + }) + }) + } + } +}) + +/*details*/ +function ClickName(id){ + if(id!=''){ + AjaxModal(id); + RecordGoodes(id) + $('.detailsId').val(id) + // grid03.destroy() + // var AddData1=[],columns2=[],visibleColumns2=[]; + // var checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"}); + // columns2.push(checkboxSelector.getColumnDefinition()); + // columns2.push( + // { + // ids:'id', + // field:'Id', + // name:'id', + // cssClass: "cell-title", + // width:30, + // minWidth: 30, + // }, + // { id:'barcode', + // field: 'barcode', + // name: '条码', + // cssClass: "cell-title", + // width:30, + // minWidth: 30, + // + // }, + // { + // id:'showTousseName', + // field: 'showTousseName', + // name: '名称', + // cssClass: "cell-title", + // }, + // { + // id:'isUrgentForUseRecord', + // field: 'isUrgentForUseRecord', + // name: '加急', + // cssClass: "cell-title", + // }, + // { + // id:'amount', + // field: 'amount', + // name: '数量', + // cssClass: "cell-title", + // }, + // { + // id:'packageType', + // field: 'packageType', + // name: '包装类型', + // cssClass: "cell-title", + // }, + // { + // id:'idCardUseAmount', + // field: 'idCardUseAmount', + // name: '批次', + // cssClass: "cell-title", + // }, + // { + // id:'validUntilStr', + // field: 'validUntil', + // name: '失效日期', + // cssClass: "cell-title", + // }, + // { + // id:'Img', + // field: 'Img', + // name: '图片', + // formatter: function (value,row,index){ + // return ' 图片' + // }, + // cssClass: "cell-title", + // }, + // { + // id:'includeImplant', + // field: 'includeImplant', + // name: '植入物是使用情况', + // cssClass: "cell-title", + // }, + // { + // id:'types', + // field: 'types', + // name: '操作', + // formatter:function(index,row,value){ + // return '删除' + // }, + // cssClass: "cell-title", + // } + // ); + // for (var i = 0; i < columns2.length; i++) { + // if (i!=1){ + // visibleColumns2.push(columns2[i]);//将columns的列push进去 + // } + // } + // dataView = new Slick.Data.DataView({inlineFilters: true}); + // grid03 = new Slick.Grid("#GoodsTablGrid",dataView, visibleColumns2, options); + // grid03.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 + // grid03.registerPlugin(checkboxSelector); + // $.ajax({ + // url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadUseItemsByUseRecordId.mhtml', + // async:false, + // type:'get', + // data:{useRecordId:id}, + // dataType:'json', + // success:function(data){ + // var database =data.rows; + // if(data.success===true){ + // for(var i=0;i 图片' + }, + cssClass: "cell-title", + }, + { + id:'includeImplant', + field: 'includeImplant', + name: '植入物是使用情况', + cssClass: "cell-title", + }, + { + id:'types', + field: 'types', + name: '操作', + formatter:function(index,row,value){ + return '删除' + }, + cssClass: "cell-title", + } + ); + for (var i = 0; i < columns1.length; i++) { + if (i!=1){ + visibleColumns1.push(columns1[i]);//将columns的列push进去 + } + } + dataView = new Slick.Data.DataView({inlineFilters: true}); + grid02 = new Slick.Grid("#GoodsTablGrid",dataView, visibleColumns1, options); + grid02.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 + grid02.registerPlugin(checkboxSelector); + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadUseItemsByUseRecordId.mhtml', + async:false, + type:'get', + data:{useRecordId:id}, + dataType:'json', + success:function(data){ + var database =data.rows; + for(var i=0;i 图片' + }, + cssClass: "cell-title", + }, + { + id:'includeImplant', + field: 'includeImplant', + name: '植入物是使用情况', + cssClass: "cell-title", + }, + { + id:'types', + field: 'types', + name: '操作', + formatter:function(index,row,value){ + return '删除' + }, + cssClass: "cell-title", + } + ); + for (var i = 0; i < columns2.length; i++) { + if (i!=1){ + visibleColumns2.push(columns2[i]);//将columns的列push进去 + } + } + dataView = new Slick.Data.DataView({inlineFilters: true}); + grid02 = new Slick.Grid("#GoodsTablGrid",dataView, visibleColumns2, options); + grid02.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 + grid02.registerPlugin(checkboxSelector); + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadUseItemsByUseRecordId.mhtml', + async:false, + type:'get', + data:{useRecordId:id}, + dataType:'json', + success:function(data){ + var database =data.rows; + if(data.success===true){ + for(var i=0;ix请输入诊疗号或者住院号或者病人姓名') + $ ('#Alert').show ().delay (1500).fadeOut (); + }else{ + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/saveUseRecord.mhtml', + type:'post', + async:false, + dataType:'json', + data:{id:detailsId,originalFormParams:ModifySaveStr,originalItems:RecordGoodes,hospitalNum:hospitalNum,treatmentNum :treatmentNum,addwashHandNurse:washHandNurse, + circuitNurse:circuitNurse,depart:depart,operationRoom:operationRoom,patientAge:patientAge,patientSex:patientSex,patientArea:patientArea,roomNumber:roomNumber, + patientIDCard:patientIDCard,bedNumber:bedNumber,doctorName:doctorName,surgeon:doctorName,specialInfection:specialInfection,operation:operation, + operationScheduleId:operationScheduleId,operationTimeStr:operationTime,visitId:visitId,enteringDateStr:enteringTime,operator:operator, + remark:remark,patientName:patientName,applicationTime:applicationTime,items:recordGoodsArrays,departCoding:currentOrgUnitCode}, + success:function(data){ + if(data.success===true){ + $("#mymodal-details").modal('hide'); + window.location.href = window.location.href; + }else{ + alert(data.message) + } + } + }) + } +} +$('#ModifySave').click(function(){ + ModifySave(); +}); +$('.BtnDetails').click(function(){ + if($('.detailsId').val()==''){ + alert('请选中一行数据'); + return false; + }else{ + AjaxModal($('.detailsId').val()) + // RecordGoodes($('.detailsId').val()); + } +}) +*/ \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css =================================================================== diff -u -r24802 -r24850 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css (.../index.css) (revision 24802) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css (.../index.css) (revision 24850) @@ -1,10 +1,29 @@ .modal-header{ - background: #72B142; - + background: #31b546; + height:37px; + padding: 0 15px; + color:#fff; } +.PackupContainer_Show{ + display: block; +} +.PackupContainer_hide{ + display: none; +} +h4{ + font-size: 14px; + font-family: normal; +} +.close{ + font-size: 32px; +} .modal-title{ font-weight: bold; + line-height: 37px; } +.modal-body{ + padding: 10px; +} /*提交按钮*/ #modal-dialog{ @@ -156,11 +175,25 @@ padding: 0; list-style: none; } +em{ + font-style: normal; +} +.PackUp{ + display: inline-block; + height:25px; + line-height: 25px; + background: #eaf7ec; + color:#31b546; + width: 100%; + margin: 0 0 10px 0; + text-align: center; + cursor: pointer; +} .fonm-Li{ width: 100%; height:26px; line-height:26px; - margin:10px 0; + margin:0 0 8px 0; } .form-li{ @@ -181,9 +214,19 @@ width: 80px; text-align: right; } +.form-li label span.ScanBarcode{ + text-align: center; +} +.totalText{ + width: auto; +} +.spanTotal{ + color:#5bc069; +} .fonm-mg{ margin-left:2%; } + .form-input,#Select,#specialInfection,#addSelect,#addspecialInfection{ width: 150px; border: 1px solid #ddd; @@ -193,20 +236,29 @@ color: #000; font-size: 12px; font-weight: normal; - } .form-shoushu-input{ width: 405px; } .modal_span1,.modal_span{ margin-bottom: 10px; - background: #72B142; + background: #f2f2f2; display: inline-block; width: 100%; - padding: 5px; + height:33px; + line-height: 33px; font-size: 14px; - font-weight: bold; + color:#58be66; } +.icon_i{ + display: inline-block; + width: 2px; + border-right:2px solid #31b546; + height:14px; + /*line-height:18px;*/ + margin:0 3px 0 8px; + vertical-align: middle; +} #firstDiv{ width: 775px; overflow-x: scroll; @@ -327,9 +379,19 @@ .addGoods_content{ width: 800px; } -#addGoodsGrid{ - height:200px; +#addGoodsGrid,#GoodsTablGrid{ + min-height:150px !important; + width: 100%; } +.addGoodsGrid_body{ + width: 770px; +} .content_body{ height:50px; +} +.giyphicon_icon{ + font-size: 16px; + display: inline-block; + vertical-align: middle; + cursor: pointer; } \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/examples/examples.css =================================================================== diff -u -r24765 -r24850 --- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/examples/examples.css (.../examples.css) (revision 24765) +++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/examples/examples.css (.../examples.css) (revision 24850) @@ -33,7 +33,7 @@ #myGrid, .example-grid { background: white; outline: 0; - border: 1px solid gray; + /*border: 1px solid gray;*/ } .grid-header { Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js =================================================================== diff -u -r24802 -r24850 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js (.../slickGridRecord.js) (revision 24802) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js (.../slickGridRecord.js) (revision 24850) @@ -1,9 +1,28 @@ //公共 -var grid,grid01,grid02,dataView; +$('#addHandle').click(function(){ + $('#adddepart').val(currentOrgUnitName)//科室 + $('#adddepart').attr('disabled',true) + $('#addoperator').val(currentUserFullName) +}) + +//模态框收起 +$('.PackUp').click(function(){ + if($('.packUp_em').text()==='收起'){ + $('.PackupContainer').addClass('PackupContainer_hide').removeClass('PackupContainer_Show'); + $('.packUp_em').text('展开') + $('.icon_packUp').addClass('glyphicon-chevron-down').removeClass('glyphicon-chevron-up') + }else{ + $('.PackupContainer').addClass('PackupContainer_Show').removeClass('PackupContainer_hide'); + $('.packUp_em').text('收起'); + $('.icon_packUp').addClass('glyphicon-chevron-up').removeClass('glyphicon-chevron-down') + + } +}) +var grid,grid01,grid02,grid03,dataView; var options = { enableCellNavigation: true, enableColumnReorder: false, - rowHeight: 28, + rowHeight: 35, editable: false, enableAddRow: false, forceFitColumns: true, @@ -79,7 +98,7 @@ minWidth: 120, cssClass: "cell-title", sortable: true, formatter: function (value,row,index,columnDef,dataContext){ - return ''+dataContext.patientName+' ' + return ''+dataContext.patientName+' ' }, }, { id: "status", @@ -98,7 +117,7 @@ cssClass: "cell-title", minWidth: 100, formatter: function (value,row,index,columnDef,dataContext){ - return ''+dataContext.hospitalNum+' ' + return ''+dataContext.hospitalNum+' ' }, }, { @@ -109,7 +128,7 @@ cssClass: "cell-title", minWidth: 100, formatter: function (value,row,index,columnDef,dataContext){ - return ''+dataContext.treatmentNum+' ' + return ''+dataContext.treatmentNum+' ' }, }, { @@ -219,7 +238,7 @@ resultset_next: "下一页", resultset_last: "最后一页" }; - dataView = new Slick.Data.DataView({inlineFilters: true}); + 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}));//单选 @@ -249,11 +268,10 @@ //事件 grid.onClick.subscribe(function(e, args){ - // AjaxModal(205); - // RecordGoodes(205); - dataView.beginUpdate(); - dataView.setItems(data); - dataView.endUpdate(); + var gridDatastr=[grid.getData()] + var id=gridDatastr[0][args.row].id; + AjaxModal(id) + RecordGoodes(id) grid.render(); }) grid.onSort.subscribe(function (e, args) { @@ -265,6 +283,7 @@ var selectedRows = args.rows;//点击选中的数据 if(selectedRows==''){ $('.DeleteInput').val(''); + $('.detailsId').val(''); }else{ var itemId = new Array(); var GridData = grid.getData();//得到的数据 @@ -287,31 +306,33 @@ $('.DeleteBtn').on('click',function(){ if($('.DeleteInput').val()==''){ alert('请选择一行数据'); + return false; }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) + $('.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) + } } - } + }) }) + } }); - } //调用 $(function(){ HomeList(); addGoodsGrid(); }); /*add addGoodsGrid list table*/ - function addGoodsGrid(){ var AddData = [], columns1=[],visibleColumns1=[]; var checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"}); @@ -417,11 +438,14 @@ success:function(data){ if(data.success===true){ var database =data.data; - var databaseGood ={"id":(Math.round(Math.random() * 10000)),}; + console.log(database.barcode) + // var databaseGood ={"id":(Math.round(Math.random() * 10000)),}; + var databaseGood ={"id":data.data.barcode} $.each(database,function(k,v){ databaseGood[k]=v; }) dataView.addItem(databaseGood); + console.log(databaseGood) $('.Barcode').val(data.data.barcode) grid01.invalidateRows(); grid01.render(); @@ -438,9 +462,9 @@ }) dataView.setItems(AddData); dataView.endUpdate(); -}; +} /* save Data*/ -$('.AddRecord').click(function(){ +function KeyBoard(){ var addhospitalNum = $('#addhospitalNum').val();//住院号 var addtreatmentNum =$('#addtreatmentNum').val();//诊疗号 var addwashHandNurse =$('#addwashHandNurse').val();//洗手护士 @@ -470,6 +494,7 @@ var recordGoodsArray=[]; var allTableData =$('.RecordGoodes').val(); var allTableDataJson=[] + if(!allTableData){ allTableDataJson; }else{ @@ -502,7 +527,7 @@ type:'post', async:false, dataType:'json', - data:{hospitalNum:addhospitalNum,treatmentNum :addtreatmentNum,addwashHandNurse:addwashHandNurse, + data:{hospitalNum:addhospitalNum,treatmentNum :addtreatmentNum,washHandNurse: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, @@ -517,16 +542,85 @@ } }) } +} +$('.AddRecord').click(function(){ + KeyBoard(); }); -/*details*/ -function ClickName(id){ - if(id!=''){ - AjaxModal(id); - RecordGoodes(id); - $('.ModifySaveId').val(id) +//审核 +$('.BtnExamine').click(function(){ + if($('.DeleteInput').val()==''){ + alert('请选择一条数据'); + return false; + }else{ + if($('.detailsStatus').val()==='已审核'){ + alert('本条记录已经通过审核'); + return false; + } + if($('.detailsStatus').val()==='已申请'){ + alert('本条记录已经通过申请'); + return false; + }else{ + $('.SvaExamine').click(function(){ + var idcards= $('.DeleteInput').val(); + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewMultiUseRecord.mhtml', + type:'get', + dataType:'json', + async:false, + data:{useRecordIds:idcards}, + success:function(data){ + if(data.success===true){ + window.location.href = window.location.href; + }else{ + alert(data.message) + } + } + }) + }) + } + } -}; +}); +//生成申请单 +$('.Createapplication').click(function(){ + if($('.DeleteInput').val()==''){ + alert('请选择一条数据'); + return false; + }else{ + if($('.detailsStatus').val()==='已申请'){ + alert('本条记录已经通过申请'); + return false; + } + if($('.detailsStatus').val()==='未审核'){ + alert('病人名称为“朱珊瑶”的使用记录不能生成申请单,请确认使用记录已审核且未转化成申请单') + return false; + } + else{ + $('.Createapplicationstr').click(function(){ + var idcards= $('.DeleteInput').val(); + var departAll=''; + var departCoding=''; + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewAndConvertMuitiUseRecordForm.mhtml', + type:'post', + dataType:'json', + async:false, + data:{operator:currentUserFullName,useRecordIds:idcards,depart:departAll,departCoding:currentOrgUnitCode}, + success:function(data){ + if(data.success===true){ + $("#Createapplication").modal('hide'); + window.location.href = window.location.href; + }else{ + alert(data.message) + } + } + }) + }) + } + } +}) +/*details*/ // 封装动态模态框 function AjaxModal(id){ var str=""; @@ -571,7 +665,7 @@ }) -}; +} //加载使用物品明细 function RecordGoodes(id){ var AddData = []; @@ -592,8 +686,8 @@ field: 'barcode', name: '条码', cssClass: "cell-title", - width:30, - minWidth: 30, + width:120, + minWidth: 120, }, { @@ -651,8 +745,8 @@ id:'types', field: 'types', name: '操作', - formatter:function(index,row,value){ - return '删除' + formatter:function(value,row,index,columnDef,dataContext){ + return '删除' }, cssClass: "cell-title", } @@ -673,13 +767,16 @@ data:{useRecordId:id}, dataType:'json', success:function(data){ + $('.ModifiedData').val(JSON.stringify(data.rows)) var database =data.rows; + $('#ModifiedData').val(database) + // console.log(database) for(var i=0;ix请输入诊疗号或者住院号或者病人姓名') $ ('#Alert').show ().delay (1500).fadeOut (); @@ -792,11 +896,11 @@ type:'post', async:false, dataType:'json', - data:{id:ModifySaveId,originalFormParams:ModifySaveStr,originalItems:RecordGoodes,hospitalNum:hospitalNum,treatmentNum :treatmentNum,addwashHandNurse:washHandNurse, + data:{id:detailsId,originalFormParams:ModifySaveStr,originalItems:RecordGoodes,hospitalNum:hospitalNum,treatmentNum :treatmentNum,addwashHandNurse:washHandNurse, circuitNurse:circuitNurse,depart:depart,operationRoom:operationRoom,patientAge:patientAge,patientSex:patientSex,patientArea:patientArea,roomNumber:roomNumber, patientIDCard:patientIDCard,bedNumber:bedNumber,doctorName:doctorName,surgeon:doctorName,specialInfection:specialInfection,operation:operation, operationScheduleId:operationScheduleId,operationTimeStr:operationTime,visitId:visitId,enteringDateStr:enteringTime,operator:operator, - remark:remark,patientName:patientName,applicationTime:applicationTime,items:recordGoodsArrays,departCoding:currentOrgUnitCode}, + remark:remark,patientName:patientName,applicationTime:applicationTime,items:allTableData,departCoding:currentOrgUnitCode}, success:function(data){ if(data.success===true){ $("#mymodal-details").modal('hide'); @@ -820,72 +924,12 @@ RecordGoodes($('.detailsId').val()); } }) -//审核 -$('.BtnExamine').click(function(){ - if($('.DeleteInput').val()==''){ - alert('请选择一条数据'); - return false; - }else{ - if($('.detailsStatus').val()==='已审核'){ - alert('本条记录已经通过审核'); - return false; - } - if($('.detailsStatus').val()==='已申请'){ - alert('本条记录已经通过申请'); - return false; - }else{ - $('.examineAlert').click(function(){ - var idcards= $('.DeleteInput').val(); - $.ajax({ - url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewMultiUseRecord.mhtml', - type:'get', - dataType:'json', - async:false, - data:{useRecordIds:idcards}, - success:function(data){ - if(data.success===true){ - window.location.href = window.location.href; - }else{ - alert(data.message) - return false; - } - } - }) - }) - } - - } -}); -//生成申请单 -$('.Createapplication').click(function(){ - if($('.DeleteInput').val()==''){ - alert('请选择一条数据'); - return false; - }else{ - if($('.detailsStatus').val()==='已申请'){ - alert('本条记录已经通过申请'); - return false; - }else{ - $('.Createapplication').click(function(){ - var idcards= $('.DeleteInput').val(); - var departAll=''; - var departCoding=''; - $.ajax({ - url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewAndConvertMuitiUseRecordForm.mhtml', - type:'get', - dataType:'json', - async:false, - data:{operator:currentUserFullName,useRecordIds:idcards,depart:departAll,departCoding:currentOrgUnitCode}, - success:function(data){ - if(data.success===true){ - $("#Createapplication").modal('hide'); - window.location.href = window.location.href; - }else{ - alert(data.message) - } - } - }) - }) - } - } +//刷新 +$('.giyphicon_icon').click(function (){ + // grid.invalidateRow(); + // grid.render(); + // alert('a') + window.location.reload() }) + +