Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css
===================================================================
diff -u -r24619 -r24683
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css	(.../recyclingApplication.css)	(revision 24619)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css	(.../recyclingApplication.css)	(revision 24683)
@@ -125,10 +125,10 @@
 
 .content-table{
 	position: absolute;
-	bottom: 50px;
+	/* bottom: 50px; */
 	left: 0;
 	right: 0;
-	top: 148px;
+	/* top: 148px; */
 }
 
 .content-modal-tousse-modal-footer{
@@ -138,10 +138,12 @@
 
 .table_div{
 	overflow: hidden;
+	
 }
 /*搜索表单消除栅格系统padding-left属性*/
 .search-div-input{
 	padding-left:0;
+	margin-bottom: 0px;
 }
 
 /**更多查询*/
@@ -174,22 +176,13 @@
 	background-color:#C6E3CA;
 }
 
-/* 解决引入select2后高度问题 */
-.select2-container .select2-selection--multiple{
- min-height:5px;
-}
-
-.select2-container .select2-search--inline .select2-search__field{
-	margin-top:0px;
-}
-
-.select2-search__field{
+/* .select2-search__field{
 	height:auto;
 }
 
 .select2-container--default .select2-selection--multiple:focus {
 	border-color: #73B043;
-}
+} */
 
 .editable-click{
 	border-bottom: none !important;
@@ -199,6 +192,7 @@
 .form-group2{
 	margin-bottom: 8px !important;
 }
+
 .content-modal-tousse-modal-footer{
 	margin-top: 0 !important;
 }
@@ -208,7 +202,26 @@
 	padding-left: 0 !important;	
 }
 
+/*校验：错误效果 */
 .error{
 	border-color:red !important;
 }
 
+.modal-body{
+	padding-bottom: 0;
+}
+
+
+/*720分辨率下调整效果  */
+
+
+/* .content-search{
+	font-size:10px;	
+} */
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r24651 -r24683
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 24651)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 24683)
@@ -56,7 +56,7 @@
 			<button class="content-toolbar-btn dx-btn-primary dx-btn-lg" id="app_borrowTousse"><span class="glyphicon glyphicon-list-alt">&nbsp;</span>借物</button>
 		</div>
 	</div>	
-	<div class="content-search">
+	<div class="content-search" id = "contentSearch">
 			<form action="" class="">
 				<div class="form-group">
 					<label for="search_app_start_time" class="content-search-label control-label  s21-col-xs-1">申请时间：</label>
@@ -108,6 +108,7 @@
 		<button class="content-table-top-toolbar-btn dx-btn-primary dx-btn-sm" id=""><span class="glyphicon glyphicon-list-alt">&nbsp;</span>设为已打印</button>
 	</div>
 	
+	
 	<div id="main" class="content-table">	
 		<!--<table id="allApplication_table" class="content-table-in table table-striped table-bordered table-hover" data-height='210' data-toggle data-toggle="table"></table>-->
 	</div>
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r24651 -r24683
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 24651)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 24683)
@@ -4,28 +4,36 @@
 	//解决select2 单选框无法输入的问题
 	$.fn.modal.Constructor.prototype.enforceFocus = function () {};
 	
-	var tableTopL=$("#main").offset();
-	var pagiHeight=$(".fixed-table-pagination").height();
+	//搜索栏距离顶部高度
+	var searchTopL=$("#contentSearch").offset();
+	//搜索栏自身高度	
+	var searchTopH=$("#contentSearch").height();
+	//分页栏高度
+	var pagiHeight=$(".fixed-table-pagination").height() || 56;//+37
+	//总页面高度
 	var documentHeight=$(document).height();
-	var tableHeight=documentHeight-pagiHeight-tableTopL;
 	
-	var table="<table id='allApplication_table' class='content-table-in table table-striped table-bordered table-hover' data-height='"+680+"' data-toggle data-toggle='table'></table>"
+	var tableHeight=documentHeight-pagiHeight-searchTopL.top-searchTopH;
+	if(  720 == screenHeight){
+		tableHeight = tableHeight + 100 ;
+	}
+	var table="<table id='allApplication_table' class='content-table-in table table-striped table-bordered table-hover' data-height='"+tableHeight+"' data-toggle data-toggle='table'></table>"
 	$('#main').append(table);
 	
+//	$(".fixed-table-container").data("style",'600px');
+	
+	
 	 var topBody = $(top.document.body);
 	 var modal = '<div class="content-modal-tousse modal fade  bs-example-modal-lg" id="tousseModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" >'
 				  +'<div class="modal-dialog modal-lg" role="document">'
-				    +'<div class="modal-content">'
-				    +'<iframe id = "tousseIframe" frameborder = "0" src="http://localhost:8080/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp" width="100%" height="700px"></iframe>'
+				    +'<div class="modal-content" style= "overflow : auto;">'
+				    +'<iframe id = "tousseIframe" scrolling = "no" frameborder = "0" src="'+WWWROOT+'/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp" width="100%" height="700px"></iframe>'
 				        +'</div>'
 				  +'</div>'
 				+'</div>';
+	 
 	 topBody.append(modal);
-	
-//	 $("#tousseModal").modal("show");
 	 
