Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js =================================================================== diff -u -r24567 -r24568 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24567) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24568) @@ -4,7 +4,7 @@ alert('currentOrgUnitName=' + currentOrgUnitName); */ $('#addHandle').click(function(){ - $('#sterilization').val()//科室 + $('#sterilization').val(currentUserCode)//科室 sterilizationListTotal() addallTableDatas(); @@ -182,8 +182,6 @@ // array.push(columnArray[i]["field"]) } $('#hiddens').val(JSON.stringify(array)); - - //今天审核的待灭菌物品 add $(function() { $(function() { @@ -383,9 +381,9 @@ } }, - error:function(){ - alert('错误') - } + // error:function(){ + // alert('错误') + // } }) }) $(function() { @@ -575,6 +573,16 @@ 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 +}); //灭菌物品列表 details function loadSterilizationGoods(obj){ $.ajax({ @@ -718,6 +726,7 @@ $('#sterilizerNames').val(sterilizerName) var sterilizationPurpose =datas.sterilizationPurpose; $('#sterilizationPurposes').val(sterilizationPurpose) + $('#udendtime').val(datas.endDateStr) $.ajax({ async:false, url:WWWROOT+"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml", @@ -731,19 +740,18 @@ var str = ""; var isExist=false; for(var j=0;j"+lie[j]['name']+" "; + if(lie[j].name.indexOf(sterilizerName)==-1){ + str +=" "; } - if(lie[j]['name']===sterilizerName){ - str+=" "; + if(lie[j].name===sterilizerName){ + str+=" "; isExist=true; } } if(isExist == false){ - str=" "; + str=" "; } $("#udsters").html(str); @@ -859,7 +867,6 @@ var udprocedure =$('#udprocedure').val(); var udpurpose =$('#udpurpose').val() var sterilizationPurposes =$('#sterilizationPurposes').val(); - console.log(sterilizationPurposes) var sterilizationP =""; if(udpurpose==''){ sterilizationP=sterilizationPurposes; @@ -888,24 +895,34 @@ } } var sterilingGoodsArrays= JSON.stringify(sterilingGoodsArray) - $.ajax({ - url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/saveSterilizationRecord.mhtml', - type:'post', - dataType:'json', - // async:false, - data:{id:deteilsId, recordId:'',barcodePositionInfo:'',sterilizationUser:udsterilization,sterilizationShelf:udsterilizationName, - frequency:udfurnace,sterilizerName:sterilizermames,sterilizationType:udprocedure,sterilizationPurpose:sterilizationP,startDate:udstarttime,parameter:textareas, - remark:udSterilizingnote,sterilizationGoods:sterilingGoodsArrays,srSituationComfirmer:'',cycleCounter:5,endDate:''}, - success:function(data){ - if(data.success===true){ - $("#mymodal-data").modal('hide'); - window.location.href = window.location.href; - }else{ - alert(data.message) - } + if(sterilingGoodsArrays === '[]'){ + $('.SaveAlert').attr('id','SaveAlert') + $('#SaveOK').click(function(){ + SaveConservation(); + }) + }else{ + SaveConservation(); + } + function SaveConservation(){ + $.ajax({ + url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/saveSterilizationRecord.mhtml', + type:'post', + dataType:'json', + // async:false, + data:{id:deteilsId, recordId:'',barcodePositionInfo:'',sterilizationUser:udsterilization,sterilizationShelf:udsterilizationName, + frequency:udfurnace,sterilizerName:sterilizermames,sterilizationType:udprocedure,sterilizationPurpose:sterilizationP,startDate:udstarttime,parameter:textareas, + remark:udSterilizingnote,sterilizationGoods:sterilingGoodsArrays,srSituationComfirmer:'',cycleCounter:5,endDate:''}, + success:function(data){ + if(data.success===true){ + $("#mymodal-data").modal('hide'); + window.location.href = window.location.href; + }else{ + alert(data.message) + } - } - }) + } + }) + } }) //完成灭菌 $("#completes").on("click", function () { @@ -1294,23 +1311,29 @@ } } var sterilingGoodsArrays= JSON.stringify(sterilingGoodsArray) - $.ajax({ - url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/saveSterilizationRecord.mhtml', - type:'post', - dataType:'json', - async:false, - data:{id:'',recordId:'',barcodePositionInfo:'',sterilizationGoods:sterilingGoodsArrays,sterilizationUser:sterilization,sterilizationShelf:sterilizationName,sterilizerName:sters,srSituationComfirmer:'',frequency:furnace,cycleCounter:'',sterilizationType:procedure,sterilizationPurpose:purpose,startDate:addstarttime,endDate:'',parameter:form_input,remark:Sterilizingnote}, - success:function(data){ - if(data.success===true){ - $("#mymodal-data").modal('hide'); - window.location.href = window.location.href; - }else{ - alert(data.message) + + if(sters==''||procedure==''||purpose==''){ + alert('请输入表单的各值') + }else{ + $.ajax({ + url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/saveSterilizationRecord.mhtml', + type:'post', + dataType:'json', + async:false, + data:{id:'',recordId:'',barcodePositionInfo:'',sterilizationGoods:sterilingGoodsArrays,sterilizationUser:sterilization,sterilizationShelf:sterilizationName,sterilizerName:sters,srSituationComfirmer:'',frequency:furnace,cycleCounter:'',sterilizationType:procedure,sterilizationPurpose:purpose,startDate:addstarttime,endDate:'',parameter:form_input,remark:Sterilizingnote}, + success:function(data){ + if(data.success===true){ + $("#mymodal-data").modal('hide'); + window.location.href = window.location.href; + }else{ + alert(data.message) + } + } - - } - }) + }) + } + }) //修改每一行的数据 $('#updateHandle').click(function(){ @@ -1358,10 +1381,10 @@ if(allTableDatas[i].type===1){ if(objs.type===1){ allchildren.push(objs.type) - if(countResult[objs['name']]){ - countResult[objs['name']]=countResult[objs['name']]+1; + if(countResult[objs.name]){ + countResult[objs.name]=countResult[objs.name]+1; }else{ - countResult[objs['name']]=1; + countResult[objs.name]=1; } } @@ -1370,19 +1393,19 @@ allchildren.push(objs.children[j]) //获取children的数据进行统计 var objChildren =objs.children[j] - if(countResult[objChildren["name"]]){ - countResult[objChildren["name"]]=countResult[objChildren["name"]] + 1; + if(countResult[objChildren.name]){ + countResult[objChildren.name]=countResult[objChildren.name] + 1; }else{ - countResult[objChildren["name"]]=1; + countResult[objChildren.name]=1; } } }else{ if(objs.type===2){ allchildren.push(objs.type) - if(countResult[objs['name']]){ - countResult[objs['name']]=countResult[objs['name']]+1; + if(countResult[objs.name]){ + countResult[objs.name]=countResult[objs.name]+1; }else{ - countResult[objs['name']]=1; + countResult[objs.name]=1; } } Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp =================================================================== diff -u -r24567 -r24568 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp (.../index.jsp) (revision 24567) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp (.../index.jsp) (revision 24568) @@ -6,7 +6,7 @@ 高温灭菌 - + <%@ include file="../commons/tagLibsPath.jsp"%> @@ -443,6 +443,14 @@ +
  • +
    + +
    +
  • - + <%----%> + +
    @@ -1037,6 +1047,22 @@ + + + +