Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/foreignProxyDisinfectionForm.js
===================================================================
diff -u -r24922 -r24933
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 24922)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 24933)
@@ -1,13 +1,45 @@
+var foreignProxyDisinfectionGrid;
+var foreignProxyDisinfectionDataView;
+var foreignProxyDisinfectionData =[];
+
 $(function(){
-	
 	$('#menu_recyclingApplication_content  iframe',parent.document).contents().find("#app_foreignProxyDisinfection").on('click',function(){
-		
 		showSomeApplication("foreignProxyDisinfectionContent")
 //		$("#foreignProxyDisinfection_title").text("外部代理灭菌单");
 		window.top.$("#tousseModal").modal('show');
 	});
 	
+	var options = {
+    	    enableCellNavigation: true,
+    	    enableColumnReorder: false,
+    	    topPanelHeight:'40',
+    	    rowHeight:'30',
+    	    headerRowHeight:'30',
+    	    multiSelect:false,
+    	    fullWidthRows:'true',
+    	    editable: true,
+    	    enableAddRow: false,
+    	    enableCellNavigation: true,
+    	    asyncEditorLoading: false,
+    	    autoEdit: false
+        };
 	
+	
+	var appTemplate_columns = [
+                           {id:	'id',field : 'id',sortable:true,width: 0, minWidth: 0, maxWidth: 0, cssClass: "reallyHidden", headerCssClass: "reallyHidden"},
+                           {id:	'orgUnitCode',field : 'orgUnitCode',sortable:true,width: 0, minWidth: 0, maxWidth: 0, cssClass: "reallyHidden", headerCssClass: "reallyHidden"},
+                           {id:	'serialNumber',field : 'serialNumber',sortable:true,width: 0, minWidth: 0, maxWidth: 0, cssClass: "reallyHidden", headerCssClass: "reallyHidden"},
+                           {id:	'tousseName',name:'材料名称',field : 'materialName',width: 100,minWidth:260,sortable:true},
+                           {id:	'num',name:'数量',field : 'num',width: 100,minWidth:260,sortable:true},
+                           {id:	'procedure',name:'灭菌程序',field : 'procedure',width: 100,minWidth:260,sortable:true},
+                           {id:	'opera',name:'操作',field : 'opera',width: 150,minWidth:260,sortable:true}
+                           ];
+	
+	foreignProxyDisinfectionDataView = new Slick.Data.DataView({ inlineFilters: true });
+	foreignProxyDisinfectionDataView.setItems(foreignProxyDisinfectionData);
+	foreignProxyDisinfectionGrid = new Slick.Grid("#foreignProxyDisinfectionTable",foreignProxyDisinfectionDataView,appTemplate_columns,options);
+	
+	
 	/*【表单--申请外部代理灭菌单】*/	
 		var foreignProxyDisinfectionItems=[];
 		
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css
===================================================================
diff -u -r24924 -r24933
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css	(.../recyclingApplication.css)	(revision 24924)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css	(.../recyclingApplication.css)	(revision 24933)
@@ -375,3 +375,12 @@
 	height:250px;
 	border: 1px gray solid;
 }
+
+.foreignProxyDisinfection_table{
+	height:300px;
+	border: 1px gray solid;
+}
+.borrowTousse_table{
+	height:300px;
+	border: 1px gray solid;
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/borrowingTousseForm.js
===================================================================
diff -u -r24922 -r24933
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/borrowingTousseForm.js	(.../borrowingTousseForm.js)	(revision 24922)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/borrowingTousseForm.js	(.../borrowingTousseForm.js)	(revision 24933)
@@ -1,4 +1,6 @@
-
+var borrowTousseGrid;
+var borrowTousseDataView;
+var borrowTousseData =[];
 $(function(){
 
 	$('#menu_recyclingApplication_content  iframe',parent.document).contents().find("#app_borrowTousse").on('click',function(){
@@ -7,7 +9,6 @@
 		window.top.$("#tousseModal").modal('show');
 	});
 	
-	
 	/*【申请借物单--下拉框】*/	
 		//申请科室
 		renderDepartment_tousse("borrowTousse_appDept");
@@ -17,5 +18,39 @@
 		renderDepartment_tousse("borrowTousse_handleDept");
 		//物品名称
 		renderDepartment_tousse("borrowTousse_tousse_name");
-
+		
+		var options = {
+	    	    enableCellNavigation: true,
+	    	    enableColumnReorder: false,
+	    	    topPanelHeight:'40',
+	    	    rowHeight:'30',
+	    	    headerRowHeight:'30',
+	    	    multiSelect:false,
+	    	    fullWidthRows:'true',
+	    	    editable: true,
+	    	    enableAddRow: false,
+	    	    enableCellNavigation: true,
+	    	    asyncEditorLoading: false,
+	    	    autoEdit: false
+	        };
+		
+		
+		var appTemplate_columns =  [
+		                           {id:	'id',field : 'id',sortable:true,width: 0, minWidth: 0, maxWidth: 0, cssClass: "reallyHidden", headerCssClass: "reallyHidden"},
+		                           {id:	'orgUnitCode',field : 'orgUnitCode',sortable:true,width: 0, minWidth: 0, maxWidth: 0, cssClass: "reallyHidden", headerCssClass: "reallyHidden"},
+		                           {id:	'serialNumber',field : 'serialNumber',sortable:true,width: 0, minWidth: 0, maxWidth: 0, cssClass: "reallyHidden", headerCssClass: "reallyHidden"},
+		                           {id:	'tousseName',name:'器械包名称',field : 'tousseName',width: 100,minWidth:260,sortable:true},
+		                           {id:	'type',name:'类型',field : 'type',width: 100,minWidth:260,sortable:true},
+		                           {id:	'num',name:'数量',field : 'num',width: 100,minWidth:260,sortable:true},
+		                           {id:	'price',name:'单价',field : 'price',width: 100,minWidth:260,sortable:true},
+		                           {id:	'allprice',name:'小计',field : 'allprice',width: 150,minWidth:260,sortable:true},
+		                           {id:	'allprice',name:'时间',field : 'allprice',width: 150,minWidth:260,sortable:true},
+		                           {id:	'allprice',name:'操作',field : 'allprice',width: 150,minWidth:260,sortable:true},
+		                           ];
+		
+		borrowTousseDataView = new Slick.Data.DataView({ inlineFilters: true });
+		borrowTousseDataView.setItems(borrowTousseData);
+		customizeTousseGrid = new Slick.Grid("#borrowTousseTable",borrowTousseDataView,appTemplate_columns,options);
+			
+		
 });//$(function()结束
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp
===================================================================
diff -u -r24923 -r24933
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp	(.../tousseModal.jsp)	(revision 24923)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp	(.../tousseModal.jsp)	(revision 24933)
@@ -397,12 +397,7 @@
         				<button type="button" class="dx-btn-primary dx-btn-sm" id="customizeTousse_add_tousse"><span class="glyphicon glyphicon-plus"></span>添加</button>
         			</div>
         		</div>
-
-        		<div class="form-group table_div" id="customizeTousse_table_div">
-        			<div class="s21-col-xs-19 s21-col-xs-offset-1">
-        				<table id="customizeTousse_table" class="form-table table table-striped table-bordered table-hover" data-toggle data-toggle="table" data-height='280'></table>
-        			</div>
-        		</div>
+        		<div id="customizeTousseTable" class = "foreign_application_table"></div>	
         	</form>
       </div>
       
@@ -486,11 +481,7 @@
         				<input type="text" class="form-input form-control"  id="foreignProxyDisinfection_num">
         			</div>
         		</div>
-        		<div class="form-group table_div" id="foreignProxyDisinfection_table_div">
-        			<div class="s21-col-xs-19 s21-col-xs-offset-1">
-        				<table id="foreignProxyDisinfection_table" class="form-table table table-striped table-bordered table-hover" data-toggle data-toggle="table" data-height='280'></table>
-        			</div>
-        		</div>
+        		<div id="foreignProxyDisinfectionTable" class = "foreignProxyDisinfection_table"></div>	
         	</form>
       </div>
       <div class="content-modal-tousse-modal-footer col-xs-offset-3" id="modal-footer">
@@ -570,13 +561,7 @@
         				<button type="button" class="dx-btn-primary dx-btn-sm" id="add_tousse"><span class="glyphicon glyphicon-plus"></span>添加</button>
         			</div>
         		</div>
-        		
-        		<div class="form-group table_div" id="table">
-        			<div class="s21-col-xs-19 s21-col-xs-offset-1">
-        				<table id="borrowTousse_table" class="form-table content-modal-tousse-body-table-left  table table-striped table-bordered table-hover" data-toggle data-toggle="table" data-height='280'></table>
-        			</div>
-        		</div>
-        		
+        		<div id="borrowTousseTable" class = "borrowTousse_table"></div>
         	</form>
       </div>
      <div class="content-modal-tousse-modal-footer col-xs-offset-3" id="modal-footer">
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/customTousseForm.js
===================================================================
diff -u -r24922 -r24933
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/customTousseForm.js	(.../customTousseForm.js)	(revision 24922)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/customTousseForm.js	(.../customTousseForm.js)	(revision 24933)
@@ -1,3 +1,6 @@
+var customizeTousseGrid;
+var customizeTousseDataView;
+var customizeTousseData =[];
 
 $(function(){
 	
@@ -7,145 +10,6 @@
 			window.top.$("#tousseModal").modal('show');
 		});
 	
-	
-	
-	//申请自定义器械包中table字段
-		var customizeTousse_columns=[{
-								        field : 'id',
-								        align : 'center',
-								        visible:false 
-									  },
-									  {
-								        field : 'orgUnitCode',
-								        align : 'center',
-								        visible:false 
-									  },
-									  {
-								        field : 'serialNumber',
-								        align : 'center',
-								        visible:false 
-									  },
-									  {
-								        title : '材料名称',
-								        field : 'materialName',
-								        align : 'center'
-									  },
-									  {
-								        title : '数量',
-								        field : 'num',
-								        align : 'center'
-									  },
-									  {
-								        title : '是否植入物',
-								        field : 'price',
-								        align : 'center'
-								      },
-									  {
-								    	 title : '操作',
-								         field : 'allprice1',
-								         align : 'center'
-								      }
-									];
-		
-		//申请外部代理灭菌单中table字段							
-		var foreignProxyDisinfection_columns=[{
-								        field : 'id',
-								        align : 'center',
-								        visible:false 
-									  },
-									  {
-								        field : 'orgUnitCode',
-								        align : 'center',
-								        visible:false 
-									  },
-									  {
-								        field : 'serialNumber',
-								        align : 'center',
-								        visible:false 
-									  },
-									  {
-								        title : '物品',
-								        field : 'tousseName',
-								        align : 'center'
-									  },
-									  {
-								        title : '数量',
-								        field : 'num',
-								        align : 'center'
-									  },
-									  {
-								        title : '包装类型',
-								        field : 'packageType',
-								        align : 'center'
-								      },
-									  {
-								    	 title : '灭菌程序',
-								         field : 'procedure',
-								         align : 'center'
-								      },
-									  {
-								    	 title : '操作',
-								         field : 'allprice1',
-								         align : 'center'
-								      }
-									];	
-									
-		//借物单中table字段							
-		var borrowTousse_columns=[{
-								        field : 'id',
-								        align : 'center',
-								        visible:false 
-									  },
-									  {
-								        field : 'orgUnitCode',
-								        align : 'center',
-								        visible:false 
-									  },
-									  {
-								        field : 'serialNumber',
-								        align : 'center',
-								        visible:false 
-									  },
-									  {
-								        title : '器械包名称',
-								        field : 'tousseName',
-								        align : 'center'
-									  },
-									  {
-								        title : '类型',
-								        field : 'num1',
-								        align : 'center'
-									  },
-									  {
-								        title : '数量',
-								        field : 'price',
-								        align : 'center'
-								      },
-									  {
-								    	 title : '单价',
-								         field : 'allprice1',
-								         align : 'center'
-								      },
-									  {
-								    	 title : '小计',
-								         field : 'allprice1',
-								         align : 'center'
-								      },
-									  {
-								    	 title : '时间',
-								         field : 'allprice1',
-								         align : 'center'
-								      },
-									  {
-								    	 title : '操作',
-								         field : 'allprice1',
-								         align : 'center'
-								      }
-									];	
-									
-	
-
-	
 /*【申请自定义器械包--下拉框】*/	
 	//申请科室
 	renderDepartment_tousse("customizeTousse_appDpt");
@@ -222,5 +86,37 @@
 			clearForm("foreignTousse_modal",["foreignTousse_table"],foreignTousseItems);
 		});	
 		