-	 
-	 
 	//主页面table字段
 	var allApplication_columns=[{
     								checkbox : true
@@ -153,380 +161,10 @@
 	
 	
 /**【表单--申请器械包/一次性物品/消毒物品  begin】*/	
-	/*申请物品数据
-	 * 当点击“添加”按钮时，所选择的物品信息会存到appToussesArr中
-	 */
-	var appToussesArr=[];		
-	//当前操作申请单，比如点击“申请器械包”按钮时此变量值为“器械包申请单”
-	var currentApplication;
+	parent.refreshTable = function(){
+		loadAppListTable("allApplication_table","toolbar_table",allApplication_columns);
+	}
 	
-	//表单table字段
-	var appTemplate_columns=[{
-			        field : 'id',
-			        align : 'center',
-			        visible:false 
-				  },{
-			        field : 'tousseDefinitionID',
-			        align : 'center',
-			        visible:false 
-				  },
-				  {
-			        title : '物品名',
-			        field : 'tousseName',
-			        align : 'center'
-				  },
-				  {
-			        title : '申请数量',
-			        field : 'amount',
-			        align : 'center',
-			        editable: {
-	                    type: 'text',
-	                    title: '编辑申请数量',
-	                    mode :'inline',
-	                    emptytext:'',
-	                    validate: function (v) {
-	                        if (!v) return '不能为空';
-	                    }
-	                },
-	                formatter: function (value, row,index) {	
-                		if(Tools.StringUtils.isEmpty(value)){
-                			value="0";
-                		}
-//                		var result="<a href=\"#\" style='text-decoration:none;border-bottom:none;'>"+value+"</a";
-                		return value;
-	                }	
-				  },
-				  {
-			        title : '单价',
-			        field : 'price',
-			        align : 'center'
-			      },
-				  {
-			    	 title : '小计',
-			         field : 'allprice',
-			         align : 'center'
-			      }
-				];
-	
-	/*【下拉框-begin】*/
-		
-		//“申请科室”下拉框
-		renderSelect_appDpt('departApp_tousse',1);
-		//“结算科室”下拉框
-		renderSelect_settleDpt('settleDep_tousse',1);
-		
-	/*【下拉框-end】*/
-		
-		//"申请器械包"、“申请一次性物品”、“申请消毒物品”表单加载所需要的数据信息
-		var toussesJson={
-				//是否为IE
-				isIE:isIE,
-				//模态框HTML元素ID属性
-				modalElementId:"tousseModal",
-				//当前登陆用户名
-		 		applicant:currentUserFullName,
-		 		//当前登陆用户编码
-		 		applicantCode:currentUserCode,
-				//模态框标题元素ID属性
-				modalTileElementId:"application_title",
-				//模态框“选择物品”下拉框元素ID属性
-				tousseSelectElementId:"tousseName_tousse_select",
-				//“选择物品”下拉框最多可选元素数量
-				tousseSelectNum:1,
-				//申请单类型
-				tousseType:Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM,
-				//申请单表格元素ID
-				formTableElementId:"tousse_table",
-				//申请单表格对应的字段
-				columns:appTemplate_columns,
-				//申请单表格需要加载的数据
-				appToussesArr:appToussesArr,
-				//“申请科室”输入框HTML元素ID
-				departElementId:'departApp_tousse',
-				//“结算科室”输入框HTML元素ID
-				settleDepartElementId:'settleDep_tousse',
-				//“处理科室”输入框HTML元素ID
-				handlerDepartElementId:'handleDep_tousse',
-				//表格是否支持子表格
-				isExpandRow:false
-				};
-		
-		//"申请器械包"、“申请一次性物品”、“申请消毒物品”表单提交所需要的数据信息
-		var submitJson={
-		 		//“ID”对应的HTML元素ID属性
-		 		idElId:"id",
-		 		//“申请人”输入框ID属性
-		 		applicantElId:"applicant",
-		 		//当前登陆用户名
-		 		applicant:currentUserFullName,
-		 		//当前登陆用户编码
-		 		applicantCode:currentUserCode,
-		 		//当前登陆
-		 		//“申请人编号”HTML元素ID
-		 		applicantCodeElId:"applicantCode",
-		 		//“申请科室”元素ID
-		 		departAppElId:"departApp_tousse",
-		 		//“结算科室”元素ID
-		 		settleDepElId:"settleDep_tousse",
-		 		//“处理科室”元素ID
-		 		handleDepEl:"handleDep_tousse",
-		 		//"申请时间"元素ID
-		 		timeElId:"time",
-		 		//“备注”元素ID
-		 		remarkElId:"remarks",
-		 		//当前申请单类型
-		 		currentApplication:currentApplication,
-		 		//申请物品数组
-		 		appToussesArr:appToussesArr,
-		 		//主页面表格字段
-		 		allApplicationColumns:allApplication_columns,
-		 		//是否提交，true为提交，false为暂存
-		 		isCommit:true,
-		 		//是否需要立即刷新主页面表格内容
-		 		isRefresh:true
- 				}; 
-		
-	/*【申请器械包--按钮】*/
-		$("#app_tousses").click(function(){
-//			
-//			$("#tousseAppForm").s_validate('destroy');
-//			
-//			$("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){
-//				toggleShow(this,1);
-//			});
-//			
-//			if( $("#tousseName_tousse_number").length < 1 ){
-//				$("#tousseName_tousse_num").spinner({id:'tousseName_tousse_number'});
-//			}
-//			
-//			currentApplication=Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
-//			toussesJson.tousseType = Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
-//			toussesJson.isExpandRow = false;
-//			
-//			//清空申请物品数组
-//			appToussesArr=[];
-			window.top.$("#tousseModal").modal('show');
-			var tousseIframeDucument = window.top.$("#tousseIframe").contents();
-			$(tousseIframeDucument).find("#app_tousses").trigger("from-tousse-show");
-//			showAppForm(toussesJson);
-			
-//			//“处理科室”下拉框
-//			renderSelect_handlerDpt('handleDep_tousse',1,"器械包",$('#departApp_tousse').val());
-			
-//			$("#tousseAppForm").s_validate({
-//				departApp_tousse:{	
-//									type:'id',
-//									error:"申请科室不能为空"
-//								 },
-//				settleDep_tousse:{	
-//									type:'id',
-//									error:"结算科室不能为空"
-//								 },
-//				handleDep_tousse:{
-//									type:'id',
-//									error:"处理科室不能为空"
-//								  },
-//				appToussesArr : {
-//									type:'array',
-//									error:"申请物品不能为空",
-//									positionId:'tousseName_tousse_select',
-//									value:appToussesArr,
-//									validateField:{field:'amount',type:'num',valiType:'notEmpty'}
-//								}
-//								  
-//			});
-			
-		});
-		
-		
-		/*【申请一次性物品--按钮】*/
-		$("#app_disposable").click(function(){
-			$("#tousseAppForm").s_validate('destroy');
-			$("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){
-				toggleShow(this,1);
-			});
-			currentApplication=Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
-			toussesJson.tousseType = Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
-			toussesJson.isExpandRow = false;
-			//清空申请物品数组
-			appToussesArr=[];
-			showAppForm(toussesJson);
-			//“处理科室”下拉框
-			renderSelect_handlerDpt('handleDep_tousse',1,"器械包",$('#departApp_tousse').val());
-		});
-			
-		/*【申请消毒物品--按钮】*/	
-		$("#app_disinfection").click(function(){
-			$("#tousseAppForm").s_validate('destroy');
-			$("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){
-				toggleShow(this,1);
-			});
-			currentApplication=Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;
-			toussesJson.tousseType = Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;
-			toussesJson.isExpandRow = true;
-			//清空申请物品数组
-			appToussesArr=[];
-			showAppForm(toussesJson);
-			//“处理科室”下拉框
-			renderSelect_handlerDpt('handleDep_tousse',1,"器械包",$('#departApp_tousse').val());
-		});
-			
-		
-		
-		/*【申请器械包/一次性物品/消毒物品--表格--“添加物品”按钮】*/
-		$("#tousseAdd").click(function(){
-			/*1.不能为空
-			 * 2.物品列表（物品模板）不存在则在后面追加
-			 * 3.如果申请模板中存在，那么直接更新申请数量即可
-			 */
-			var tousseName_tousse_select=$("#tousseName_tousse_select");
-			var tousseName_tousse_number=$("#tousseName_tousse_number");
-			var name=tousseName_tousse_select.text();
-			//此处ID
-			var id=tousseName_tousse_select.val()[0];
-			
-			var num=tousseName_tousse_number.val();
-			if(!Tools.StringUtils.isEmpty(name)&&!Tools.StringUtils.isEmpty(num)){
-				//1.追加到表格的内容；2.添加后信息会存储在appToussesArr中，申请单保存时可直接获取到需要提交的物品信息
-				var appendContent;
-				//判断当前操作的申请单为以下哪种：“器械包申请单”、“一次性物品申请单”、“消毒物品申请单”
-				if(currentApplication == Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM){//“器械包申请单”
-					appendContent={
-							"id":null,
-							"tousseName":name,
-							"amount":num,
-							"originalPrice":null,
-							"price":null,
-							"rowPrice":null,
-							"urgentAmount":null,
-							"isApplyEntireTousse":null,
-							"expressInvoice":"否",
-							"diposable":"否",
-							"tousseType":"器械包",
-							"unit":null,
-							"unitCount":null,
-							"minUnit":null,
-							"transferScale":null,
-							"disinfectMaterilas":"",
-							"tousseDefinitionID":id
-							};
-				}else if(currentApplication == Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM){//“一次性物品申请单”
-					 appendContent={
-							"id":null,
-							"tousseName":name,
-							"amount":num,
-							"originalPrice":null,
-							"price":null,
-							"rowPrice":null,
-							"urgentAmount":null,
-							"isApplyEntireTousse":null,
-							"expressInvoice":"否",
-							"diposable":"是",
-							"tousseType":Constants.DisposableGoodType.TYPE_NAME,
-							"unit":null,
-							"unitCount":null,
-							"minUnit":null,
-							"transferScale":null,
-							"disinfectMaterilas":"",
-							"disposableGoodsId":id
-							};	
-				}else if(currentApplication == Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM){//“消毒物品申请单”
-					var disinfectMaterilas={};
-		    		for(var i = 0;i < disinfectionComboGoodsStore.length;i++){
-		    			var item1=disinfectionComboGoodsStore[i];
-		    			if(id == item1.id){
-		    				disinfectMaterilas=item1.materials;
-		    				break;
-		    			}
-		    		}
-		        	
-					 appendContent={
-							"id":null,
-							"tousseName":name,
-							"amount":num,
-							"originalPrice":null,
-							"price":null,
-							"rowPrice":null,
-							"urgentAmount":null,
-							"isApplyEntireTousse":"是",
-							"expressInvoice":"否",
-							"diposable":"否",
-							"tousseType":Constants.TousseType.PACKAGE_TYPE_DISINFECTION,
-							"unit":null,
-							"unitCount":null,
-							"minUnit":null,
-							"transferScale":null,
-							"disinfectMaterilas":JSON.stringify(transformDisinfectionMaterial(disinfectMaterilas)),
-							"tousseDefinitionID":id
-							};	
-				}
-				
-				$("#tousse_table").bootstrapTable('append',appendContent);
-				tousseName_tousse_select.text('');
-				tousseName_tousse_number.val('');
-				appToussesArr.push(appendContent);
-				$("#tousseAppForm").s_validate('destroy','tousseName_tousse_select');
-			}
-		});
-		
-		/*【申请器械包/一次性物品/消毒物品--“提交”按钮】*/	
-		$("#tousseSubmit").mouseup(function(){
-			submitJson.currentApplication = currentApplication;
-			 submitJson.isCommit = true;
-			 submitJson.appToussesArr = appToussesArr;
-			var valResult =  $("#tousseAppForm").s_validate('getResult');
-			if(valResult == true){
-				submitForm(submitJson);
-			}
-		});
-		
-		/*【申请器械包/一次性物品/消毒物品--“提交并新建”按钮】*/	
-		$("#tousseSubmitAndNewForm").click(function(){
-			 submitJson.currentApplication = currentApplication;
-			 submitJson.isCommit = true;
-			 submitJson.appToussesArr = appToussesArr;
-//			 submitJson.isRefresh = false;
-			 //提交申请单
-			 submitForm(submitJson);
-			//新建申请单 
-			 	if(currentApplication == Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM){//“器械包申请单”
-			 		currentApplication=Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
-					toussesJson.tousseType = Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
-					toussesJson.isExpandRow = false;
-					//清空申请物品数组
-					appToussesArr=[];
-					showAppForm(toussesJson);
-				}else if(currentApplication == Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM){//“一次性物品申请单”
-					currentApplication=Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
-					toussesJson.tousseType = Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
-					toussesJson.isExpandRow = false;
-					//清空申请物品数组
-					appToussesArr=[];
-					showAppForm(toussesJson);
-				}else if(currentApplication == Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM){//“消毒物品申请单”
-					currentApplication=Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;
-					toussesJson.tousseType = Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;
-					toussesJson.isExpandRow = true;
-					//清空申请物品数组
-					appToussesArr=[];
-					showAppForm(toussesJson);	
-				}
-			 
-		});
-		
-		/*【申请器械包/一次性物品/消毒物品--“暂存”按钮】*/	
-		$("#tousseTemStorage").click(function(){
-			submitJson.currentApplication = currentApplication;
-		 	submitJson.isCommit = false;
-		 	submitJson.appToussesArr = appToussesArr;
-		 	submitForm(submitJson);
-		});
-		
-		/*【申请器械包/一次性物品/消毒物品--“取消”按钮】*/	
-		$("#tousseCancel").click(function(){
-			$("#tousseModal").modal('hide');
-		});
-
 /**【表单--申请器械包/一次性物品/消毒物品  end】*/	
 	
 		
@@ -602,15 +240,6 @@
 		//处理方式
 		renderDepartment_foreignTousse("foreignTousse_handleMethod");
 		
