Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js
===================================================================
diff -u -r24411 -r24418
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24411)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24418)
@@ -402,7 +402,7 @@
//今天审核的待灭菌物品 details
$(function(){
$.ajax({
- url:WWWROOT+'/disinfectSystem/tousseInstanceController/getTodayPendingSterilizationTousseAndBasket.mhtml',
+ url:'http://rap2api.taobao.org/app/mock/85153/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationRecord.mhtml',
type:'get',
dataType:'json',
async:true,
@@ -718,7 +718,8 @@
dataType:'json',
success:function(data){
if(data.success===true){
- var datas=data.data;
+ var datas=data.data[0];
+ console.log(datas)
var str=
'
'+
''+
@@ -911,7 +912,7 @@
});
var idcards =JSON.stringify(arrays)
$.ajax({
- url:WWWROOT+'disinfectSystem/sterilization/sterilizationRecordController/completeSterilizationGoods.mhtml?sterilizationRecordIds='+idcards,
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/completeSterilizationGoods.mhtml?sterilizationRecordIds='+idcards,
type:'get',
dataType:'json',
success:function(data){
@@ -948,7 +949,7 @@
});
var idcards =JSON.stringify(arrays)
$.ajax({
- url:WWWROOT+'disinfectSystem/sterilization/sterilizationRecordController/failureSterilizationRecord.mhtml?sterilizationRecordId='+idcards,
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/failureSterilizationRecord.mhtml?sterilizationRecordId='+idcards,
type:'get',
dataType:'json',
success:function(data){
@@ -985,7 +986,7 @@
});
var idcards =JSON.stringify(arrays)
$.ajax({
- url:WWWROOT+'disinfectSystem/sterilization/sterilizationRecordController/interruptSterilizationRecord.mhtml?sterilizationRecordId='+idcards,
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/interruptSterilizationRecord.mhtml?sterilizationRecordId='+idcards,
type:'get',
dataType:'json',
success:function(data){
@@ -1017,7 +1018,7 @@
});
var idcards =JSON.stringify(arrays)
$.ajax({
- url:WWWROOT+'disinfectSystem/sterilization/sterilizationRecordController/deleteSterilizationRecord.mhtml?sterilizationRecordIds='+idcards,
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/deleteSterilizationRecord.mhtml?sterilizationRecordIds='+idcards,
type:'get',
dataType:'json',
success:function(data){
@@ -1037,7 +1038,7 @@
$(function(){
$.ajax({
// url:'./data/getSterilizationPurposeList.json',
- url:WWWROOT+'disinfectSystem/sterilization/sterilizationRecordController/getSterilizationPurposeList.mhtml',
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getSterilizationPurposeList.mhtml',
type:'get',
dataType:'json',
success:function(data){
@@ -1051,7 +1052,8 @@
})
$.ajax({
async:false,
- url:WWWROOT+"disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml?sterilerGroup=111&includeNone=yes",
+ /* url:WWWROOT+"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml?sterilerGroup=111&includeNone=yes",*/
+ url:WWWROOT+"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml",
dataType:"json",
success:function(data){
var lie=data.rows;
@@ -1070,7 +1072,7 @@
}
});
$.ajax({
- url:WWWROOT+'disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#sters').val(),
+ url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#sters').val(),
dataType:'json',
type:'get',
async:false,
@@ -1091,21 +1093,21 @@
$('#sters').change(function(){
$('.Option').hide();
$.ajax({
- url:WWWROOT+'disinfectSystem/sterilization/sterilizationRecordController/getMaxFrequency.mhtml?sterilizerName='+$('#sters').val(),
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getMaxFrequency.mhtml?sterilizerName='+$('#sters').val(),
dataType:'json',
type:'get',
async:false,
success:function(data){
if(data.success===true){
- $('#furnace').val(data.data.nextCycleCounter)
+ $('#furnace').val(data.data.maxFrequency)
$('#furnace').attr('disabled','disabled')
}else{
alert(data.message)
}
}
})
$.ajax({
- url:WWWROOT+'disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#sters').val(),
+ url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#sters').val(),
dataType:'json',
type:'get',
async:false,
@@ -1128,7 +1130,7 @@
$('#procedure').change(function(){
$('.procedure').hide();
$.ajax({
- url:WWWROOT+'disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#sters').val(),
+ url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#sters').val(),
type:'get',
dataType:'json',
async:false,
@@ -1151,7 +1153,7 @@
}else{
$.ajax({
// url:'http://rap2api.taobao.org/app/mock/85153/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml?sterilizationRecordId=&barcode='+$(this).val(),
- url:WWWROOT+'disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml?sterilizationRecordId='+$(this).val(),
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml?sterilizationRecordId='+$(this).val(),
type:'get',
dataType:'json',
async:false,
@@ -1260,15 +1262,19 @@
}
var sterilingGoodsArrays= JSON.stringify(sterilingGoodsArray)
$.ajax({
- url:WWWROOT+'disinfectSystem/sterilization/sterilizationRecordController/saveSterilizationRecord.mhtml',
+ 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)
}
+
}
})