-	
+		
+		
+		var options = {
+	    	    enableCellNavigation: true,
+	    	    enableColumnReorder: false,
+	    	    topPanelHeight:'40',
+	    	    rowHeight:'30',
+	    	    headerRowHeight:'30',
+	    	    multiSelect:false,
+	    	    fullWidthRows:'true',
+	    	    editable: true,
+	    	    enableAddRow: false,
+	    	    enableCellNavigation: true,
+	    	    asyncEditorLoading: false,
+	    	    autoEdit: false
+	        };
+		
+		
+		var appTemplate_columns = [
+	                           {id:	'id',field : 'id',sortable:true,width: 0, minWidth: 0, maxWidth: 0, cssClass: "reallyHidden", headerCssClass: "reallyHidden"},
+	                           {id:	'orgUnitCode',field : 'orgUnitCode',sortable:true,width: 0, minWidth: 0, maxWidth: 0, cssClass: "reallyHidden", headerCssClass: "reallyHidden"},
+	                           {id:	'serialNumber',field : 'serialNumber',sortable:true,width: 0, minWidth: 0, maxWidth: 0, cssClass: "reallyHidden", headerCssClass: "reallyHidden"},
+	                           {id:	'materialName',name:'材料名称',field : 'materialName',width: 100,minWidth:260,sortable:true},
+	                           {id:	'num',name:'数量',field : 'num',width: 100,minWidth:260,sortable:true},
+	                           {id:	'is',name:'是否植入物',field : 'is',width: 100,minWidth:260,sortable:true},
+	                           {id:	'opera',name:'操作',field : 'opera',width: 150,minWidth:260,sortable:true}
+	                           ];
+		
+		customizeTousseDataView = new Slick.Data.DataView({ inlineFilters: true });
+		customizeTousseDataView.setItems(customizeTousseData);
+		customizeTousseGrid = new Slick.Grid("#customizeTousseTable",customizeTousseDataView,appTemplate_columns,options);
+		
+		
 });//$(function()结束