Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js =================================================================== diff -u -r24950 -r24954 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js (.../sterilization1.js) (revision 24950) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js (.../sterilization1.js) (revision 24954) @@ -1,3 +1,11 @@ +//光标默认 + +$('#mymodal-data').on('shown.bs.modal', function () { + $("#barCode").focus(); +}) +$('#mymodal-ud').on('shown.bs.modal', function () { + $("#udbarCode").focus(); +}) var grid,grid1,grid2,grid3,dataView1,dataView2,options1,options2,options3; var visibleColumns1=[]; var percentCompleteThreshold1 = 0; @@ -1440,3 +1448,34 @@ }) +//时间插件 +$('#addstarttime').datetimepicker({ + language: 'zh-CN', + weekStart: 1, + todayBtn: 1,//显示为今天的按钮,0无1有 + autoclose: 1,//单击时间后日历框是否自动关闭,1关闭,0不关闭 + todayHighlight: 1,//今天高亮显示 + startView: 2,//展示的样式,1小时,2日 + minView: 2,//选取到的时间,2天,1小时 + forceParse: 0 +}); +$('#udstarttime').datetimepicker({ + language: 'zh-CN', + weekStart: 1, + todayBtn: 1,//显示为今天的按钮,0无1有 + autoclose: 1,//单击时间后日历框是否自动关闭,1关闭,0不关闭 + todayHighlight: 1,//今天高亮显示 + startView: 2,//展示的样式,1小时,2日 + minView: 2,//选取到的时间,2天,1小时 + forceParse: 0 +}); +$('#udendtime').datetimepicker({ + language: 'zh-CN', + weekStart: 1, + todayBtn: 1,//显示为今天的按钮,0无1有 + autoclose: 1,//单击时间后日历框是否自动关闭,1关闭,0不关闭 + todayHighlight: 1,//今天高亮显示 + startView: 2,//展示的样式,1小时,2日 + minView: 2,//选取到的时间,2天,1小时 + forceParse: 0 +}); \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js =================================================================== diff -u -r24950 -r24954 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js (.../slickGridRecord.js) (revision 24950) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js (.../slickGridRecord.js) (revision 24954) @@ -1,8 +1,20 @@ +//光标默认 +$(function(){ + $('#txtSearch').focus() +}) + +$('#mymodal-data').on('shown.bs.modal', function () { + $("#addhospitalNum").focus(); +}) +$('#mymodal-details').on('shown.bs.modal', function () { + $("#hospitalNum").focus(); +}) //公共 $('#addHandle').click(function(){ $('#adddepart').val(currentOrgUnitName)//科室 $('#adddepart').attr('disabled',true) $('#addoperator').val(currentUserFullName) + // document.getElementById("tempBarcode").focus(); }) //模态框收起 @@ -813,9 +825,11 @@ width:100, minWidth: 100, formatter:function(value,row,index,cumnDef,dataContext){ + // console.log(cumnDef) return '详情'+ '删除' }, + cssClass: "cell-title", } ); @@ -838,7 +852,7 @@ data:{useRecordId:id}, dataType:'json', success:function(data){ - console.log(data.rows) + // console.log(data.rows) $('.ModifiedData').val(JSON.stringify(data.rows)) var database =data.rows; // console.log(database) @@ -859,6 +873,9 @@ }); dataView1 = new Slick.Data.DataView({inlineFilters: true}); grid03 = new Slick.Grid("#GoodsTablGrid", AddData, visibleColumns1, options1); + grid03.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false})); + grid03.registerPlugin(checkboxSelector); + var columnpicker = new Slick.Controls.ColumnPicker(visibleColumns1, grid03, options1); grid03.render(); $('#tempBarcodes').keydown(function(e){ if(e.keyCode=='13'){ @@ -899,9 +916,8 @@ } }) - }) - + }) } //封装修改保存 function ModifySave(){ @@ -985,7 +1001,7 @@ return false; }else{ AjaxModal($('.detailsId').val()) - // RecordGoodes($('.detailsId').val()); + RecordGoodes($('.detailsId').val()); } }) //刷新 @@ -997,13 +1013,45 @@ }) -//详情删除 -function OnremoveGood(deleteId){ - var datadelete=grid02.getData().getItems()[deleteId] - var itemId = new Array() - dataview.deleteItem(itemId[j]); //删除数据 - grid.invalidate(); - grid.render();//重新渲染 - -} \ No newline at end of file +// 时间插件 +$('#addenteringTime').datetimepicker({ + language: 'zh-CN', + weekStart: 1, + todayBtn: 1,//显示为今天的按钮,0无1有 + autoclose: 1,//单击时间后日历框是否自动关闭,1关闭,0不关闭 + todayHighlight: 1,//今天高亮显示 + startView: 2,//展示的样式,1小时,2日 + minView: 2,//选取到的时间,2天,1小时 + forceParse: 0 +}); +$('#addoperationTime').datetimepicker({ + language: 'zh-CN', + weekStart: 1, + todayBtn: 1,//显示为今天的按钮,0无1有 + autoclose: 1,//单击时间后日历框是否自动关闭,1关闭,0不关闭 + todayHighlight: 1,//今天高亮显示 + startView: 2,//展示的样式,1小时,2日 + minView: 2,//选取到的时间,2天,1小时 + forceParse: 0 +}); +$('#enteringTime').datetimepicker({ + language: 'zh-CN', + weekStart: 1, + todayBtn: 1,//显示为今天的按钮,0无1有 + autoclose: 1,//单击时间后日历框是否自动关闭,1关闭,0不关闭 + todayHighlight: 1,//今天高亮显示 + startView: 2,//展示的样式,1小时,2日 + minView: 2,//选取到的时间,2天,1小时 + forceParse: 0 +}); +$('#operationTime').datetimepicker({ + language: 'zh-CN', + weekStart: 1, + todayBtn: 1,//显示为今天的按钮,0无1有 + autoclose: 1,//单击时间后日历框是否自动关闭,1关闭,0不关闭 + todayHighlight: 1,//今天高亮显示 + startView: 2,//展示的样式,1小时,2日 + minView: 2,//选取到的时间,2天,1小时 + forceParse: 0 +}); \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css =================================================================== diff -u -r24908 -r24954 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css (.../index.css) (revision 24908) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css (.../index.css) (revision 24954) @@ -227,7 +227,7 @@ color:#5bc069; } .fonm-mg{ - margin-left:2%; + margin-left:1%; } .form-input,#Select,#specialInfection,#addSelect,#addspecialInfection{ Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp =================================================================== diff -u -r24950 -r24954 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp (.../index.jsp) (revision 24950) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp (.../index.jsp) (revision 24954) @@ -23,7 +23,7 @@ -
+