-//		//器械包名称
-//		renderDepartment_tousse("foreignTousse_name");
-//		//供应商
-//		renderDepartment_tousse("foreignTousse_supplier");
-//		//供应商联系人
-//		renderDepartment_tousse("foreignTousse_supplier_contact");
-//		//初始化手术时间
-//		initSchedulingDate('operaTime');
-			
 			$("#app_foreignTousse").click(function(){
 				$("#foreignTousse_title").text("申请外来器械");
 				$("#foreignTousse_modal").modal('show');
@@ -672,13 +301,6 @@
 /**【表单--申请外来器械  end】*/
 		
 		
-		
-		
-		
-
-		
-		
-		
 /**【借物--按钮】*/
 	$("#app_borrowTousse").click(function(){
 			$("#borrowTousse_title").text("借物单");
@@ -925,7 +547,7 @@
 	initSchedulingDate('search_more_appTime_end','yyyy-mm-dd');
 	//申请时间-开始时间
 	initSchedulingDate('search_more_appTime_start','yyyy-mm-dd');
-
+	
 /*【更多查询--查询按钮】*/
 	/*表单验证*/
 	$("#search_more_query").click(function(){
@@ -1122,108 +744,45 @@
 	$(".table_div").find(".fixed-table-toolbar").remove();
 	$(".form-table").find(".th-inner").css({"padding-top":"0","padding-bottom":"0","margin-bottom":"8"});
 	
+	
+	parent.formDate = {};
+	
+	parent.setDate = function(data){
+		parent.formDate = data; 
+	};
+	
+	parent.getDate = function(){
+		return parent.formDate; 
+	};
+	
 /**
  * 【主表--点击列--详情展示】
  */	
 	$("#allApplication_table").on("click-row.bs.table",function($element,row){
-			$("#tousseAppForm").s_validate('destroy');
-			$("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){
-				toggleShow(this,2);
-			});
-			
-			//loadRecyclingApplicationById();
-			clearForm(isIE,"tousseModal",["tousse_table"],appToussesArr);
-			$("#application_title").text("申请器械包");
-			$("#tousseModal").modal('show');
-			
-			//ID
-			$('#id').val(row.id);
-			
-			//流水号
-			var serialNumberEl=$('#serialNumber');
-			serialNumberEl.val(row.serialNumber);
-			
-			//申请人
-			var appEl=$('#applicant');
-			var applicant=appEl.val(row.applicant);
-			$('#applicantCode').val(row.applicantCode)
-			
-			//申请科室
-			$("#departApp_tousse").append("<option value='"+row.departCoding+"' selected='selected'>"+row.depart+"</option>");
-			
-			//结算科室
-			$("#settleDep_tousse").append("<option value='"+row.settleAccountsDepartCoding+"' selected='selected'>"+row.settleAccountsDepart+"</option>");
-			
-			//处理科室
-			$("#handleDep_tousse").append("<option value='"+row.handleDepartCoding+"' selected='selected'>"+row.handleDepart+"</option>");
-			
-			//申请时间
-			$("#time").val(row.applicationTimeStr);
-			
-			//备注
-			var remarksEl=$('#remarks')
-			var remark=remarksEl.val(row.remark);
-			
-			if(row.type ==  Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM){
-				loadTable("tousse_table","",appTemplate_columns,false,false,"",true,appToussesArr);
-			}else{
-				loadTable("tousse_table","",appTemplate_columns,false,false,"",false,appToussesArr);
-			}
-				appToussesArr=[];
-				for(var i=0;i<row.applicationItems.length;i++){
-					var item = row.applicationItems[i];
-					
-					var appendContent11={
-							"id":item.id,
-							"tousseName":item.tousseName,
-							"amount":item.amount,
-							"originalPrice":null,
-							"price":item.price,
-							"rowPrice":item.rowPrice,
-							"urgentAmount":null,
-							"isApplyEntireTousse":item.isApplyEntireTousse,
-							"expressInvoice":"否",
-							"diposable":'',
-							"tousseType":item.tousseType,
-							"unit":'',
-							"unitCount":null,
-							"minUnit":null,
-							"transferScale":null,
-							"disinfectMaterilas":"",
-							"tousseDefinitionID":item.tousseDefinitionId
-							};
-	
-					$("#tousse_table").bootstrapTable('append',appendContent11);
-					appToussesArr.push(appendContent11);
-				}
-				
-				$("#tousseAppForm").s_validate({
-					departApp_tousse:{	
-										type:'id',
-										error:"申请科室不能为空"
-									 },
-					settleDep_tousse:{	
-										type:'id',
-										error:"结算科室不能为空"
-									 },
-					handleDep_tousse:{
-										type:'id',
-										error:"处理科室不能为空"
-									  },
-					appToussesArr : {
-										type:'array',
-										error:"申请物品不能为空",
-										positionId:'tousseName_tousse_select',
-										value:appToussesArr,
-										validateField:{field:'amount',type:'num',valiType:'notEmpty'}
-									}
-				})
-				
-				
-				$(".table_div").find(".fixed-table-toolbar").remove();
-				$(".form-table").find(".th-inner").css({"padding-top":"0","padding-bottom":"0","margin-bottom":"8"});	
+			//将数据传递给子iframe
+			parent.setDate(row);
+			//触发子iframe 模态框显示
+			$("#tousseIframe",parent.document).contents().find("#showForm").click();
 	});
 	
+/**
+ * 不同分辨率下样式调整
+ */	
+	var screenWidth = parseInt(window.screen.width,10);
+	var screenHeight = parseInt(window.screen.height,10);
+	
+	if(  720 == screenHeight){
+		//字体调小
+		$("body").css("font-size","7px");
+		$(".content-header").css({'line-height':'30px','height':'30px','font-size':'15px'});
+		$('.dx-btn-primary').css({'padding':'0 5px','line-height':'20px'});
+		$('.dx-btn-lg').css({'height':'30px'});
+		$('#contentSearch').find('.form-group').css({'margin-bottom':'0'});
+		$('#main').css({'top':'none','bottom':'none'});
+	}
+	
+//	alert(screenHeight);
+
 });//$(function()结束
 
 
@@ -1692,7 +1251,6 @@
                     onExpandRow: function (index, row, $detail) {},
                 	onEditableSave: function (field, row, oldValue, $el) {}
                 });
-
 }
 
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js	(revision 0)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js	(revision 24683)
@@ -0,0 +1,1645 @@
+var disinfectionComboGoodsStore=[];
+$(function(){
+	
+	var isIE=Tools.BrowserTypeUtils.isIE()==1 ? true:false;
+	
+	//解决select2 单选框无法输入的问题
+	$.fn.modal.Constructor.prototype.enforceFocus = function () {};
+	
+/**【表单--申请器械包/一次性物品/消毒物品  begin】*/	
+	/*申请物品数据
+	 * 当点击“添加”按钮时，所选择的物品信息会存到appToussesArr中
+	 */
+	var appToussesArr=[];		
+	
+	//当前操作申请单，比如点击“申请器械包”按钮时此变量值为“器械包申请单”
+	var currentApplication;
+	
+	//表单table字段
+	var appTemplate_columns=[{
+			        field : 'id',
+			        align : 'center',
+			        visible:false 
+				  },{
+			        field : 'tousseDefinitionID',
+			        align : 'center',
+			        visible:false 
+				  },
+				  {
+			        title : '物品名',
+			        field : 'tousseName',
+			        align : 'center'
+				  },
+				  {
+			        title : '申请数量',
+			        field : 'amount',
+			        align : 'center',
+			        editable: {
+	                    type: 'text',
+	                    title: '编辑申请数量',
+	                    mode :'inline',
+	                    emptytext:'',
+	                    validate: function (v) {
+	                        if (!v) return '不能为空';
+	                    }
+	                },
+	                formatter: function (value, row,index) {	
+                		if(Tools.StringUtils.isEmpty(value)){
+                			value="0";
+                		}
+//                		var result="<a href=\"#\" style='text-decoration:none;border-bottom:none;'>"+value+"</a";
+                		return value;
+	                }	
+				  },
+				  {
+			        title : '单价',
+			        field : 'price',
+			        align : 'center'
+			      },
+				  {
+			    	 title : '小计',
+			         field : 'allprice',
+			         align : 'center'
+			      }
+				];
+	
+	/*【下拉框-begin】*/
+		//“申请科室”下拉框
+		renderSelect_appDpt('departApp_tousse',1);
+		//“结算科室”下拉框
+		renderSelect_settleDpt('settleDep_tousse',1);
+	/*【下拉框-end】*/
+		
+		//"申请器械包"、“申请一次性物品”、“申请消毒物品”表单加载所需要的数据信息
+		var toussesJson={
+				//是否为IE
+				isIE:isIE,
+				//模态框HTML元素ID属性
+				modalElementId:"tousseModal",
+				modalContentElementId:'modalContent',
+				//当前登陆用户名
+		 		applicant:currentUserFullName,
+		 		//当前登陆用户编码
+		 		applicantCode:currentUserCode,
+				//模态框标题元素ID属性
+				modalTileElementId:"application_title",
+				//模态框“选择物品”下拉框元素ID属性
+				tousseSelectElementId:"tousseName_tousse_select",
+				//“选择物品”下拉框最多可选元素数量
+				tousseSelectNum:1,
+				//申请单类型
+				tousseType:Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM,
+				//申请单表格元素ID
+				formTableElementId:"tousse_table",
+				//申请单表格对应的字段
+				columns:appTemplate_columns,
+				//申请单表格需要加载的数据
+				appToussesArr:appToussesArr,
+				//“申请科室”输入框HTML元素ID
+				departElementId:'departApp_tousse',
+				//“结算科室”输入框HTML元素ID
+				settleDepartElementId:'settleDep_tousse',
+				//“处理科室”输入框HTML元素ID
+				handlerDepartElementId:'handleDep_tousse',
+				//表格是否支持子表格
+				isExpandRow:false
+				};
+		
+		//"申请器械包"、“申请一次性物品”、“申请消毒物品”表单提交所需要的数据信息
+		var submitJson={
+		 		//“ID”对应的HTML元素ID属性
+		 		idElId:"id",
+		 		//“申请人”输入框ID属性
+		 		applicantElId:"applicant",
+		 		//当前登陆用户名
+		 		applicant:currentUserFullName,
+		 		//当前登陆用户编码
+		 		applicantCode:currentUserCode,
+		 		//当前登陆
+		 		//“申请人编号”HTML元素ID
+		 		applicantCodeElId:"applicantCode",
+		 		//“申请科室”元素ID
+		 		departAppElId:"departApp_tousse",
+		 		//“结算科室”元素ID
+		 		settleDepElId:"settleDep_tousse",
+		 		//“处理科室”元素ID
+		 		handleDepEl:"handleDep_tousse",
+		 		//"申请时间"元素ID
+		 		timeElId:"time",
+		 		//“备注”元素ID
+		 		remarkElId:"remarks",
+		 		//当前申请单类型
+		 		currentApplication:currentApplication,
+		 		//申请物品数组
+		 		appToussesArr:appToussesArr,
+		 		//主页面表格字段
+//		 		allApplicationColumns:allApplication_columns,
+		 		//是否提交，true为提交，false为暂存
+		 		isCommit:true,
+		 		//是否需要立即刷新主页面表格内容
+		 		isRefresh:true
+ 				}; 
+		
+		
+	/*【申请器械包--按钮】*/
+	$('#menu_recyclingApplication_content  iframe',parent.document).contents().find("#app_tousses").on('click',function(){
+				
+			$("#tousseAppForm").s_validate('destroy');
+			$("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){
+				toggleShow(this,1);
+			});
+			
+			if( $("#tousseName_tousse_number").length < 1 ){
+				$("#tousseName_tousse_num").spinner({id:'tousseName_tousse_number'});
+			}
+			
+			currentApplication=Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
+			toussesJson.tousseType = Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
+			toussesJson.isExpandRow = false;
+			//清空申请物品数组
+			appToussesArr=[];
+			showAppForm(toussesJson);
+			
+			//“处理科室”下拉框
+			renderSelect_handlerDpt('handleDep_tousse',1,"器械包",$('#departApp_tousse').val());
+			
+			$("#tousseAppForm").s_validate({
+				departApp_tousse:{	
+									type:'id',
+									error:"申请科室不能为空"
+								 },
+				settleDep_tousse:{	
+									type:'id',
+									error:"结算科室不能为空"
+								 },
+				handleDep_tousse:{
+									type:'id',
+									error:"处理科室不能为空"
+								  },
+				appToussesArr : {
+									type:'array',
+									error:"申请物品不能为空",
+									positionId:'tousseName_tousse_select',
+									value:appToussesArr,
+									validateField:{field:'amount',type:'num',valiType:'notEmpty'}
+								}
+			});
+		});
+	
+	/*【申请一次性物品--按钮】*/
+	$('#menu_recyclingApplication_content  iframe',parent.document).contents().find("#app_disposable").on('click',function(){
+			
+			$("#tousseAppForm").s_validate('destroy');
+			
+			//“打印预览”、“打印”等按钮隐藏
+			$("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){
+				toggleShow(this,1);
+			});
+			
+			//渲染数字增减框
+			if( $("#tousseName_tousse_number").length < 1 ){
+				$("#tousseName_tousse_num").spinner({id:'tousseName_tousse_number'});
+			}
+			
+			//当前申请单类型为“一次性物品申请单”
+			currentApplication=Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
+			//设置“器械类型”为“一次性物品”
+			toussesJson.tousseType = Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
+			//表格内容是否设置有子表
+			toussesJson.isExpandRow = false;
+			//清空申请物品数组
+			appToussesArr=[];
+			showAppForm(toussesJson);
+			//“处理科室”下拉框
+			renderSelect_handlerDpt('handleDep_tousse',1,"器械包",$('#departApp_tousse').val());
+			
+			$("#tousseAppForm").s_validate({
+				departApp_tousse:{	
+									type:'id',
+									error:"申请科室不能为空"
+								 },
+				settleDep_tousse:{	
+									type:'id',
+									error:"结算科室不能为空"
+								 },
+				handleDep_tousse:{
+									type:'id',
+									error:"处理科室不能为空"
+								  },
+				appToussesArr : {
+									type:'array',
+									error:"申请物品不能为空",
+									positionId:'tousseName_tousse_select',
+									value:appToussesArr,
+									validateField:{field:'amount',type:'num',valiType:'notEmpty'}
+								}
+			});
+		});
+	
+
+	/*【申请消毒物品--按钮】*/
+	$('#menu_recyclingApplication_content  iframe',parent.document).contents().find("#app_disinfection").on('click',function(){
+			
+			$("#tousseAppForm").s_validate('destroy');
+			
+			//“打印预览”、“打印”等按钮隐藏
+			$("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){
+				toggleShow(this,1);
+			});
+			
+			//渲染数字增减框
+			if( $("#tousseName_tousse_number").length < 1 ){
+				$("#tousseName_tousse_num").spinner({id:'tousseName_tousse_number'});
+			}
+			
+			//当前申请单类型为“消毒物品申请单”
+			currentApplication=Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;
+			//设置“器械类型”为“消毒物品”
+			toussesJson.tousseType = Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;
+			//表格内容是否设置有子表
+			toussesJson.isExpandRow = true;
+			
+			//清空申请物品数组
+			appToussesArr=[];
+			showAppForm(toussesJson);
+			//“处理科室”下拉框
+			renderSelect_handlerDpt('handleDep_tousse',1,"器械包",$('#departApp_tousse').val());
+			
+			$("#tousseAppForm").s_validate({
+				departApp_tousse:{	
+									type:'id',
+									error:"申请科室不能为空"
+								 },
+				settleDep_tousse:{	
+									type:'id',
+									error:"结算科室不能为空"
+								 },
+				handleDep_tousse:{
+									type:'id',
+									error:"处理科室不能为空"
+								  },
+				appToussesArr : {
+									type:'array',
+									error:"申请物品不能为空",
+									positionId:'tousseName_tousse_select',
+									value:appToussesArr,
+									validateField:{field:'amount',type:'num',valiType:'notEmpty'}
+								}
+			});
+		});
+		
+		
+		/*【申请器械包/一次性物品/消毒物品--表格--“添加物品”按钮】*/
+		$("#tousseAdd").click(function(){
+			/*1.不能为空
+			 * 2.物品列表（物品模板）不存在则在后面追加
+			 * 3.如果申请模板中存在，那么直接更新申请数量即可
+			 */
+			var tousseName_tousse_select=$("#tousseName_tousse_select");
+			var tousseName_tousse_number=$("#tousseName_tousse_number");
+			var name=tousseName_tousse_select.text();
+			//此处ID
+			var id=tousseName_tousse_select.val()[0];
+			
+			var num=tousseName_tousse_number.val();
+			if(!Tools.StringUtils.isEmpty(name)&&!Tools.StringUtils.isEmpty(num)){
+				//1.追加到表格的内容；2.添加后信息会存储在appToussesArr中，申请单保存时可直接获取到需要提交的物品信息
+				var appendContent;
+				//判断当前操作的申请单为以下哪种：“器械包申请单”、“一次性物品申请单”、“消毒物品申请单”
+				if(currentApplication == Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM){//“器械包申请单”
+					appendContent={
+							"id":null,
+							"tousseName":name,
+							"amount":num,
+							"originalPrice":null,
+							"price":null,
+							"rowPrice":null,
+							"urgentAmount":null,
+							"isApplyEntireTousse":null,
+							"expressInvoice":"否",
+							"diposable":"否",
+							"tousseType":"器械包",
+							"unit":null,
+							"unitCount":null,
+							"minUnit":null,
+							"transferScale":null,
+							"disinfectMaterilas":"",
+							"tousseDefinitionID":id
+							};
+				}else if(currentApplication == Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM){//“一次性物品申请单”
+					 appendContent={
+							"id":null,
+							"tousseName":name,
+							"amount":num,
+							"originalPrice":null,
+							"price":null,
+							"rowPrice":null,
+							"urgentAmount":null,
+							"isApplyEntireTousse":null,
+							"expressInvoice":"否",
+							"diposable":"是",
+							"tousseType":Constants.DisposableGoodType.TYPE_NAME,
+							"unit":null,
+							"unitCount":null,
+							"minUnit":null,
+							"transferScale":null,
+							"disinfectMaterilas":"",
+							"disposableGoodsId":id
+							};	
+				}else if(currentApplication == Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM){//“消毒物品申请单”
+					var disinfectMaterilas={};
+		    		for(var i = 0;i < disinfectionComboGoodsStore.length;i++){
+		    			var item1=disinfectionComboGoodsStore[i];
+		    			if(id == item1.id){
+		    				disinfectMaterilas=item1.materials;
+		    				break;
+		    			}
+		    		}
+		        	
+					 appendContent={
+							"id":null,
+							"tousseName":name,
+							"amount":num,
+							"originalPrice":null,
+							"price":null,
+							"rowPrice":null,
+							"urgentAmount":null,
+							"isApplyEntireTousse":"是",
+							"expressInvoice":"否",
+							"diposable":"否",
+							"tousseType":Constants.TousseType.PACKAGE_TYPE_DISINFECTION,
+							"unit":null,
+							"unitCount":null,
+							"minUnit":null,
+							"transferScale":null,
+							"disinfectMaterilas":JSON.stringify(transformDisinfectionMaterial(disinfectMaterilas)),
+							"tousseDefinitionID":id
+							};	
+				}
+				
+				$("#tousse_table").bootstrapTable('append',appendContent);
+				tousseName_tousse_select.text('');
+				tousseName_tousse_number.val('');
+				appToussesArr.push(appendContent);
+				$("#tousseAppForm").s_validate('destroy','tousseName_tousse_select');
+			}
+		});
+		
+		/*【申请器械包/一次性物品/消毒物品--“提交”按钮】*/	
+		$("#tousseSubmit").mouseup(function(){
+			submitJson.currentApplication = currentApplication;
+			 submitJson.isCommit = true;
+			 submitJson.appToussesArr = appToussesArr;
+			var valResult =  $("#tousseAppForm").s_validate('getResult');
+			if(valResult == true){
+				submitForm(submitJson);
+			}
+		});
+		
+		/*【申请器械包/一次性物品/消毒物品--“提交并新建”按钮】*/	
+		$("#tousseSubmitAndNewForm").click(function(){
+			 submitJson.currentApplication = currentApplication;
+			 submitJson.isCommit = true;
+			 submitJson.appToussesArr = appToussesArr;
+//			 submitJson.isRefresh = false;
+			 //提交申请单
+			 submitForm(submitJson);
+			//新建申请单 
+			 	if(currentApplication == Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM){//“器械包申请单”
+			 		currentApplication=Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
+					toussesJson.tousseType = Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
+					toussesJson.isExpandRow = false;
+					//清空申请物品数组
+					appToussesArr=[];
+					showAppForm(toussesJson);
+				}else if(currentApplication == Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM){//“一次性物品申请单”
+					currentApplication=Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
+					toussesJson.tousseType = Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
+					toussesJson.isExpandRow = false;
+					//清空申请物品数组
+					appToussesArr=[];
+					showAppForm(toussesJson);
+				}else if(currentApplication == Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM){//“消毒物品申请单”
+					currentApplication=Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;
+					toussesJson.tousseType = Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;
+					toussesJson.isExpandRow = true;
+					//清空申请物品数组
+					appToussesArr=[];
+					showAppForm(toussesJson);	
+				}
+			 
+		});
+		
+		/*【申请器械包/一次性物品/消毒物品--“暂存”按钮】*/	
+		$("#tousseTemStorage").click(function(){
+			submitJson.currentApplication = currentApplication;
+		 	submitJson.isCommit = false;
+		 	submitJson.appToussesArr = appToussesArr;
+		 	submitForm(submitJson);
+		});
+		
+		/*【申请器械包/一次性物品/消毒物品--“取消”按钮】*/	
+		$("#tousseCancel").click(function(){
+			window.top.$("#tousseModal").modal('hide');
+		});
+
+/**【表单--申请器械包/一次性物品/消毒物品  end】*/	
+
+/**
+ * 【主表--点击列--详情展示】
+ */	
+$("#showForm").on("click",function(){	
+	
+	var row = parent.formDate;
+	
+	$("#tousseAppForm").s_validate('destroy');
+	
+	$("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){
+		toggleShow(this,2);
+	});
+	
+	if( $("#tousseName_tousse_number").length < 1 ){
+		$("#tousseName_tousse_num").spinner({id:'tousseName_tousse_number'});
+	}
+	
+	if(row.type ==  Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM){
+		//当前申请单类型为“一次性物品申请单”
+		currentApplication=Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
+		//设置“器械类型”为“一次性物品”
+		toussesJson.tousseType = Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
+		//表格内容是否设置有子表
+		toussesJson.isExpandRow = false;
+	}else if(row.type ==  Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM){
+		//当前申请单类型为“一次性物品申请单”
+		currentApplication=Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;
+		//设置“器械类型”为“一次性物品”
+		toussesJson.tousseType = Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;
+		//表格内容是否设置有子表
+		toussesJson.isExpandRow = true;
+	}else if(row.type ==  Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM){
+		currentApplication=Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
+		toussesJson.tousseType = Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
+		toussesJson.isExpandRow = false;
+	}
+
+	//清空申请物品数组
+	appToussesArr=[];
+	showAppForm(toussesJson);
+	//“处理科室”下拉框
+	renderSelect_handlerDpt('handleDep_tousse',1,"器械包",$('#departApp_tousse').val());
+	
+	//----------------设置数据 ------------//
+	
+	$("#application_title").text("申请器械包");
+	$("#tousseModal").modal('show');
+	
+	//ID
+	$('#id').val(row.id);
+	
+	//流水号
+	var serialNumberEl=$('#serialNumber');
+	serialNumberEl.val(row.serialNumber);
+	
+	//申请人
+	var appEl=$('#applicant');
+	var applicant=appEl.val(row.applicant);
+	$('#applicantCode').val(row.applicantCode)
+	
+	//申请科室
+	$("#departApp_tousse").append("<option value='"+row.departCoding+"' selected='selected'>"+row.depart+"</option>");
+	
+	//结算科室
+	$("#settleDep_tousse").append("<option value='"+row.settleAccountsDepartCoding+"' selected='selected'>"+row.settleAccountsDepart+"</option>");
+	
+	//处理科室
+	$("#handleDep_tousse").append("<option value='"+row.handleDepartCoding+"' selected='selected'>"+row.handleDepart+"</option>");
+	
+	//申请时间
+	$("#time").val(row.applicationTimeStr);
+	
+	//备注
+	var remarksEl=$('#remarks')
+	var remark=remarksEl.val(row.remark);
+	
+	//设置表格数据
+	appToussesArr=[];
+	for(var i=0;i<row.applicationItems.length;i++){
+		var item = row.applicationItems[i];
+		
+		var appendContent11={
+				"id":item.id,
+				"tousseName":item.tousseName,
+				"amount":item.amount,
+				"originalPrice":null,
+				"price":item.price,
+				"rowPrice":item.rowPrice,
+				"urgentAmount":null,
+				"isApplyEntireTousse":item.isApplyEntireTousse,
+				"expressInvoice":"否",
+				"diposable":'',
+				"tousseType":item.tousseType,
+				"unit":'',
+				"unitCount":null,
+				"minUnit":null,
+				"transferScale":null,
+				"disinfectMaterilas":"",
+				"tousseDefinitionID":item.tousseDefinitionId
+				};
+
+		$("#tousse_table").bootstrapTable('append',appendContent11);
+		appToussesArr.push(appendContent11);
+	}
+	//----------------设置数据 end ------------//
+	
+	$("#tousseAppForm").s_validate({
+		departApp_tousse:{	
+							type:'id',
+							error:"申请科室不能为空"
+						 },
+		settleDep_tousse:{	
+							type:'id',
+							error:"结算科室不能为空"
+						 },
+		handleDep_tousse:{
+							type:'id',
+							error:"处理科室不能为空"
+						  },
+		appToussesArr : {
+							type:'array',
+							error:"申请物品不能为空",
+							positionId:'tousseName_tousse_select',
+							value:appToussesArr,
+							validateField:{field:'amount',type:'num',valiType:'notEmpty'}
+						}
+									});
+		});
+
+});//$(function()结束
+
+
+
+
+
+
+
+
+/**
+ *获取表单物品列表
+ */
+function getAppTemplate(){
+	var result=[];
+	$.ajax({
+		url:WWWROOT+'/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do',
+		type:'post',
+		dataType:'json',
+		async:false,
+		success:function(msg){
+			if(!Tools.StringUtils.isEmpty(msg)){
+				result=msg.rightStore.children;
+			}
+		},error:function(msg){
+			
+		}
+	});
+	return result;
+}	
+	
+	
+/**
+ * 获取下拉框内容并渲染到页面--科室下拉框
+ */
+function renderDepartment_tousse(elementId,placeholder,maximumSelectionLength,url,asyns){
+	
+	$("#"+elementId).select2({
+        language : 'zh-CN',//转为中文版
+        minimumInputLength: 1,
+        placeholder: placeholder,
+        maximumSelectionLength:maximumSelectionLength,
+        ajax: {
+            url: WWWROOT + url,
+            dataType: 'json',
+    		contentType:"application/json;charset=utf-8",   
+    		asyns:asyns,
+    		type:'POST',
+            cache: true,
+            delay: 1000,
+            data:function (params) {
+                return JSON.stringify({
+                    title: params.term, // search term
+                    limit:100,
+                    page: params.page||1, //第几页返回查询
+                    offset:(params.page||1) * 100
+                });
+            },
+            processResults: function (data,params) {//结果处理
+            	 var result=[];
+            	 var store=data.data.data;
+            	 for(var i=0;i<store.length;i++){
+            		 var item={};
+            		 item.id=store[i].id;
+            		 item.text=store[i].sheduleName;
+            		 result.push(item);
+            	 }
+                return {
+                    results: result,"pagination": {"more": true}}
+            }
+        }
+    });
+	$("#"+elementId).next().attr('style','width:100%;');
+}
+
+
+
+//"申请外来器械"处理方式下拉框
+function renderDepartment_foreignTousse(elementId){
+
+	$("#"+elementId).select2({
+    language : 'zh-CN',//转为中文版
+    minimumInputLength: 1,
+    placeholder: "关键词搜索",
+    maximumSelectionLength:1,
+    allowClear: true,
+    ajax: {
+      url: WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!getProcessType.mhtml',
+      dataType: 'json',
+		contentType:"application/json;charset=utf-8",   
+		type:'get',
+        cache: true,
+        delay: 1000,
+        data:function (params) {
+            return {
+                spell: params.term, // search term
+                limit:20,
+                page:params.page||1, //第几页返回查询
+                offset:((params.page||1)-1) * 20
+            	};
+        },
+        processResults: function (data,params) {//结果处理
+        	 var result=[];
+        	if(data.success == true){
+        		result=transformJsonArrToSelect2(data.rows,"id","displayName");
+        	}
+            return {results: result,"pagination": {"more": true}}
+        }
+    }
+});
+	$("#"+elementId).next().attr('style','width:100%;');
+	
+}
+
+
+//"申请外来器械"器械包信息下拉框
+function renderDepartment_foreignTousse(elementId,supplierName){
+
+	$("#"+elementId).select2({
+      language : 'zh-CN',//转为中文版
+      minimumInputLength: 1,
+      placeholder: "关键词搜索",
+      maximumSelectionLength:1,
+      allowClear: true,
+      ajax: {
+        url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionController!getForeignTousseDefinitionNames.mhtml',
+        dataType: 'json',
+  		contentType:"application/json;charset=utf-8",   
+  		type:'get',
+          cache: true,
+          delay: 1000,
+          data:function (params) {
+              return {
+            	  supplierName : supplierName,
+                  spell: params.term, // search term
+                  limit:20,
+                  page:params.page||1, //第几页返回查询
+                  offset:((params.page||1)-1) * 20
+              	};
+          },
+          processResults: function (data,params) {//结果处理
+          	 var result=[];
+          	if(data.success == true){
+          		result=transformJsonArrToSelect2(data.rows,"id","displayName");
+          	}
+              return {results: result,"pagination": {"more": true}}
+          }
+      }
+  });
+	$("#"+elementId).next().attr('style','width:100%;');
+	
+}
+
+
+
+//"申请外来器械"供应商下拉框
+function renderDepartment_suppler(elementId,supplierType){
+
+	$("#"+elementId).select2({
+        language : 'zh-CN',//转为中文版
+        minimumInputLength: 1,
+        placeholder: "关键词搜索",
+        maximumSelectionLength:1,
+        allowClear: true,
+        ajax: {
+            url: WWWROOT + '/disinfectSystem/baseData/supplierController!getSupplierData.mhtml',
+            dataType: 'json',
+    		contentType:"application/json;charset=utf-8",   
+    		type:'get',
+            cache: true,
+            delay: 1000,
+            data:function (params) {
+                return {
+                	supplierType : supplierType,
+                    spell: params.term, // search term
+                    limit:20,
+                    page:params.page||1, //第几页返回查询
+                    offset:((params.page||1)-1) * 20
+                	};
+            },
+            processResults: function (data,params) {//结果处理
+            	 var result=[];
+            	if(data.success == true){
+            		result=transformJsonArrToSelect2(data.rows,"phoneNumber","contactName");
+            	}
+                return {results: result,"pagination": {"more": true}}
+            }
+        }
+    });
+	$("#"+elementId).next().attr('style','width:100%;');
+	
+}
+
+
+
+//"申请外来器械"医生下拉框
+function renderSelect_doctor(elementId){
+	
+	$("#"+elementId).select2({
+        language : 'zh-CN',//转为中文版
+        minimumInputLength: 1,
+        placeholder: "关键词搜索",
+        maximumSelectionLength:1,
+        allowClear: true,
+        ajax: {
+            url: WWWROOT + '/disinfectSystem/baseData/commonlyUsedDoctorController!findDoctorListBykeyWord.mhtml',
+            dataType: 'json',
+    		contentType:"application/json;charset=utf-8",   
+    		type:'get',
+            cache: true,
+            delay: 1000,
+            data:function (params) {
+                return {
+                    spell: params.term, // search term
+                    limit:20,
+                    page:params.page||1, //第几页返回查询
+                    offset:((params.page||1)-1) * 20
+                	};
+            },
+            processResults: function (data,params) {//结果处理
+            	 var result=[];
+            	if(data.success == true){
+            		result=transformJsonArrToSelect2(data.rows,"doctorName","doctorName");
+            	}
+                return {results: result,"pagination": {"more": true}}
+            }
+        }
+    });
+	$("#"+elementId).next().attr('style','width:100%;');
+}
+
+
+
+
+//【所有申请单-下拉框渲染--申请科室】
+function renderSelect_appDpt(elementId,maximumSelectionLength){
+	$("#"+elementId).select2({
+        language : 'zh-CN',//转为中文版
+        minimumInputLength: 1,
+        placeholder: "关键词搜索",
+        maximumSelectionLength:maximumSelectionLength,
+        allowClear: true,
+        ajax: {
+            url: WWWROOT + '/disinfectSystem/core/orgUnitController/searchApplyDepartmentByKeyWord.mhtml',
+            dataType: 'json',
+    		contentType:"application/json;charset=utf-8",   
+    		type:'get',
+            cache: true,
+            delay: 1000,
+            data:function (params) {
+                return {
+                    spell: params.term, // search term
+                    limit:20,
+                    page:params.page||1, //第几页返回查询
+                    offset:((params.page||1)-1) * 20
+                	};
+            },
+            processResults: function (data,params) {//结果处理
+            	 var result=[];
+            	if(data.success == true){
+            		result=transformJsonArrToSelect2(data.rows,"departmentCode","departmentName");
+            	}
+                return {results: result,"pagination": {"more": true}}
+            }
+        }
+    });
+	$("#"+elementId).next().attr('style','width:100%;');
+}
+
+//【“申请器械包”-下拉框渲染--结算科室】
+function renderSelect_settleDpt(elementId,maximumSelectionLength){
+	$("#"+elementId).select2({
+        language : 'zh-CN',
+        minimumInputLength: 1,
+        placeholder: "关键词搜索",
+        maximumSelectionLength:maximumSelectionLength,
+        allowClear: true,
+        ajax: {
+            url: WWWROOT + '/disinfectSystem/core/orgUnitController/searchSettleDepartmentByKeyWord.mhtml',
+            dataType: 'json',
+    		contentType:"application/json;charset=utf-8",   
+    		type:'get',
+            cache: true,
+            delay: 1000,
+            data:function (params) {
+                return {
+                    spell: params.term, // search term
+                    limit:20,
+                    page:params.page||1, //第几页返回查询
+                    offset:((params.page||1)-1) * 20
+                };
+            },
+            processResults: function (data,params) {//结果处理
+            	 var result=[];
+            	if(data.success == true){
+            		result=transformJsonArrToSelect2(data.rows,"departmentCode","departmentName");
+            	}
+                return {results: result,"pagination": {"more": true}}
+            }
+        }
+    });
+	$("#"+elementId).next().attr('style','width:100%;');
+}
+
+
+/**【“申请器械包”-下拉框渲染--处理科室】
+ * applyDepartCode: 申请科室编码
+ * tousseType:物品类型(值有器械包、一次性物品)
+ * spell:搜索过滤关键字
+ */
+function renderSelect_handlerDpt(elementId,maximumSelectionLength,tousseType,applyDepartCode){
+	
+	var result=[];
+	$.ajax({
+		url:WWWROOT + '/disinfectSystem/core/orgUnitController/searchHandleDepartmentByKeyWord.mhtml',
+		dataType: 'json',
+ 		 contentType:"application/json;charset=utf-8",   
+ 		 type:'get',
+ 		 async:false,
+         cache: true,
+         data:{applyDepartCode:applyDepartCode,tousseType:tousseType},
+		success:function(msg){
+			result=transformJsonArrToSelect2(msg.rows,"departmentCode","departmentName");
+		}
+		});
+	
+	$("#"+elementId).select2({
+		 minimumResultsForSearch: Infinity,
+		  data: result
+		})
+	
+	$("#"+elementId).next().attr('style','width:100%;');
+	
+//	$("#"+elementId).select2({
+//      ajax: {
+//          url: WWWROOT + '/disinfectSystem/core/orgUnitController/searchHandleDepartmentByKeyWord.mhtml',
+//          dataType: 'json',
+//  		 contentType:"application/json;charset=utf-8",   
+//  		 type:'get',
+//          cache: true,
+//          delay: 1000,
+//          data:function (params) {
+//              return {
+//            	  applyDepartCode:applyDepartCode,
+//            	  tousseType:tousseType,
+//                  spell: params.term, // search term
+//                  limit:20,
+//                  page:params.page||1, //第几页返回查询
+//                  offset:((params.page||1)-1) * 20
+//              };
+//          },
+//          processResults: function (data,params) {//结果处理
+//          	 var result=[];
+//          	if(data.success == true){
+//          		result=transformJsonArrToSelect2(data.rows,"departmentCode","departmentName");
+//          	}
+//              return {results: result,"pagination": {"more": true}}
+//          }
+//      }
+//  });
+//	
+		
+	
+}
+
+
+/**【“申请器械包”-下拉框渲染--申请物品列表】
+*tousseType:类型
+*appCode:申请科室编码
+*settleAccountsDepartCoding:结算科室编码
+*cssdOrgUnitCode:处理科室编码
+*spell:搜索关键字
+*limit:每页记录数
+*offset:第多少条起
+ */
+function renderSelect_comboGoods(elementId,maximumSelectionLength,tousseType,appCode,settleAccountsDepartCoding,cssdOrgUnitCode){
+//	 appCode ;
+//	 settleAccountsDepartCoding ;
+//	 cssdOrgUnitCode ;
+	
+	$("#"+elementId).select2({
+      language : 'zh-CN',
+      minimumInputLength: 1,
+      placeholder: "关键词搜索",
+      maximumSelectionLength:maximumSelectionLength,
+      allowClear: true,
+      ajax: {
+          url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchComboGoodsData.do',
+          dataType: 'json',
+  		  contentType:"application/json;charset=utf-8",   
+  		  type:'get',
+//          cache: true,
+          delay: 1000,
+          data:function (params){
+              return {
+	            	  tousseType:tousseType,
+	            	  appCode:Tools.ArrayUtils.isNotEmpty($('#departApp_tousse').val()) ? $('#departApp_tousse').val()[0] : '',
+	            	  settleAccountsDepartCoding:Tools.ArrayUtils.isNotEmpty($('#settleDep_tousse').val()) ? $('#settleDep_tousse').val()[0] : '',
+	            	  cssdOrgUnitCode:$('#handleDep_tousse').val(),
+	                  spell: params.term, // search term
+	                  limit:20,
+	                  page:params.page||1, //第几页返回查询
+	                  offset:((params.page||1)-1) * 20
+	              	 };
+          },
+          beforeSend:function(){
+//        	  appCode= $('#departApp_tousse').val()[0];
+//        	  settleAccountsDepartCoding= $('#settleDep_tousse').val()[0];
+//        	  cssdOrgUnitCode=$('#handleDep_tousse').val()[0];
+          },
+          processResults: function (data,params) {//结果处理
+          	 var result=[];
+          	if(data.success == true){
+          		$.merge(disinfectionComboGoodsStore,data.rows);
+          		result=transformJsonArrToSelect2(data.rows,"id","name");
+          	}
+              return {results: result,"pagination": {"more": true}}
+          }
+      }
+  });
+	$("#"+elementId).next().attr('style','width:100%;');
+}
+
+
+
+/** 加载主页面table列表
+ * 
+ */
+function loadAppListTable(tableId,toolbarId,columns){
+//	$('#menu_recyclingApplication_content  iframe',parent.document).contents().find("#destroyTable").click();
+//	var el =$('#menu_recyclingApplication_content  iframe',parent.document).contents().find("#"+tableId);
+//	$('#menu_recyclingApplication_content  iframe',parent.document).contents().find("#"+tableId).bootstrapTable('destroy');
+	$(el).bootstrapTable(
+                {	
+                	url:WWWROOT +'/disinfectSystem/recyclingApplication/recyclingApplicationController/findRecyclingApplicationList.mhtml',
+                    method : 'get',
+                    dataType : "json",
+                    contentType:"application/json;charset=utf-8",   
+                    dataField : "rows",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
+                    striped : true,// 设置为 true 会有隔行变色效果
+                    undefinedText : " ",// 当数据为 undefined 时显示的字符
+                    pagination : true, // 分页
+                    pageNumber : 1,// 如果设置了分页，首页页码
+                    data_local : "zh-US",// 表格汉化
+                    responseHandler : "",
+                    sidePagination:'server',
+                    search:true,
+                    showRefresh:true,
+                    showColumns:true,
+                    trimOnSearch:true,
+                    toolbar:'#'+toolbarId,
+                    pageSize : 30,// 如果设置了分页，页面数据条数
+                    pageList : [ 10,20,30], // 如果设置了分页，设置可供选择的页面数据条数。设置为All则显示所有记录。
+                    paginationPreText: "上一页",
+                    paginationNextText: "下一页",
+                    paginationFirstText: "首页",
+                    paginationLastText: "尾页",
+                    sortable: true,//是否启用排序
+				    sortOrder: "desc",//排序方式
+				    sortName: '',//排序字段
+                    queryParams : function(params) {
+                        return {
+                        	offset : params.offset,
+                            limit : params.limit,
+                            sort:params.sort,
+                            order:params.order,
+                            search : params.search
+                        	};
+                    },
+                    onDblClickRow: function (row) {},
+                    idField : "id",
+                    columns : columns,
+                    onExpandRow: function (index, row, $detail) {},
+                	onEditableSave: function (field, row, oldValue, $el) {}
+                });
+
+}
+
+
+
+
+/**加载table
+ * @param:id  被渲染元素的ID
+ * @param:tableDate 数据源
+ * @param:columns  字段
+ * @param:isPagination  是否分页
+ * @param:isSearch		是否显示搜索框
+ * @param:toolbarId		工具栏ID
+ * @param:detailView 	是否点击列时显示子表格
+ * @param:tousseStore	物品数据源，
+ */
+
+function loadTable(id,tableDate,columns,isPagination,isSearch,toolbarId,detailView,appTousseArray,tousseStore){
+	
+	$("#"+id).bootstrapTable("destroy");
+	$("#"+id).bootstrapTable(
+                {	
+                	data:tableDate,
+                    method : 'get',
+                    dataType : "json",
+                    dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
+                    striped : true,// 设置为 true 会有隔行变色效果
+                    undefinedText : " ",// 当数据为 undefined 时显示的字符
+                    pagination : isPagination, // 分页
+                    pageNumber : 1,// 如果设置了分页，首页页码
+                    data_local : "zh-US",// 表格汉化
+                    responseHandler : "",
+                    search:isSearch,
+                    toolbar:'#'+toolbarId,
+                    pageSize : 30,// 如果设置了分页，页面数据条数
+                    pageList : [ 10,20,30], // 如果设置了分页，设置可供选择的页面数据条数。设置为All则显示所有记录。
+                    paginationPreText: "上一页",
+                    paginationNextText: "下一页",
+                    paginationFirstText: "首页",
+                    paginationLastText: "尾页",
+                    detailView:detailView,
+                    sortable: true,//是否启用排序
+				    sortOrder: "desc",//排序方式
+				    sortName: 'appTime',//排序字段
+                    queryParams : function(params) {
+                        return {
+                            start : params.offset,
+                            limit : params.limit,
+                            keyword : params.search
+                        };
+                    },
+                    onDblClickRow: function (row) {
+                        
+                    },
+                    idField : "id",
+                    columns : columns,
+                    onExpandRow: function (index, row, $detail) {
+                    	var disId=row.tousseDefinitionID;
+                    	var item={};
+                		for(var i = 0;i < disinfectionComboGoodsStore.length;i++){
+                			var item1=disinfectionComboGoodsStore[i];
+                			if(disId == item1.id){
+                				item=item1;
+                				break;
+                			}
+                		}
+                		
+                    	var elArr=$("#"+id).find("th");
+                    	//通过index获取表头宽度
+							var table="<table >";
+							for(var i=0;i<item.materials.length;i++){
+								var material=item.materials[i];
+								table=table+"<tr>"
+											+"<td width='"+$(elArr[0]).width()+"' align='center'></td>"
+											+"<td width='"+$(elArr[1]).width()+"' align='center'>"+material.name+"</td>"
+											+"<td width='"+$(elArr[2]).width()+"' align='center'>"+material.count+"</td>"
+											+"<td width='"+$(elArr[3]).width()+"' align='center'>"+material.price+"</td>"
+											+"<td width='"+$(elArr[4]).width()+"' align='center'></td>"
+										+"</tr>";
+							}
+							table=table+"</table>";	
+							
+						$detail.html(table);
+                	},
+                	onEditableSave: function (field, row, oldValue, $el) {
+                		var isExist=false; 
+                		for(var i=0;i<appTousseArray.length;i++){
+                			 //如果已存在，则更新obj中物品项
+                			 if(row.tousseDefinitionID==appTousseArray[i].tousseDefinitionID){
+                				 //如果row中appNum为0，则移除
+                				 if(row.appNum==0){
+                					 appTousseArray.splice(i,1);
+                				 }else{
+                					 appTousseArray[i].appNum=row.appNum;
+                				 }
+                				 isExist=true;
+                			 }
+                		 }
+                		
+	                		if(isExist==false&&row.appNum!=0){
+	                			appTousseArray.push(row);
+	                		}
+                	}
+                });
+	
+}
+
+
+
+
+
+
+
+
+//初始化时间框
+function initSchedulingDate(idStr,format){
+	var startView;
+	var minView;
+	if(Tools.StringUtils.isEmpty(format)){
+		format='hh:ii';
+		 startView='day';
+		 minView='hour';
+	}else{
+		 startView='year';
+		 minView='month';
+	}
+	
+ 	$('#' + idStr).datetimepicker({
+	    autoclose: true,
+        startView: startView, 
+        minView: minView,
+        minuteStep:1, 
+        format: format,// 年月日时分秒
+        clearBtn:false,
+        todayBtn:true,
+	})
+	
+ }
+
+function tousseAppSumbmit(){
+	
+	//ID
+	var idEl=$('#id');
+	var id=idEl.val();
+	//申请人
+	var appEl=$('#applicant');
+	var applicant=appEl.val();
+	var applicantCode=$('#applicantCode').val();
+	
+	//申请科室
+	var departAppEl=$('#departApp_tousse')
+	var departCoding=departAppEl.val()[0];
+	var depart=departAppEl.find("option:selected").text();
+	
+	//结算科室
+	var settleDepEl=$('#settleDep_tousse')
+	var settleAccountsDepartCoding=settleDepEl.val()[0];
+	var settleAccountsDepart=settleDepEl.find("option:selected").text();
+	
+	//处理科室
+	var handleDepEl=$('#handleDep_tousse')
+	var handleDepartCoding=handleDepEl.val();
+	var handleDepart=handleDepEl.find("option:selected").text();
+	
+	//时间
+	var applicationTimeStr=$("#time").text();
+	
+	//备注
+	var remarksEl=$('#remarks');
+	var remark=remarksEl.text();
+	
+	//申请单类型
+	var type=Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
+	
+	var commitData = new tousseApplicationData(true,id,applicant,applicantCode,appToussesArr,departCoding,depart,settleAccountsDepartCoding,settleAccountsDepart,handleDepartCoding,handleDepart,type,applicationTimeStr,remark);
+	
+	$.ajax({
+		url:WWWROOT +'/disinfectSystem/recyclingApplicationAction!saveRecyclingApplication.do',
+		type:'post',
+//		contentType:"application/json;charset=utf-8",   
+		dataType:'json',
+		data:commitData,
+		success:function(msg){
+			if(msg.success == true){
+				loadAppListTable("allApplication_table","toolbar_table",allApplication_columns);
+				$("#tousseModal").modal('hide');
+			}else{
+				alert(msg.message);
+			}
+		}
+	});
+}
+
+/**
+ * 清空表单
+ * @formId 表单ID
+ * @tableIds 表单中表格destroy(此处需是bootstrap-table)
+ *1.隐藏模态框
+ *2.清空表单各输入框内容,表格重置
+ *3.清空物品项数组appToussesArr
+ */
+function clearForm(isIE,formId,tableIds,appToussesArr){
+	//清除input/select/textarea元素
+	if(isIE == true){
+		$("#"+formId).filter('input[type=text],input[type=number],select,input[type=hidden],textarea').each(function() {
+			    $(this).val('');
+			    $(this).text('');
+		});
+	}else{
+		$("#"+formId).find('input[type=text],input[type=number],select,input[type=hidden],textarea').each(function() {
+		    $(this).val('');
+		    $(this).text('');
+	});
+	}
+	
+	//清空table
+	for(var i=0;i<tableIds.length;i++){
+		$("#"+tableIds[i]).bootstrapTable('destroy');
+	}
+	//清空物品列表所选择数据的缓存
+	if(appToussesArr != undefined && appToussesArr.length != 0){
+		appToussesArr=[];
+	}
+	return appToussesArr;
+}
+
+/**
+ *将json数组转换成select2特定的json格式 
+ *@param jsonArray 需要转换的json数组
+ *@param idCorreFiled 与select2中id对应的属性
+ *@param textCorreFiled 与select2中text对应的属性
+ */
+function transformJsonArrToSelect2(jsonArray,idCorreFiled,textCorreFiled){
+	var result=[];
+	for(var i=0;i<jsonArray.length;i++){
+		var json={};
+		var jsonItem=jsonArray[i];
+		json.id=jsonItem[idCorreFiled];
+		json.text=jsonItem[textCorreFiled];
+		result.push(json);
+	}
+	return result;
+}
+
+/**
+ * 根据申请单ID获取详情页
+ */
+function loadRecyclingApplicationById(appId){
+	var result;
+	$.ajax({
+		url:WWWROOT+'/disinfectSystem/recyclingApplication/recyclingApplicationController/loadRecyclingApplicationById.mhtml',
+		type:'get',
+		data:{id:appId},
+		dataType:'json',
+		success:function(msg){
+			result=msg;
+		}
+	});
+	
+	if(result.success == true){
+		return result.data;
+	}else{
+		alert(result.message);
+		return ;
+	}
+	
+}
+
+
+/**
+ * 申请单提交对象
+ */
+function tousseApplicationData(comSta,id,appli,appliCode,tousseInstanceInfosArr,departCoding,depart,settleAccountsDepartCoding,settleAccountsDepart,handleDepartCoding,handleDepart,type,applicationTimeStr,remark){
+	this.committedStatus=comSta,
+	this.id=id,
+	this.applicant=appli,
+	this.applicantCode=appliCode,
+	this.tousseInstanceInfos=JSON.stringify(tousseInstanceInfosArr),
+	this.departCoding=departCoding,
+	this.depart=depart,
+	this.settleAccountsDepartCoding=settleAccountsDepartCoding,
+	this.settleAccountsDepart=settleAccountsDepart,
+	this.handleDepartCoding=handleDepartCoding,
+	this.handleDepart=handleDepart,
+	this.type=type,
+	this.applicationTimeStr=applicationTimeStr,
+	this.remark=remark
+}
+
+/**
+ * 一次性物品申请单提交对象
+ */
+function disposableGoodApplicationData(comSta,id,appli,appliCode,tousseInstanceInfosArr,departCoding,depart,settleAccountsDepartCoding,settleAccountsDepart,handleDepartCoding,handleDepart,type,applicationTimeStr,remark){
+	this.committedStatus=comSta,
+	this.id=id,
+	this.applicant=appli,
+	this.applicantCode=appliCode,
+	this.tousseInstanceInfos=JSON.stringify(tousseInstanceInfosArr),
+	this.departCoding=departCoding,
+	this.depart=depart,
+	this.settleAccountsDepartCoding=settleAccountsDepartCoding,
+	this.settleAccountsDepart=settleAccountsDepart,
+	this.handleDepartCoding=handleDepartCoding,
+	this.handleDepart=handleDepart,
+	this.type=type,
+	this.applicationTimeStr=applicationTimeStr,
+	this.remark=remark,
+	this.tousseType='一次性物品'
+}
+
+
+/**
+ *申请物品明细对象 
+ */
+function tousseInstance(id,tousseName,amount,originalPrice,price,rowPrice,urgentAmount,isApplyEntireTousse,expressInvoice,diposable,tousseType,unit,unitCount,minUnit,transferScale,disinfectMaterilas,tousseDefinitionID){
+	this.id=id,
+	this.tousseName=tousseName,
+	this.amount=amount,
+	this.originalPrice=originalPrice,
+	this.price=price,
+	this.rowPrice=rowPrice,
+	this.urgentAmount=urgentAmount,
+	this.isApplyEntireTousse=isApplyEntireTousse,
+	this.expressInvoice=expressInvoice,
+	this.diposable=diposable,
+	this.tousseType=tousseType,
+	this.unit=unit,
+	this.unitCount=unitCount,
+	this.minUnit=minUnit,
+	this.transferScale=transferScale,
+	this.disinfectMaterilas=disinfectMaterilas,
+	this.tousseDefinitionID=tousseDefinitionID
+}
+
+/**
+ * 查询出来的消毒物品数据jsonArray转换成需要提交的jsonArray格式
+ * jsonArray:[{
+		"name": "骨刀 （小）[24cm刃8mm]",
+		"materialDefinitionId": 123,
+		"tousseType": "器械",
+		"isDiposable": "否",
+		"count": 1,
+		"countBackup": 1,
+		"totalPrice": 0,
+		"amount": 1,
+		"price": 0,
+		"leaf": true
+ *	
+ *	result:"[{\"name\":\"\壁\式\湿\化\瓶\",\"count\":4,\"tousseType\":\"\器\械\",\"groupNum\":\"\",\"materialDefinitionId\":2257}]",	 
+ */
+function transformDisinfectionMaterial(jsonArray){
+	var result=[];
+	if(Tools.ArrayUtils.isNotEmpty(jsonArray)){
+		for(var i = 0;i<jsonArray.length;i++){
+			var resultJson={};
+			var item = jsonArray[i];
+			resultJson.name=item.name;
+			resultJson.count=item.count;
+			resultJson.tousseType=item.tousseType;
+			resultJson.groupNum="";
+			resultJson.materialDefinitionId=item.materialDefinitionId;
+			result.push(resultJson);
+		}
+	}
+	return result;
+}
+
+/** 点击“申请器械包”、“申请一次性物品”、“申请消毒物品”、“申请外来器械”、“申请自定义器械包”、“申请外部代理灭菌包”、“借物”按钮显示申请表单
+ * var formJson={
+*					//是否为IE
+*					isIE:isIE,
+*					//模态框HTML元素ID属性
+*					modalElementId:"tousseModal",
+*					//模态框标题元素ID属性
+*					modalTileElementId:"application_title",
+*					//模态框“选择物品”下拉框元素ID属性
+*					tousseSelectElementId:"tousseName_tousse_select",
+*					//“选择物品”下拉框最多可选元素数量
+*					tousseSelectNum:1,
+*					//申请单类型
+*					tousseType:Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM,
+*					//申请单表格元素ID
+*					formTableElementId:"tousse_table",
+*					//申请单表格对应的字段
+*					columns:appTemplate_columns,
+*					//申请单表格需要加载的数据
+*					appToussesArr:appToussesArr,
+*					//“申请科室”输入框HTML元素ID
+*					departElementId:'departApp_tousse',
+*					//“结算科室”输入框HTML元素ID
+*					settleDepartElementId:'settleDep_tousse',
+*					//“处理科室”输入框HTML元素ID
+*					handlerDepartElementId:'handleDep_tousse',
+*				//表格是否支持子表格
+*					isExpandRow:true
+*					};
+ */
+function showAppForm(formJson){
+	//清除表单
+	clearForm(formJson.isIE,formJson.modalContentElementId,[formJson.modalContentElementId]);
+	
+	var title="申请器械包";
+	var tousseType=formJson.tousseType;
+	
+	if(tousseType == Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM){
+		title = "申请一次性物品";
+	}else if(tousseType == Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM){
+		title = "申请消毒物品";
+	}
+	//设置表单申请人为当前登陆用户
+	$("#applicant").val(formJson.applicant);
+	//为表单设置标题
+	$("#"+formJson.modalTileElementId).text(title);
+//	$("#"+formJson.modalElementId).modal('show');tousseModal
+	window.top.$("#"+formJson.modalElementId).modal('show');
+	//渲染“物品名称”下拉框数据
+	renderSelect_comboGoods(formJson.tousseSelectElementId,formJson.tousseSelectNum,tousseType,$('#'+formJson.departElementId).val() || "",$('#'+formJson.settleDepartElementId).val() || "",$('#'+formJson.handlerDepartElementId).val() || "");
+	//加载“申请物品”信息表格
+	loadTable(formJson.formTableElementId,"",formJson.columns,false,false,"",formJson.isExpandRow,formJson.appToussesArr);
+	//调整bootstrap-table 原有的样式，节约空间
+	$(".table_div").find(".fixed-table-toolbar").remove();
+	$(".form-table").find(".th-inner").css({"padding-top":"0","padding-bottom":"0","margin-bottom":"8"});	
+}
+
+
+/** 提交申请单
+ * var submitJson={
+ *		//“ID”对应的HTML元素ID属性
+ *		idElId:,
+ *		//当前登陆用户名
+		 applicant:currentUserFullName,
+		 //当前登陆用户编码
+		 applicantCode:currentUserCode,
+ *		//“申请人”输入框ID属性
+ *		applicantElId:,
+ *		//“申请人编号”HTML元素ID
+ *		applicantCodeElId:,
+ *		//“申请科室”元素ID
+ *		departAppElId:,
+ *		//“结算科室”元素ID
+ *		settleDepElId:,
+ *		//“处理科室”元素ID
+ *		handleDepEl:,
+ *		//"申请时间"元素ID
+ *		timeElId:,
+ *		//“备注”元素ID
+ *		remarkElId:,
+ *		//当前申请单类型
+ *		currentApplication:
+ *		//申请物品数组
+ *		appToussesArr:
+ *		//主页面表格字段
+ *		allApplicationColumns:
+ *		//是否提交，true为提交，false为暂存
+ *		isCommit:,
+ 		//是否需要立即刷新主页面表格内容
+ 		isRefresh:true
+ *	}; 
+ */
+function submitForm(submitJson){
+	var valiResult = true;
+	//ID
+	var idEl=$('#'+submitJson.idElId);
+	var id=idEl.val();
+	
+	//申请人
+//	var appEl=$('#'+submitJson.applicantElId);
+	var applicant=submitJson.applicant;
+	var applicantCode=submitJson.applicantCode;
+	
+	//申请科室
+	var departAppEl=$('#'+submitJson.departAppElId);
+	var departCoding;
+	var departAppElVal = departAppEl.val();
+	if(!Tools.ArrayUtils.isNotEmpty(departAppElVal)){
+		valiResult = false;
+	}else{
+		departCoding=departAppElVal[0];
+	}
+	var depart=departAppEl.find("option:selected").text();
+	
+	//结算科室
+	var settleDepEl=$('#'+submitJson.settleDepElId);
+	var settleAccountsDepartCoding;
+	var settleDepElVal = departAppEl.val();
+	if(!Tools.ArrayUtils.isNotEmpty(settleDepElVal)){
+		valiResult = false;
+	}else{
+		settleAccountsDepartCoding=settleDepElVal[0];
+	}
+	var settleAccountsDepart=settleDepEl.find("option:selected").text();
+	
+	//处理科室
+	var handleDepEl=$('#'+submitJson.handleDepEl);
+	var handleDepartCoding = handleDepEl.val();
+	if( Tools.StringUtils.isEmpty(handleDepartCoding) ){
+		valiResult = false;
+	}
+	var handleDepart=handleDepEl.find("option:selected").text();
+	
+	//时间
+	var applicationTimeStr=$("#"+submitJson.timeElId).text();
+	
+	//备注
+	var remarksEl=$('#'+submitJson.remarkElId);
+	var remark=remarksEl.text();
+	
+	//申请单类型
+	var type;
+	
+	if(submitJson.currentApplication == Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM){//“器械包申请单”
+		type=Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM;
+	}else if(submitJson.currentApplication == Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM){//“一次性物品申请单”
+		type=Constants.AppType.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM;
+	}else if(submitJson.currentApplication == Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM){//“消毒物品申请单”
+		type=Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM;	
+	}
+	
+	var commitData = new disposableGoodApplicationData(submitJson.isCommit,id,applicant,applicantCode,submitJson.appToussesArr,departCoding,depart,settleAccountsDepartCoding,settleAccountsDepart,handleDepartCoding,handleDepart,type,applicationTimeStr,remark);
+	
+		$.ajax({
+			url:WWWROOT +'/disinfectSystem/recyclingApplicationAction!saveRecyclingApplication.do',
+			type:'post',
+	//		contentType:"application/json;charset=utf-8",   
+			dataType:'json',
+			data:commitData,
+			beforeSend:function(msg){
+				 	$("#tousseSubmitAndNewForm,#tousseSubmit,#tousseTemStorage").addClass("dx-btn-disable") ;
+					$("#tousseSubmitAndNewForm,#tousseSubmit,#tousseTemStorage").attr("disabled",true);
+			},
+			success:function(msg){
+				if(msg.success == true){
+					//重新加载主页表单
+					parent.refreshTable();
+				}else{
+					alert(msg.message);
+				}
+			},
+			complete:function(){
+				 window.top.$("#tousseModal").modal('hide');
+				 $("#tousseSubmitAndNewForm,#tousseSubmit,#tousseTemStorage").attr("disabled",false);
+				 $("#tousseSubmitAndNewForm,#tousseSubmit,#tousseTemStorage").removeClass("dx-btn-disable");
+			}
+		});
+}
+
+
+/**“器械包申请”、“一次性物品申请单”、“消毒物品申请单”隐藏或显示某按钮
+ *	el:HTML元素
+ *	state:1表示需要隐藏，2表示需要显示
+ */
+function toggleShow(el,state){
+	var footer = $("#modal-footer");
+	//隐藏
+	if(state == 1){
+		if( !$(el).hasClass("hideStatus") ){
+			$(el).addClass("hideStatus");
+			if ( $(footer).hasClass("col-xs-offset-1") == true ){
+				$(footer).removeClass("col-xs-offset-1");
+			}
+			$(footer).addClass("col-xs-offset-3");
+		};
+		
+	}else if(state == 2){
+		//显示
+		if( $(el).hasClass("hideStatus") ){
+			$(el).removeClass("hideStatus")
+			if ( $(footer).hasClass("col-xs-offset-3") == true ){
+				$(footer).removeClass("col-xs-offset-3");
+			}
+			$(footer).addClass("col-xs-offset-1");
+			}
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp	(revision 0)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp	(revision 24683)
@@ -0,0 +1,191 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<%@ include file="/dx-disinfectsystem/pages/disinfectsystem/commons/tagLibsPath.jsp"%>
+<title>JSP模板</title>
+
+<!-- bootstrap -->
+<link rel="stylesheet"href="${basePath}/dx-disinfectsystem/plugins/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+<!-- x-editable-develop -->
+<link rel="stylesheet"href="${basePath}/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/dist/bootstrap3-editable/css/bootstrap-editable.css">
+<!-- bootstrap table -->
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/css/bootstrap-table.css">
+<!-- bootstrap select  -->
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-select/dist/css/bootstrap-select.min.css">
+<!-- select2 -->
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/select2-develop/dist/css/select2-customer.css">
+<%-- bootstrap-datetimepicker --%>
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/css/bootstrap-datetimepicker.min.css">
+<!--自定义栅格系统-->
+<link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/common/bootstrap-s-gridSystem.css">
+<!--SSTS公共CSS文件-->
+<link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/common/dingxiang-common.css">
+<!-- 自身CSS -->											
+<link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css">
+
+<!-- IE兼容性插件 -->	
+<!--[if lt IE 9]>
+	<link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/css/bootstrap-ie6.min.css"> 
+	<link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/css/ie.css">
+	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/html5shiv-3.7.3/dist/html5shiv.min.js"></script>
+	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/Respond-master/dest/respond.min.js"></script>
+<![endif]-->
+	
+</head>
+<body>
+
+<!-- 申请器械包、申请一次性物品、申请消毒物品   表单 begin-->
+<!-- <div class="content-modal-tousse modal fade  bs-example-modal-lg" id="tousseModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" > -->
+<!--   <div class="modal-dialog modal-lg" role="document"> -->
+	<input class="form-input content-modal-tousse-body-input form-control" readonly id="showForm" type="hidden">  
+   <!--  <div class="modal-content"> -->
+   <div id = "modalContent">
+      <div class="content-modal-tousse-header modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="application_title"></h4>
+      </div>
+      
+      <div class="content-modal-tousse-body modal-body" id="form-body">
+        	<form class="form-horizontal" id="tousseAppForm">
+				<div class="panel panel-default">
+				  <div class="panel-heading"><span class="content-modal-tousse-body-title glyphicon glyphicon-arrow-right">&nbsp;</span>基础信息</div>
+				</div>
+        		<div class="form-group">
+        		
+        		<!-- 隐藏域 begin -->
+        			<input class="form-input content-modal-tousse-body-input form-control" readonly id="applicantCode" type="hidden">
+        			<input class="form-input content-modal-tousse-body-input form-control" readonly id="id" type="hidden">
+        		<!-- 隐藏域 end -->
+        			<label for="serialNumber" class="content-modal-tousse-body-label label-control s21-col-xs-s1 s21-col-xs-offset-1"><small>流水号：</small></label>
+        			<div class="s21-col-xs-4">
+        				<input type="text" class="form-input content-modal-tousse-body-input form-control" readonly id="serialNumber">
+        			</div>
+        			<label for="applicant" class="content-modal-tousse-body-label label-control s21-col-xs-s1"><small>申请人：</small></label>
+        			<div class="s21-col-xs-4">
+        				<input type="text" class="form-input content-modal-tousse-body-input form-control" readonly id="applicant">
+        			</div>
+        			<label id="time_label" for="time" class="content-modal-tousse-body-label label-control s21-col-xs-s1"><small>时间：</small></label>
+        			<div class="s21-col-xs-4">
+        				<input type="text" class="form-input content-modal-tousse-body-input form-control" readonly id="time">
+        			</div>
+        		</div>
+			
+        		<div class="form-group">
+        			<label for="departApp" id="departApp_tousse_label" class="content-modal-tousse-body-label label-control s21-col-xs-s1 s21-col-xs-offset-1"><small>申请科室：</small></label>
+        			<div class="s21-col-xs-4">
+        				<select class="form-input content-modal-tousse-body-input form-control"  id="departApp_tousse" multiple="multiple"></select>
+        			</div>
+        			<label for="settleDep" id="settleDep_tousse_label" class="content-modal-tousse-body-label label-control s21-col-xs-s1" id="settleDep_tousse_label"><small>结算科室：</small></label>
+        			<div class="s21-col-xs-4">
+        				<select class="form-input content-modal-tousse-body-input form-control"  id="settleDep_tousse" multiple="multiple"></select>
+        			</div>
+        			<label for="handleDep" id="handleDep_tousse_label" class="content-modal-tousse-body-label label-control s21-col-xs-s1"><small>处理科室：</small></label>
+        			<div class="s21-col-xs-4">
+        				<select class="form-input content-modal-tousse-body-input form-control"  id="handleDep_tousse"></select>
+        			</div>
+        		</div>
+        		<div class="form-group">
+        			<label for="remarks" class="content-modal-tousse-body-label label-control s21-col-xs-s1  s21-col-xs-offset-1"><small>备注：</small></label>
+        			<div class="s21-col-xs-16">
+        				<textarea  id="remarks" class="content-modal-tousse-body-textarea form-control" rows="2"></textarea>
+        			</div>
+        		</div>
+        	<div class="panel panel-default">
+				  <div class="panel-heading"><span class="content-modal-tousse-body-title glyphicon glyphicon-arrow-right">&nbsp;</span>申请物品信息</div>
+			</div>
+			
+        		<div class="form-group" id="tousse_table_toolbar">
+        			<label id="tousseName_tousse_select_label" for="settleDep" class="label-control s21-col-xs-s1  s21-col-xs-offset-1"><small>物品名称：</small></label>
+        			<div class="s21-col-xs-4">
+        				<select class="form-input form-control"  id="tousseName_tousse_select" multiple="multiple" ></select>
+        			</div>
+        			<label for="handleDep" class="content-modal-tousse-body-label label-control s21-col-xs-s1"><small>数量：</small></label>
+        			<div id="tousseName_tousse_num" class="spinner s21-col-xs-3">  
+					  	
+					</div>
+        			
+        			<div class="s21-col-xs-4  s21-col-xs-offset-1">
+        				<button type="button" class="dx-btn-primary dx-btn-sm" id="tousseAdd"><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="tousse_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>
+        	</form>
+      </div>
+      <div class="content-modal-tousse-modal-footer col-xs-offset-3" id="modal-footer">
+      	 <button type="button" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm hideStatus" id="tousseAppPrintPreview">打印预览</button>
+      	  <button type="button" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm hideStatus" id="tousseAppPrint">打印</button>
+        <button type="button" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm" id="tousseSubmit">提交</button>
+        <button type="button" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm" id="tousseSubmitAndNewForm">提交并新建</button>
+        <button type="button" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm hideStatus" id="tousseAppReturnEdit">返回修改</button>
+        <button type="button" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm" id="tousseTemStorage">暂存</button>
+        <button type="button" class="content-modal-tousse-footer-close dx-btn-primary dx-btn-sm"  id="tousseCancel">取消</button>
+        <button type="button" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm hideStatus" id="tousseAppEndTousse">终止选中的物品</button>
+      </div>
+   </div>
+<!--   </div> -->
+<!-- </div> -->
+<!--申请器械包、申请一次性物品、申请消毒物品  end-->
+	
+
+<!-- jquery 1.9.1 -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/jquery-1.9.1/js/jquery-1.9.1.js"></script>
+
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/js/bootstrap-ie.js"></script>
+
+<!-- bootstrap -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
+
+<!-- bootstrap table -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table-zh-CN.js"></script>
+
+<!-- bootstrap select  -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-select/dist/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-select/dist/js/defaults-zh_CN.min.js"></script>
+
+<!-- select2 -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/dist/js/select2.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/dist/js/zh-CN.js"></script>
+
+<!-- x-editable-develop -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/dist/bootstrap3-editable/js/bootstrap-editable.min.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/extensions/editable/bootstrap-table-editable.min.js"></script>
+  
+<%-- bootstrap-datetimepicker --%>
+<script language="javascript" type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.js"></script>
+
+<!-- bootbox -->							
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootbox/bootbox.min.js"></script>
+
+<!-- SSTS--工具JS -->							
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/common/common-tools.js"></script>
+
+<!-- SSTS--批量处理工具JS -->								
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/common/common-handler.js"></script>
+
+<!-- 常量 -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/common/constants.js"></script>
+
+<!-- 引入自身js -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js"></script>
+
+<!-- customer-时间增减框 -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/customer/spinner/spinner.js"></script>
+<!-- customer-表单验证 -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/customer/s-validate/s-validate.js"></script>
+
+
+</body>
+<!--     <script type="text/javascript">
+   	 var WWWROOT = '${basePath}';
+    </script> -->
+</html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/common/dingxiang-common.css
===================================================================
diff -u -r24551 -r24683
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/common/dingxiang-common.css	(.../dingxiang-common.css)	(revision 24551)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/common/dingxiang-common.css	(.../dingxiang-common.css)	(revision 24683)
@@ -4,7 +4,7 @@
   background-color: #73B043;
   border-color: #73B043;
   font-weight: 300;
-  font-size: 16px;
+  /* font-size: 16px; */
   font-family: "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
   text-decoration: none;
   text-align: center;
@@ -29,15 +29,15 @@
   background-color: #73B043;
   border-color: #EEE;
   font-weight: 400;
-  font-size: 14px;
+/*   font-size: 14px; */
   text-decoration: none;
   text-align: center;
   line-height: 26px;
-  
+
   height: 34px;
   padding: 0 10px;
   margin: 0;
-  margin-left: 10px;
+ /* margin-left: 10px; */
   display: inline-block;
   appearance: none;
   cursor: pointer;