Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js
===================================================================
diff -u -r24495 -r24500
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js (.../record.js) (revision 24495)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js (.../record.js) (revision 24500)
@@ -337,7 +337,7 @@
title: '批次'
},
{
- field: 'validUntil',
+ field: 'validUntilStr',
title: '失效日期'
},
{
@@ -611,7 +611,7 @@
async:false,
success:function(data){
if(data.success===true){
- $('#addGoods-table').bootstrapTable('append',data);
+ $('#addGoods-table').bootstrapTable('append',data.data);
}
}
@@ -665,8 +665,8 @@
recordGoodsArray.push(objConservation);
}
}
- var recordGoodsArray= JSON.stringify(recordGoodsArray)
- console.log(recordGoodsArray)
+ var recordGoodsArrays= JSON.stringify(recordGoodsArray)
+ console.log(recordGoodsArrays)
if(addhospitalNum==''&&addtreatmentNum==''&&addpatientName==''){
$('#Alert').html('x请输入诊疗号或者住院号或者病人姓名')
$ ('#Alert').show ().delay (1500).fadeOut ();
@@ -684,12 +684,13 @@
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},
+ remark:addremark,patientName:addpatientName,applicationTime:addapplicationTime,items:recordGoodsArrays},
success:function(data){
if(data.success===true){
- $('#Alert').html('x'+data.message)
- $ ('#Alert').show ().delay (1500).fadeOut ();
+ $("#mymodal-data").modal('hide');
window.location.href = window.location.href;
+ }else{
+ alert(data.message)
}
}
})