-
-
-
-
+
+
+
-
- 高温灭菌
-
-
+
+
+
+
@@ -67,1021 +91,597 @@
+
-
-
+
+
+
-
-
-
-
-
- 灭菌记录
-
-
-
-
- 灭菌参数
-
-
-
-
- - --- --
-
-
- - --- --
-
-
- - --- --
-
-
- - --- --
-
-
- - --
-
-
- - --
-
-
- - --
-
-
- 灭菌物品列表
-
+
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 灭菌记录
+
+
+ <%--
--%>
+ <%----%>
+ <%--
--%>
+
+
+ 灭菌参数
+
- -
+
-
+ +-
-
- 灭菌物品统计
- 灭菌物品总数量:
+
+
-
- 篮筐:
- 器械包:
- 敷料包:
- 外来器械包:
- 代理灭菌包:
+
+
+
-
+
-
-
+
-
+
-
- 监测结果
-
- -
-
-
- - --- --
-
-
- - --- --
-
-
- - --- --
-
-
- - --- --
-
-
- - --- -- -
-
- 中断记录列表
-
-
-
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 今天审核的待灭菌物品
-
-
+
-
+ 灭菌物品列表
+
-
+
+
- 卸载物品统计列表
- 已卸载物品总数: 0
-
-
-
-
-
-
+
+
-
+ 灭菌物品统计
+ 灭菌物品总数量:
+
+ 篮筐:
+ 器械包:
+ 敷料包:
+ 外来器械包:
+ 代理灭菌包:
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- 确定灭菌失败吗？
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确定灭菌中断吗？
-
-
-
-
-
-
-
-
-
-
-
- 灭菌记录
-
-
-
-
- 灭菌参数
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%----%>
+
+
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js
===================================================================
diff -u -r24864 -r24938
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js (.../record.js) (revision 24864)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js (.../record.js) (revision 24938)
@@ -19,7 +19,7 @@
},
{
field: 'patientName',
- title: '病人',
+ name: '病人',
align:'center',
sortable: true,
order: "desc",
@@ -28,14 +28,14 @@
},
}, {
field: 'status',
- title: '状态',
+ name: '状态',
align:'center',
sortable: true,
order: "desc",
// formatter: operateFormatter //自定义方法，添加操作按钮
}, {
field: 'hospitalNum',
- title: '住院号',
+ name: '住院号',
align:'center',
sortable: true,
order: "desc",
@@ -45,7 +45,7 @@
},
{
field: 'treatmentNum',
- title: '诊疗号',
+ name: '诊疗号',
align:'center',
sortable: true,
order: "desc",
@@ -55,69 +55,69 @@
},
{
field: 'operationTimeStr',
- title: '手术时间',
+ name: '手术时间',
align:'center',
sortable: true,
order: "desc",
},
{
field: 'patientAge',
- title: '年龄',
+ name: '年龄',
align:'center',
sortable: true,
order: "desc",
},
{
field: 'patientIDCard',
- title: '身份证号码',
+ name: '身份证号码',
align:'center',
sortable: true,
order: "desc",
},
{
field: 'doctorName',
- title: '医生',
+ name: '医生',
align:'center',
sortable: true,
order: "desc",
},
{
field: 'operation',
- title: '手术名称',
+ name: '手术名称',
align:'center',
sortable: true,
order: "desc",
},
{
field: 'operator',
- title: '录入人',
+ name: '录入人',
align:'center',
sortable: true,
order: "desc",
},
{
field: 'depart',
- title: '录入科室',
+ name: '录入科室',
align:'center',
sortable: true,
order: "desc",
},
{
field: 'enteringDateStr',
- title: '录入时间',
+ name: '录入时间',
align:'center',
sortable: true,
order: "desc",
}, {
field: 'applicationTimeStr',
- title: '申请时间',
+ name: '申请时间',
align:'center',
sortable: true,
order: "desc",
},
{
field: 'remark',
- title: '备注',
+ name: '备注',
align:'center',
sortable: true,
order: "desc",
@@ -234,47 +234,47 @@
},
{
field: 'barcode',
- title: '条码',
+ name: '条码',
},
{
field: 'showTousseName',
- title: '名称'
+ name: '名称'
},
{
field: 'isUrgentForUseRecord',
- title: '加急'
+ name: '加急'
},
{
field: 'amount',
- title: '数量'
+ name: '数量'
},
{
field: 'packageType',
- title: '包装类型'
+ name: '包装类型'
},
{
field: 'idCardUseAmount',
- title: '批次'
+ name: '批次'
},
{
field: 'validUntil',
- title: '失效日期'
+ name: '失效日期'
},
{
field: 'Img',
- title: '图片',
+ name: '图片',
formatter: function (value,row,index){
return ' 图片'
},
},
{
field: 'includeImplant',
- title: '植入物是使用情况'
+ name: '植入物是使用情况'
},
{
field: 'types',
- title: '操作',
+ name: '操作',
formatter:function(index,row,value){
return '删除'
}
@@ -300,47 +300,47 @@
checkbox: true
},{
field: 'barcode',
- title: '条码',
+ name: '条码',
formatter:function(value,row,index){
return ''+row.barcode+''
},
}, {
field: 'showTousseName',
- title: '名称'
+ name: '名称'
}, {
field: 'isUrgentForUseRecord',
- title: '加急'
+ name: '加急'
}, {
field: 'amount',
- title: '数量'
+ name: '数量'
},
{
field: 'packageType',
- title: '包装类型'
+ name: '包装类型'
},
{
field: 'idCardUseAmount',
- title: '批次'
+ name: '批次'
},
{
field: 'validUntilStr',
- title: '失效日期'
+ name: '失效日期'
},
{
field: 'Img',
- title: '图片',
+ name: '图片',
formatter: function (value,row,index){
return ' 图片'
},
},
{
field: 'includeImplant',
- title: '植入物是使用情况'
+ name: '植入物是使用情况'
},
{
field: 'types',
- title: '操作',
+ name: '操作',
formatter:function(index,row,value){
return '删除'
}
@@ -372,14 +372,14 @@
columns: [
{
field: 'id',
- title: '材料名称',
+ name: '材料名称',
}, {
field: 'name',
- title: '数量'
+ name: '数量'
}, {
field: 'price',
- title: '价格'
+ name: '价格'
}],
data: [{
id: 1,
Fisheye: Tag 24938 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord1.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js
===================================================================
diff -u -r24907 -r24938
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js (.../slickGridRecord.js) (revision 24907)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js (.../slickGridRecord.js) (revision 24938)
@@ -887,7 +887,7 @@
// }
// console.log(ModifiedDataGood)
$.ajax({
- url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?',
+ url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml',
type:'get',
dataType:'json',
data:{barcode:$(this).val()},
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css
===================================================================
diff -u -r24760 -r24938
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css (.../sterilization.css) (revision 24760)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css (.../sterilization.css) (revision 24938)
@@ -68,16 +68,16 @@
}
.Nan-content{
width: 100%;
- height:126px;
- position: absolute;
- padding: 5px 5px;
- background-color: #C6E3CA;
- -ms-background-color: #BEDEC2;
+ height:100px;
+ /*position: absolute;*/
+ padding: 0 5px;
+ background-color: #f3f3f3;
+ -ms-background-color: #f3f3f3;;
}
.Nab-Btn{
width: 100%;
- height:70px;
- line-height:70px;
+ height:50px;
+ line-height:50px;
display: inline-block;
}
@@ -128,9 +128,9 @@
.fixed-table-pagination{
padding: 0 20px ;
}
-#table_table{
- position: relative;
- top:71px;
+#gridContainer{
+ /*position: relative;*/
+ /*top:100px;*/
/*height:500px;*/
}
@@ -415,17 +415,35 @@
/*search*/
.search{
margin-top:10px;
-/*width: 70%;*/
+width: 100%;
padding-left: 10px;
display: inline-block;
vertical-align: middle;
position: absolute;
z-index: 100;
}
+#txtSearch {
+ margin: 0 4px 0 4px;
+ padding: 2px 2px;
+ -moz-border-radius: 2px;
+ -webkit-border-radius: 2px;
+ border: 1px solid silver;
+ width: 140px;
+ height: 26px;
+}
+.search_input{
+ margin-right:10px;
+}
+.giyphicon_icon{
+ font-size: 16px;
+ display: inline-block;
+ vertical-align: middle;
+ cursor: pointer;
+}
+
.Datatime{
display: inline-block;
-/*width: 31%;*/
margin:0 5px;
}
.Datatime label{
@@ -452,4 +470,4 @@
.ster_span{
display: inline-block;
padding: 0 5px;
-}
\ No newline at end of file
+}
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js
===================================================================
diff -u -r24760 -r24938
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24760)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24938)
@@ -1379,6 +1379,7 @@
data:{barcode:$(this).val()},
success:function(data){
var datas =data.rows;
+ console.log()
if(data.success===true){
if(data.barcodeType==='器械包'){
$('#sterilizationListTbale').bootstrapTable('append',datas);
Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/img/error.png
===================================================================
diff -u -r24586 -r24938
Binary files differ
Fisheye: Tag 24938 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/css/alert.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 24938 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/css/common.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 24938 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/js/alert.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 24938 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/js/alert-api.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 24938 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/js/SyntaxHighlighter/shCoreDefault.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 24938 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/js/SyntaxHighlighter/makeSy.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 24938 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/js/SyntaxHighlighter/shCore.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 24938 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/css/style.css'.
Fisheye: No comparison available. Pass `N' to diff?
Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/img/warning.png
===================================================================
diff -u -r24586 -r24938
Binary files differ
Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/img/right.png
===================================================================
diff -u -r24586 -r24938
Binary files differ
Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/img/iOS6AlertButtonDef_bg.png
===================================================================
diff -u -r24760 -r24938
Binary files differ
Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/img/iOS6AlertBackground_side.png
===================================================================
diff -u -r24760 -r24938
Binary files differ
Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/img/iOS6AlertBackground_bg.png
===================================================================
diff -u -r24760 -r24938
Binary files differ
Fisheye: Tag 24938 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jqAlert/img/backgroundsize.min.htc'.
Fisheye: No comparison available. Pass `N' to diff?
-
+
-
--
-
-- +
-
--
-
--
-
- ----- +-+-+-+ 今天审核的待灭菌物品-
+
- - <%----%> - - -- -
- - --- --
-
-
- - --- --
-
-
- - --- --
-
-
- - --
-
-
- -+ + ++- ++-+-+ ++
灭菌记录
++ +-+-+ 灭菌参数 +- - --
+
-
+ + +++ ++
+
-
+ + +++ ++
+
-
+ + +++ ++
+
-
+ + +++ ++
+
-
+ + ++
+
-
+ + ++
+
-
+ + ++
+
-
+ + ++
-
-
--- 器械包信息 -------
-
-
- - --- --
-
-
- - --- --
-
-
- - --
-
-
-
-
- - --- --
-
--- 监测项 -------
-
-
- - --- --
-
-
- - --- --
-
-
- - --
-
- 湿包发生位置 -----
-
-
- - --- --
-
-
- - --- --
-
-
- - --- --
-
-
- - --- --
-
-
- - --
-
- 湿包发生种类 -----
-
-
- - --- --
+
+++ 灭菌物品列表 +++++++
+++ 灭菌物品统计 + 灭菌物品总数量: +++ 篮筐: + 器械包: + 敷料包: + 外来器械包: + 代理灭菌包: +++++
+ 监测结果 +--
+
-
+ + +++ ++
+
-
+ + +++ ++
+
-
+ + +++ ++
+
-
+ + +++ ++
+
-
+ + +++ +-
- 湿包发生程度 -----
-
-
- - --- --
-
-
- - --- --
-
- 检查状态 -----
-
-
- - --- --
-
-
-
-
- - --- --
-
-
- - --
-
- - - - --
-
-
-
-
+ -
+
+ 监测结果
+
-
-
-
-
-
-
-
+
+
+
-
+
-
+
-
-
- 灭菌记录
-
-
-
+
-
+
- 灭菌参数
-
-
- -
-
-
+
+
+ 中断记录列表
+
+
+
-
+
+
+
+
+
+ 今天审核的待灭菌物品 一键入炉
+
+
+
+
+
+
+
+
+ 卸载物品统计列表
+ 已卸载物品总数: 10
+
+
+
+
+
+
+
+
+ <%----%>
+
+
+
+
+
+
+
+
+
+
+
+
+ 你确定要完成灭菌据吗？
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 你确定要中断这条数据吗？
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 你确定要删除这条记录吗？
+
+
+
+
+
+