Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css
===================================================================
diff -u -r24950 -r24965
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css	(.../sterilization.css)	(revision 24950)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css	(.../sterilization.css)	(revision 24965)
@@ -1,6 +1,7 @@
 /*common*/
 .modal-footer{
 	text-align: center;
+	margin-left:85px;
 }
 h4{
 	font-size: 14px;
@@ -48,7 +49,8 @@
 a.color_tbody{
 	color:#367f21 !important;
 	text-decoration:none;
-	cursor:pointer
+	cursor:pointer;
+	font-size: 16px;
 
 }
 .progress{
@@ -162,9 +164,16 @@
 #modalDialog,#modalDialogs,#modalDialogimg{
 	width: 900px;
 }
-#modalBody,#modalBodys,#modalBodysc{
+
+.modalBody{
 	height:570px; overflow-y: auto;
 }
+@media screen and (max-width: 1280px) {
+	.modalBody{
+		height: 450px;
+		overflow-x: auto;
+	}
+}
 .modalLeft,.modalRight{
 	display: inline-block;
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick-default-theme.css
===================================================================
diff -u -r24850 -r24965
--- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick-default-theme.css	(.../slick-default-theme.css)	(revision 24850)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick-default-theme.css	(.../slick-default-theme.css)	(revision 24965)
@@ -132,5 +132,5 @@
 }
 .slick-column-name{
   color:#689d61;
-  font-size: 14px;
+  font-size: 16px;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp
===================================================================
diff -u -r24906 -r24965
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp	(.../index.jsp)	(revision 24906)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp	(.../index.jsp)	(revision 24965)
@@ -56,8 +56,8 @@
         </div>
     </div>
     <div id="gridContainer">
-        <div id="myGrid" style="height:600px;"></div>
-        <div id="pager" style="width:100%;" class="slick-enhancement-pager"></div>
+        <div id="myGrid"></div>
+        <div id="pager" class="slick-enhancement-pager"></div>
     </div>
 
     <!--add s-->
@@ -515,32 +515,15 @@
                             </div>
                         </li>
                     </ul>
-    <!--
-                    <div class="Goods" id="Goods">
-                        <div >
-                            <div class="MinHeight" >
-                                <div class="addGoods_content">
-                                    <div class="addGoodsGrid_body">
-                                        <div id="GoodsTablGrid" style="width: 100%;height: 200px;position: relative;"></div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-    -->
-
                 <div class="addGoodsGrid_body">
                         <div id="GoodsTablGrid"></div>
                 </div>
-
-
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                    <button type="button" class="btn btn-default">快速回收</button>
-                    <button type="button" class="btn btn-default">审核</button>
-                    <button type="button" class="btn btn-primary" id="ModifySave">保存</button>
+                    <button type="button" class="btn  btn_default" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn_default">快速回收</button>
+                    <button type="button" class="btn btn_default">审核</button>
+                    <button type="button" class="btn btn-primary AddRecord" id="ModifySave">保存</button>
                 </div>
             </div>
         </div>
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css
===================================================================
diff -u -r24954 -r24965
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css	(.../index.css)	(revision 24954)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css	(.../index.css)	(revision 24965)
@@ -55,7 +55,8 @@
 a.color_tbody{
     color:#42b954 !important;
     text-decoration:none;
-    cursor:pointer
+    cursor:pointer;
+    font-size: 16px;
 
 }
 /*.content{
@@ -443,4 +444,10 @@
 }
 .modal-footer {
     margin-left:85px;
+}
+#myGrid{
+    height:600px;
+}
+#pager{
+    width: 100%;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js
===================================================================
diff -u -r24958 -r24965
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24958)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24965)
@@ -16,7 +16,18 @@
     $('#addoperator').val(currentUserFullName)
     // document.getElementById("tempBarcode").focus();
 })
-
+//ie8浏览器
+$(function(){
+    var browser=navigator.appName
+    var b_version=navigator.appVersion
+    var version=b_version.split(";");
+    var trim_Version=version[1].replace(/[ ]/g,"");
+    if(browser=="Microsoft Internet Explorer" && trim_Version=="MSIE8.0")
+    {
+        var availableHeight = $(window).height() -window.parent.$(".head-index").height()-window.parent.$(".content-index").height();
+        $('#myGrid').css('height',availableHeight)
+    }
+})
 //模态框收起
 $('.PackUp').click(function(){
     if($('.packUp_em').text()==='收起'){
@@ -67,14 +78,11 @@
             name: 'ID',
             align:'center',
             sortable: true,
-            minWidth: 100,
         },
         {
             id: "patientName",
             name: "病人",
             field: "patientName",
-            width: 120,
-            minWidth: 120,
             cssClass: "cell-title",
             sortable: true,            formatter: function (value,row,index,columnDef,dataContext){
                 return '<a class="color_tbody" data-target="#mymodal-details" data-toggle="modal">'+dataContext.patientName+'<i class="fafa-edit"></i> </a>'
@@ -85,7 +93,6 @@
             name: '状态',
             sortable: true,
             cssClass: "cell-title",
-            minWidth: 100,
 
         },
         {
@@ -94,7 +101,6 @@
             sortable: true,
             id: "hospitalNum",
             cssClass: "cell-title",
-            minWidth: 100,
             formatter: function (value,row,index,columnDef,dataContext){
                 return '<a class="color_tbody" data-target="#mymodal-details" data-toggle="modal" >'+dataContext.hospitalNum+'<i class="fafa-edit"></i> </a>'
             },
@@ -105,7 +111,6 @@
             sortable: true,
             id: "treatmentNum",
             cssClass: "cell-title",
-            minWidth: 100,
             formatter: function (value,row,index,columnDef,dataContext){
                 return '<a class="color_tbody" data-target="#mymodal-details" data-toggle="modal">'+dataContext.treatmentNum+'<i class="fafa-edit"></i> </a>'
             },
@@ -116,57 +121,48 @@
             id: "operationTimeStr",
             cssClass: "cell-title",
             sortable: true,
-            minWidth: 100,
         },
         {
             field: 'patientAge',
             name: '年龄',
             id: "patientAge",
             cssClass: "cell-title",
             sortable: true,
-            minWidth: 100,
         },
         {
             field: 'patientIDCard',
             name: '身份证号码',
             id: "patientIDCard",
             cssClass: "cell-title",
             sortable: true,
-            minWidth: 100,
         },
         {
             field: 'doctorName',
             name: '医生',
             id: "doctorName",
             cssClass: "cell-title",
             sortable: true,
-            minWidth: 100,
-        },
+       },
         {
             field: 'operation',
             name: '手术名称',
             id: "operation",
             cssClass: "cell-title",
             sortable: true,
-            minWidth: 100,
-
         },
         {
             field: 'operator',
             name: '录入人',
             id: "operator",
             cssClass: "cell-title",
             sortable: true,
-            minWidth: 100,
-
         },
         {
             field: 'depart',
             name: '录入科室',
             id: "depart",
             cssClass: "cell-title",
             sortable: true,
-            minWidth: 100,
 
         },
         {
@@ -175,7 +171,6 @@
             id: "enteringDateStr",
             cssClass: "cell-title",
             sortable: true,
-            minWidth: 100,
 
         },
         {
@@ -184,17 +179,13 @@
             id: "applicationTimeStr",
             cssClass: "cell-title",
             sortable: true,
-            minWidth: 100,
-
         },
         {
             field: 'remark',
             name: '备注',
             id: "remark",
             cssClass: "cell-title",
             sortable: true,
-            minWidth: 100,
-
         }
     )
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js
===================================================================
diff -u -r24951 -r24965
--- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js	(.../slick.enhancementpager.js)	(revision 24951)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js	(.../slick.enhancementpager.js)	(revision 24965)
@@ -155,8 +155,6 @@
                         if (k != "resultset_first" && k != "resultset_prev" && k != "resultset_next" && k != "resultset_last") {
                             if (k == "pagelabel" || k == "recordstatelabel") {
                                 $('.' + k).text(v);
-                            } else {
-                                $('.' + k).attr("title", v);
                             }
                         }
                     });
Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css
===================================================================
diff -u -r24850 -r24965
--- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css	(.../slick.grid.css)	(revision 24850)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css	(.../slick.grid.css)	(revision 24965)
@@ -129,7 +129,7 @@
   margin: 0;
   white-space: nowrap;
   cursor: default;
-  font-size: 14px;
+  font-size: 16px;
 }
 .slick-cell, .slick-headerrow-column{
   border-bottom-color: silver;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp
===================================================================
diff -u -r24954 -r24965
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp	(.../index.jsp)	(revision 24954)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp	(.../index.jsp)	(revision 24965)
@@ -77,7 +77,7 @@
 	</div>
 	<div id="gridContainer">
 		<div id="HomeMyGrid" style="height:600px;"></div>
-		<div id="pager"></div>
+		<div id="pager" class="slick-enhancement-pager">></div>
 	</div>
 	<!-- add s-->
 	<div  class="modal" id="mymodal-data" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
@@ -90,7 +90,7 @@
 					</button>
 					<h4 class="modal-title"> <span class="glyphicon glyphicon-list-alt"></span> 灭菌记录</h4>
 				</div>
-				<div class="modal-body" id="modalBody">
+				<div class="modal-body modalBody" >
 					<!-- <p>弹出层主体内容</p> -->
 					<div class="modalLeft">
 						<div class="Sterilization">
@@ -329,7 +329,7 @@
 					</button>
 					<h4 class="modal-title"> <span class="glyphicon glyphicon-list-alt"></span> 灭菌记录</h4>
 				</div>
-				<div class="modal-body" id="modalBodys">
+				<div class="modal-body modalBody">
 					<!-- <p>弹出层主体内容</p> -->
 					<div class="modalLeft">
 						<div class="Sterilization">
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js
===================================================================
diff -u -r24961 -r24965
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js	(.../sterilization1.js)	(revision 24961)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js	(.../sterilization1.js)	(revision 24965)
@@ -6,6 +6,18 @@
 $('#mymodal-ud').on('shown.bs.modal', function () {
     $("#udbarCode").focus();
 })
+//ie8浏览器
+$(function(){
+    var browser=navigator.appName
+    var b_version=navigator.appVersion
+    var version=b_version.split(";");
+    var trim_Version=version[1].replace(/[ ]/g,"");
+    if(browser=="Microsoft Internet Explorer" && trim_Version=="MSIE8.0")
+    {
+        var availableHeight = $(window).height() -window.parent.$(".head-index").height()-window.parent.$(".content-index").height();
+        $('#HomeMyGrid').css('height',availableHeight)
+    }
+})
 var grid,grid1,grid2,grid3,dataView1,dataView2,options1,options2,options3;
 var visibleColumns1=[];
 var percentCompleteThreshold1 = 0;
@@ -527,7 +539,7 @@
                         if(data.success===true){
                             addItem = data.rows[0];
                             var AllBarcode =[];
-                            console.log(AllsterzationGood)
+                            // console.log(AllsterzationGood)
                             for(var  i=0;i<AllsterzationGood.length;i++){
                                 AllBarcode.push(AllsterzationGood[i].barcode)
                             }
@@ -942,7 +954,7 @@
         }
     }
     var sterilingGoodsArrays= JSON.stringify(sterilingGoodsArray)
-    console.log(sterilingGoodsArrays)
+    // console.log(sterilingGoodsArrays)
 
     if(sters==''||procedure==''||purpose==''){
        alert('请输入表单各值');