Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js
===================================================================
diff -u -r24570 -r24753
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js (.../record.js) (revision 24570)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js (.../record.js) (revision 24753)
@@ -1,4 +1,4 @@
-
+ var parentHead = window.parent.$(".head-index").height();
$('#addHandle').click(function(){
$('#adddepart').val(currentOrgUnitName)//科室
$('#adddepart').attr('disabled',true)
@@ -39,13 +39,19 @@
align:'center',
sortable: true,
order: "desc",
+ formatter: function (value,row,index){
+ return ''+row.hospitalNum+' '
+ },
},
{
field: 'treatmentNum',
title: '诊疗号',
align:'center',
sortable: true,
order: "desc",
+ formatter: function (value,row,index){
+ return ''+row.treatmentNum+' '
+ },
},
{
field: 'operationTimeStr',
@@ -147,7 +153,7 @@
exportDataType: "selected", //导出checkbox选中的行数
paginationLoop: false, //是否无限循环
columns: columnArray,
- height:$(window).height()-($('.Nan-content').height()+$('.content-header').height()+84),
+ height:$(window).height()-($('.Nan-content').height()+$('.content-header').height()+parentHead),
});
return InitTable;
}
@@ -497,10 +503,11 @@
function AjaxModal(obj){
var str="";
$.ajax({
- url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadUseRecordById.mhtml?useRecordId='+obj,
+ url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadUseRecordById.mhtml',
type:'get',
async:true,
dataType:'json',
+ data:{useRecordId:obj},
success:function(data){
if(data.success===true){
var datas =data.data;
@@ -645,7 +652,6 @@
var data = allTableData[i];
objConservation.barcode = data.barcode;
recordGoodsArray.push(objConservation);
-
}
var recordGoodsArrays= JSON.stringify(recordGoodsArray)
if(hospitalNum===''&&treatmentNum===''&&patientName==''){
@@ -678,19 +684,33 @@
}
}
$('#updateHandle').click(function(){
- var $table=$('#table');
- var selectContent = $table.bootstrapTable('getSelections')[0];
+ var $table=$('#table');
+ var selectContent = $table.bootstrapTable('getSelections')[0];
if(typeof(selectContent) == 'undefined') {
$('#Alert').html('x 请选择需要修改的使用记录信息！')
$ ('#Alert').show ().delay (1500).fadeOut ();
return false;
}else{
+ // if(selectContent.status=='已申请'){
+ // $('#ModifySave').hide();
+ // $('#Audit').hide();
+ // $('#Recovery').hide();
+ // $('#Generate').hide();
+ // //return ;
+ // }
+ // if(selectContent.status=='已审核'){
+ // $('#ModifySave').hide();
+ // $('#Audit').hide();
+ // $('#Recovery').hide();
+ // // return ;
+ // }
var obj =selectContent.id;
$('#ModifySaveId').val(obj)
AjaxModal(obj)
RecordGoodes(obj);
}
})
+
//删除使用记录
$("#finishHandle").on("click", function () {
var rows = $("#table").bootstrapTable('getSelections');
@@ -705,7 +725,6 @@
arrays.push(this.id);// cid为获得到的整条数据中的一列
});
var idcards =JSON.stringify(arrays)
- console.log(idcards)
$.ajax({
url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/deleteUseRecord.mhtml?useRecordIds='+idcards,
type:'get',
@@ -745,6 +764,8 @@
if(data.success===true){
$('#addGoods-table').bootstrapTable('append',data.data);
$('#Barcode').val(data.data.barcode)
+ }else{
+ alert(data.message)
}
}
@@ -792,7 +813,7 @@
}
var recordGoodsArrays= JSON.stringify(recordGoodsArray)
- console.log(recordGoodsArrays)
+
if(addwashHandNurse==''){
$('#Alert').html('x洗手护士不能为空')
$ ('#Alert').show ().delay (1500).fadeOut ();
@@ -807,11 +828,6 @@
$('#Alert').html('x请输入诊疗号或者住院号或者病人姓名')
$ ('#Alert').show ().delay (1500).fadeOut ();
}else{
- if(tempBarcode==''){
- $('#Alert').html('x机械包信息不能为空')
- $ ('#Alert').show ().delay (1500).fadeOut ();
- return;
- }else{
$.ajax({
url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/saveUseRecord.mhtml',
type:'post',
@@ -832,7 +848,7 @@
}
})
}
- }
+
})
//修改保存
$('#tempBarcodes').on('keydown',function(e){
@@ -873,6 +889,10 @@
$ ('#Alert').show ().delay (1500).fadeOut ();
return false;
}else{
+ if(rows[0].status==='已审核'){
+ alert('本条记录已经通过审核');
+ return false;
+ }
$('#SvaExamine').on('click',function(){
var arrays = new Array();// 声明一个数组
$(rows).each(function () {// 通过获得别选中的来进行遍历
@@ -906,30 +926,38 @@
$ ('#Alert').show ().delay (1500).fadeOut ();
return false;
}else{
- $('#Createapplication').on('click',function(){
- var arrays = new Array();// 声明一个数组
- var departAll='';
- var departCoding ='';
- $(rows).each(function () {// 通过获得别选中的来进行遍历
- arrays.push(this.id);// cid为获得到的整条数据中的一列
- departAll=this.depart;
- alldepartCoding=this.departCoding;
- });
- var idcards =JSON.stringify(arrays)
- $.ajax({
- url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewAndConvertMuitiUseRecordForm.mhtml',
- type:'get',
- dataType:'json',
- async:false,
- data:{operator:currentUserCode,useRecordIds:idcards,depart:departAll,departCoding:currentOrgUnitCode},
- success:function(data){
- if(data.success===true){
- $("#Createapplication").modal('hide');
- window.location.href = window.location.href;
+ if(rows[0].status==='已申请'){
+ alert('此条记录状态已经申请成功');
+ return false;
+ }else{
+ $('#CreateapplicationStr').on('click',function(){
+ var arrays = new Array();// 声明一个数组
+ var departAll='';
+ var departCoding='';
+ $(rows).each(function () {// 通过获得别选中的来进行遍历
+ arrays.push(this.id);// cid为获得到的整条数据中的一列
+ departAll=this.depart;
+ alldepartCoding=this.departCoding;
+ });
+ var idcards =JSON.stringify(arrays)
+ $.ajax({
+ url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewAndConvertMuitiUseRecordForm.mhtml',
+ type:'get',
+ dataType:'json',
+ async:false,
+ data:{operator:currentUserFullName,useRecordIds:idcards,depart:departAll,departCoding:currentOrgUnitCode},
+ success:function(data){
+ if(data.success===true){
+ $("#Createapplication").modal('hide');
+ window.location.href = window.location.href;
+ }else{
+ alert(data.message)
+ }
}
- }
+ })
})
- })
+ }
+
}
})
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilizationLoad/sterilizationLoad.js
===================================================================
diff -u -r24680 -r24753
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilizationLoad/sterilizationLoad.js (.../sterilizationLoad.js) (revision 24680)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilizationLoad/sterilizationLoad.js (.../sterilizationLoad.js) (revision 24753)
@@ -6,9 +6,13 @@
$("#BasketItems").bootstrapTable('resetView');
});
// 计算height
-var staHeight=$(window).height()-($('.statisticsone').height()+$('.content-left_title').height()+$('.content-header').height()+$('.content-header').height())
-var staHeight1=$(window).height()-($('.Instrument_message').height()+$('.content-left_title').height()+$('.content-header').height())
+var staHeight=$(window).height()-($('.statisticsone').height()+$('.content-left_title').height()+$('.content-header').height()+window.parent.$('.content-index').height()+95)
+var staHeight1=$(window).height()-($('.Instrument_message').height()+$('.content-header').height()+window.parent.$('.content-index').height()+95)
console.log(staHeight1)
+
+
+
+// console.log(staHeight1)
//表格
$('#statisticsGoodsTbale').bootstrapTable({
striped: true,
@@ -21,23 +25,29 @@
columns: [
{
field: 'tiaoma',
- title: '器械包名称'
+ align:'center',
+ title: '器械包名称',
+ order: "desc",
+ sortable: true,
},
{
field: 'name',
+ align:'center',
title: '数量',
- // formatter: operateFormatter //鑷畾涔夋柟娉曪紝娣诲姞鎿嶄綔鎸夐挳
+ order: "desc",
+ sortable: true,
}, {
field: 'type',
+ align:'center',
title: '操作',
+ order: "desc",
+ sortable: true,
formatter: function (value,row,index){
return '删除'
},
}
],
- data: [{tiaoma: '折线包',name: '10'},
-
- ],
+ data: [{tiaoma: '折线包',name: '10'}],
})
$('#statisticsparticulars').bootstrapTable({
striped: true,
@@ -50,22 +60,31 @@
columns: [
{
field: 'tiaoma',
- title: '器械包名称'
+ align:'center',
+ title: '器械包名称',
+ sortable: true,
},{
field:'Barcode',
+ align:'center',
title:'条码',
+ sortable: true,
},
{
field:'fanshi',
+ align:'center',
title:'灭菌方式',
+ sortable: true,
},
{
field: 'name',
+ align:'center',
title: '数量',
- // formatter: operateFormatter //鑷畾涔夋柟娉曪紝娣诲姞鎿嶄綔鎸夐挳
+ sortable: true,
}, {
field: 'type',
+ align:'center',
title: '操作',
+ sortable: true,
formatter: function (value,row,index){
return '删除'
},
@@ -89,37 +108,46 @@
{tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
{tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
{tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
- {tiaoma: '折线包',Barcode:'0001012',fanshi:'',name: '1'},
+ {tiaoma: '折线包',Barcode:'0001012',fanshi:'',name: '1'}
],
});
$('#TheSterilizationTables').bootstrapTable({
striped: true,
cache: false,
sortOrder: "asc",
- height:'400' ,
+ height:'270' ,
uniqueId: "id",
detailView: false,
removeByUniqueId:1,
columns: [
{
field: 'tiaoma',
- title: '器械包名称'
+ align:'center',
+ title: '器械包名称',
+ sortable: true,
},{
field:'Barcode',
+ align:'center',
title:'条码',
+ sortable: true,
},
{
field:'fanshi',
+ align:'center',
title:'灭菌方式',
+ sortable: true,
},
{
field: 'name',
+ align:'center',
title: '数量',
- // formatter: operateFormatter //鑷畾涔夋柟娉曪紝娣诲姞鎿嶄綔鎸夐挳
+ sortable: true,
}, {
field: 'type',
+ align:'center',
title: '操作',
+ sortable: true,
formatter: function (value,row,index){
return '删除'
},
@@ -136,26 +164,30 @@
{tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
{tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
{tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
- {tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
+ {tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'}
],
});
$('#Instrumentalstatistics').bootstrapTable({
striped: true,
cache: false,
sortOrder: "asc",
- height:'440' ,
+ height:'300' ,
uniqueId: "id",
detailView: false,
removeByUniqueId:1,
columns: [
{
field: 'tiaoma',
- title: '器械包类型'
+ align:'center',
+ title: '器械包类型',
+ sortable: true,
},
{
field: 'name',
+ align:'center',
title: '数量',
+ sortable: true,
}
],
@@ -170,7 +202,7 @@
{tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
{tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
{tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
- {tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'},
+ {tiaoma: '折线包',Barcode:'0001011',fanshi:'',name: '1'}
],
});
@@ -185,29 +217,43 @@
columns: [
{
field: 'name',
- title: '名称'
+ align:'center',
+ title: '名称',
+ sortable: true,
},{
field:'total',
+ align:'center',
title:'篮筐内总数',
+ sortable: true,
},
{
field:'tiaoma',
+ align:'center',
title:'条形码',
+ sortable: true,
},
{
field: 'times',
+ align:'center',
title: '审核时间',
+ sortable: true,
}, {
field: 'miejtype',
+ align:'center',
title: '灭菌方式',
+ sortable: true,
},
{
field: 'baototla',
+ align:'center',
title: '包数量',
+ sortable: true,
},
{
field: 'typek',
+ align:'center',
title: '转换灭菌框',
+ sortable: true,
}
],
data: [{name:'111',total:'1',tiaoma:'0000000',times:'2018-01-11',miejtype:'111',baototla:'1',typek:'1111'},
@@ -220,7 +266,7 @@
{name:'111',total:'1',tiaoma:'0000000',times:'2018-01-11',miejtype:'111',baototla:'1',typek:'1111'},
{name:'111',total:'1',tiaoma:'0000000',times:'2018-01-11',miejtype:'111',baototla:'1',typek:'1111'},
{name:'111',total:'1',tiaoma:'0000000',times:'2018-01-11',miejtype:'111',baototla:'1',typek:'1111'},
- {name:'111',total:'1',tiaoma:'0000000',times:'2018-01-11',miejtype:'111',baototla:'1',typek:'1111'},
+ {name:'111',total:'1',tiaoma:'0000000',times:'2018-01-11',miejtype:'111',baototla:'1',typek:'1111'}
],
});