Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp =================================================================== diff -u -r24507 -r24518 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp (.../index.jsp) (revision 24507) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp (.../index.jsp) (revision 24518) @@ -83,7 +83,7 @@
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js =================================================================== diff -u -r24508 -r24518 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24508) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24518) @@ -1,3 +1,12 @@ +/*alert('currentUserName=' + currentUserName); +alert('currentUserFullName=' + currentUserFullName); +alert('currentOrgUnitCode=' + currentOrgUnitCode); +alert('currentOrgUnitName=' + currentOrgUnitName); +*/ +$('#addHandle').click(function(){ + $('#sterilization').val(currentUserName)//科室 + +}) $(window).resize(function () { $("#table").bootstrapTable('resetView'); $("#Goods-table").bootstrapTable('resetView'); @@ -712,10 +721,11 @@ function AjaxModal(obj){ var str=""; $.ajax({ - url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationRecord.mhtml?id='+obj, + url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationRecord.mhtml', type:'get', async:true, dataType:'json', + data:{id:obj}, success:function(data){ if(data.success===true){ var datas=data.data; @@ -731,9 +741,11 @@ $('#sterilizationPurposes').val(sterilizationPurpose) $.ajax({ async:false, - url:WWWROOT+"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml?sterilerGroup="+sterilerGroup, + url:WWWROOT+"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml", dataType:"json", type:'get', + contentType: "application/json;charset=utf-8", + data:{sterilerGroup:sterilerGroup}, success:function(data){ var lie=data.rows; if(data.success===true){ @@ -761,6 +773,8 @@ } }); $.ajax({ + async:false, + contentType: "application/json;charset=utf-8", url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getSterilizationPurposeList.mhtml', type:'get', dataType:'json', @@ -770,10 +784,6 @@ var isExist =false; if(data.success===true){ for(var i=0;i"+datas[i]['optionText']+""); - // $('#purpose').append(opt) - // alert(datas[i]['optionText']) - if(datas[i]['optionText'].indexOf(sterilizationPurpose)==-1){ str +=" "; } @@ -783,7 +793,7 @@ } } if(isExist == false){ - str=" "; + str=" "; } $("#udpurpose").html(str); }else{ @@ -793,7 +803,7 @@ } }) $('#udprocedure').html(''); - $('#udpurpose').html(''); + // $('#udpurpose').html(''); $('#udstarttime').val(datas.startDateStr); $('#textareas').text(datas.parameter); $('#udSterilizingnote').val(datas.remark); @@ -824,7 +834,7 @@ //灭菌物品统计 var allTableDatas = $('#udsterilizationListTbale').bootstrapTable('getData'); - var allType; + var allType=''; if(allTableDatas==''){ $('#sterils_1').text('0') $('#sterils_2').text('0') @@ -833,9 +843,8 @@ $('#sterils_5').text('0') }else{ for(var i=0;i"); $.ajax({ - url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#udsters').val(), + url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml', type:'get', dataType:'json', + data:{sterilizerName:$('#udsters').val()}, success:function(data){ var datas= data.rows; console.log(datas) @@ -1120,9 +1131,10 @@ sterilerGroup = decodeURI(r[2]) } $.ajax({ - url:WWWROOT+'/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml?sterilerGroup='+sterilerGroup, + url:WWWROOT+'/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml', type:'get', dataType:'json', + data:{sterilerGroup:sterilerGroup}, success:function(data){ var datas =data.rows; var str = ""; @@ -1136,10 +1148,11 @@ }) $('#sters').change(function(){ $.ajax({ - url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getMaxFrequency.mhtml?sterilizerName='+$('#sters').val(), + url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getMaxFrequency.mhtml', dataType:'json', type:'get', async:false, + data:{sterilizerName:$('#sters').val()}, success:function(data){ if(data.success===true){ $('#furnace').val(data.data.maxFrequency); @@ -1150,12 +1163,13 @@ } }) $.ajax({ - url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#sters').val(), + url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml', type:'get', dataType:'json', + async:false, + data:{sterilizerName:$('#sters').val()}, success:function(data){ var datas= data.rows; - console.log(datas) if(data.success===true){ var str = ""; str=" "