Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp
===================================================================
diff -u -r25017 -r25060
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp	(.../tousseModal.jsp)	(revision 25017)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp	(.../tousseModal.jsp)	(revision 25060)
@@ -63,11 +63,11 @@
         			<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>
+        			<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>
+        			<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>
@@ -102,7 +102,7 @@
 			</div> -->
 				<h4 class="title-font-sub"><i></i>申请物品信息</h4>
         		<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>
+        			<label id="tousseName_tousse_select_label" for="settleDep" 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 form-control"  id="tousseName_tousse_select" multiple="multiple" ></select>
         			</div>
@@ -146,40 +146,40 @@
 				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>基础信息</div>
 				</div> -->
         	<div class="form-group form-group2">
-        			<label for="serialNumber" class="label-control s21-col-xs-s1"><small>流水号：</small></label>
+        			<label for="serialNumber" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>流水号：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control" readonly id="serialNumber">
         			</div>
-        			<label for="applicant" class="label-control s21-col-xs-s1"><small>申请人：</small></label>
+        			<label for="applicant" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>申请人：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control" readonly id="applicant">
         			</div>
-        			<label for="time" class="label-control s21-col-xs-s1"><small>申请时间：</small></label>
+        			<label for="time" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>申请时间：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control" readonly id="time">
         			</div>
         			
-        			<label for="time" class="label-control s21-col-xs-s1"><small>申请科室：</small></label>
+        			<label for="time" class="content-modal-tousse-body-label label-control s21-col-xs-s1"><small>申请科室：</small></label>
         			<div class="s21-col-xs-3">
         				<select class="form-input  form-control"  id="foreignTousse_appDep" multiple="multiple"></select>
         			</div>
         		</div>
 
         		<div class="form-group form-group2">
-        			<label for="departApp" class="label-control s21-col-xs-s1"><small>结算科室：</small></label>
+        			<label for="departApp" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>结算科室：</small></label>
         			<div class="s21-col-xs-3">
         				<select class="form-input  form-control"  id="foreignTousse_settleDep" multiple="multiple"></select>
         			</div>
-        			<label for="settleDep" class="label-control s21-col-xs-s1" ><small>处理科室：</small></label>
+        			<label for="settleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1" ><small>处理科室：</small></label>
         			<div class="s21-col-xs-3">
         				<select class="form-input  form-control"  id="foreignTousse_handleDep" ></select>
         			</div>
         			
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>处理方式：</small></label>
+        			<label for="handleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>处理方式：</small></label>
         			<div class="s21-col-xs-3">
         				<select class="form-input  form-control"  id="foreignTousse_handleMethod" multiple="multiple"></select>
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>住院号：</small></label>
+        			<label for="handleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>住院号：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_hospitalNumber">
         			</div>
@@ -190,58 +190,58 @@
 				</div> -->
         		 <div class="form-group form-group2">
         			
-        			<label for="departApp" class="label-control s21-col-xs-s1"><small>诊疗号：</small></label>
+        			<label for="departApp" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>诊疗号：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_clinicNumber">
         			</div>
-        			<label for="settleDep" class="label-control s21-col-xs-s1"><small>病人姓名：</small></label>
+        			<label for="settleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>病人姓名：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_patient">
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>病区：</small></label>
+        			<label for="handleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>病区：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_patientArea">
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>病室：</small></label>
+        			<label for="handleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>病室：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_roomNumber">
         			</div>
         		</div>
         		
         		<div class="form-group form-group2">
         			
-        			<label for="departApp" class="label-control s21-col-xs-s1"><small>床位：</small></label>
+        			<label for="departApp" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>床位：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_bedNumber">
         			</div>
-        			<label for="settleDep" class="label-control s21-col-xs-s1"><small>年龄：</small></label>
+        			<label for="settleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>年龄：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_patientAge">
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>性别：</small></label>
+        			<label for="handleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>性别：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_patientSex">
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>病人所属科室：</small></label>
+        			<label for="handleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>病人所属科室：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_ascriptionDepartment">
         			</div>
         		</div>
         		
         		<div class="form-group form-group2">
-        			<label for="departApp" class="label-control s21-col-xs-s1"><small>手术名称：</small></label>
+        			<label for="departApp" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>手术名称：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_surgery">
         			</div>
-        			<label for="operaTime" class="label-control s21-col-xs-s1"><small>手术时间：</small></label>
+        			<label for="operaTime" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>手术时间：</small></label>
         			<div class="s21-col-xs-3 has-feedback">
         				<input type="text" class="form-input form-control" readonly placeholder="请选择时间"  id="foreignTousse_operationTime">
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>医生：</small></label>
+        			<label for="handleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>医生：</small></label>
         			<div class="s21-col-xs-3">
         				<select class="form-input  form-control"  id="foreignTousse_doctor" multiple="multiple"></select>
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>手术间：</small></label>
+        			<label for="handleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>手术间：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignTousse_operationRoom">
         			</div>
@@ -251,7 +251,7 @@
         		</div>
 				
         		<div class="form-group form-group2">
-        			<label for="foreignTousse_remark" class="label-control s21-col-xs-s1"><small>备注：</small></label>
+        			<label for="foreignTousse_remark" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>备注：</small></label>
         			<div class="s21-col-xs-18">
         				<textarea  id="foreignTousse_remark" class="form-control" rows="2"></textarea>
         			</div>
@@ -261,11 +261,11 @@
 				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>物品及供应商信息</div>
 				</div> -->
         		<div class="form-group form-group2">
-        			<label for="foreignTousse_name" class="label-control s21-col-xs-s1"><small>器械包名称：</small></label>
+        			<label for="foreignTousse_name" 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  form-control"  id="foreignTousse_foreignTousseName" multiple="multiple"></select>
         			</div>
-        			<label for="foreignTousse_supplier" class="label-control s21-col-xs-s1"><small>供应商：</small></label>
+        			<label for="foreignTousse_supplier" 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  form-control"  id="foreignTousse_suppler" multiple="multiple"></select>
         			</div>
@@ -278,11 +278,11 @@
         		</div>
         		
         		<div class="form-group form-group2">
-					<label for="foreignTousse_supplier_contact" class="label-control s21-col-xs-s1 "><small>供应商联系人：</small></label>
+					<label for="foreignTousse_supplier_contact" 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  form-control"  id="foreignTousse_supplierContactName" multiple="multiple"></select>
         			</div>
-        			<label for="settleDep" class="label-control s21-col-xs-s1"><small>联系电话：</small></label>
+        			<label for="settleDep" 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 form-control"  id="foreignTousse_supplierPhoneNumber">
         			</div>
@@ -320,26 +320,26 @@
 				  <!-- <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>基础信息</div> -->
 				<!-- </div> -->
         		<div class="form-group">
-        			<label for="serialNumber" class="label-control s21-col-xs-s1 s21-col-xs-offset-1"><small>申请人：</small></label>
+        			<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 form-control" readonly id="serialNumber">
         			</div>
-        			<label for="applicant" class="label-control s21-col-xs-s1"><small>申请时间：</small></label>
+        			<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 form-control" readonly id="applicant">
         			</div>
-        			<label for="customizeTousse_appDpt" class="label-control s21-col-xs-s1"><small>申请科室：</small></label>
+        			<label for="customizeTousse_appDpt" 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  form-control"  id="customizeTousse_appDpt" multiple="multiple"></select>
         			</div>
         		</div>
 
         		<div class="form-group">
-        			<label for="customizeTousse_settleDpt" class="label-control s21-col-xs-s1 s21-col-xs-offset-1"><small>结算科室：</small></label>
+        			<label for="customizeTousse_settleDpt" 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  form-control"  id="customizeTousse_settleDpt" multiple="multiple"></select>
         			</div>
-        			<label for="customizeTousse_urgency" class="label-control s21-col-xs-s1"><small>紧急度：</small></label>
+        			<label for="customizeTousse_urgency" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>紧急度：</small></label>
         			<div class="s21-col-xs-4">
         				<select class="form-control"  id="customizeTousse_urgency">
         					<option>紧急</option>
@@ -349,7 +349,7 @@
         		</div>
         		
         		<div class="form-group">
-        			<label for="remarks" class="label-control s21-col-xs-s1  s21-col-xs-offset-1"><small>备注：</small></label>
+        			<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="customizeTousseRemarks" class="form-control" rows="2"></textarea>
         			</div>
@@ -359,24 +359,24 @@
 				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>申请物品/材料信息</div>
 				</div> -->
         		<div class="form-group">
-        			<label for="customizeTousseTousseDatalist" class="label-control s21-col-xs-s1  s21-col-xs-offset-1"><small>器械包名称：</small></label>
+        			<label for="customizeTousseTousseDatalist" class="content-modal-tousse-body-label  label-control s21-col-xs-s1  s21-col-xs-offset-1"><small>器械包名称：</small></label>
         			<div id="customizeTousseTousseDatalist" class="s21-col-xs-4" style="position:relative;">
 							<select id="customizeTousseNameSelect" class="form-input  form-control" style="" onchange="document.getElementById('customizeTousse_tousse_name').value=this.value"> 
 							</select> 
 							<input id="customizeTousseName" name="input" class="form-input2 form-control"  style="position:absolute;left:1px;top:2px;border-bottom:0px;border-right:0px;border-left:0px;border-top:0px;"> 
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>数量：</small></label>
+        			<label for="handleDep" 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 form-control"  id="customizeTousse_tousse_num">
         			</div>
         		</div>
         		
         		<div class="form-group">
-        			<label for="customizeTousse_material_name" class="label-control s21-col-xs-s1  s21-col-xs-offset-1"><small>材料名称：</small></label>
+        			<label for="customizeTousse_material_name" 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  form-control"  id="customizeTousseMaterialName" multiple="multiple"></select>
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>数量：</small></label>
+        			<label for="handleDep" 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 form-control"  id="customizeTousse_material_num">
         			</div>
@@ -413,33 +413,33 @@
 				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>基础信息</div>
 				</div>
         		<div class="form-group">
-        			<label for="foreignProxyDisinfection_appDept" class="label-control s21-col-xs-s1 s21-col-xs-offset-1"><small>申请科室：</small></label>
+        			<label for="foreignProxyDisinfection_appDept" 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="foreignProxyDisinfection_appDept" multiple="multiple"></select>
         			</div>
-        			<label for="applicant" class="label-control s21-col-xs-s1"><small>结算科室：</small></label>
+        			<label for="applicant" 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="foreignProxyDisinfection_settleDept" multiple="multiple"></select>
         			</div>
-        			<label for="time" class="label-control s21-col-xs-s1"><small>处理科室：</small></label>
+        			<label for="time" 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="foreignProxyDisinfection_handleDept" multiple="multiple"></select>
         			</div>
         		</div>
 
         		<div class="form-group">
-        			<label for="departApp" class="label-control s21-col-xs-s1 s21-col-xs-offset-1"><small>申请人：</small></label>
+        			<label for="departApp" 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 form-control"  id="departApp">
         			</div>
-        			<label for="settleDep" class="label-control s21-col-xs-s1"><small>申请时间：</small></label>
+        			<label for="settleDep" 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 form-control"  id="settleDep">
         			</div>
         		</div>
         		
         		<div class="form-group">
-        			<label for="remarks" class="label-control s21-col-xs-s1  s21-col-xs-offset-1"><small>备注：</small></label>
+        			<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="form-control" rows="2"></textarea>
         			</div>
@@ -449,19 +449,19 @@
 				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>申请物品信息</div>
 				</div>
         		<div class="form-group">
-        			<label for="departApp" class="label-control s21-col-xs-s1"><small>物品名称：</small></label>
+        			<label for="departApp" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>物品名称：</small></label>
         			<div class="s21-col-xs-3">
         				<select class="form-input content-modal-tousse-body-input form-control"  id="foreignProxyDisinfection_tousse_name" multiple="multiple"></select>
         			</div>
-        			<label for="settleDep" class="label-control s21-col-xs-s1"><small>包装类型：</small></label>
+        			<label for="settleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>包装类型：</small></label>
         			<div class="s21-col-xs-3">
         				<select class="form-input content-modal-tousse-body-input form-control"  id="foreignProxyDisinfection_package_type" multiple="multiple"></select>
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>灭菌程序：</small></label>
+        			<label for="handleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>灭菌程序：</small></label>
         			<div class="s21-col-xs-3">
         				<select class="form-input content-modal-tousse-body-input form-control"  id="foreignProxyDisinfection_procedure" multiple="multiple"></select>
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>数量：</small></label>
+        			<label for="handleDep" class="content-modal-tousse-body-label  label-control s21-col-xs-s1"><small>数量：</small></label>
         			<div class="s21-col-xs-3">
         				<input type="text" class="form-input form-control"  id="foreignProxyDisinfection_num">
         			</div>
@@ -496,37 +496,37 @@
 				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>基础信息</div>
 			</div>
         		<div class="form-group">
-        			<label for="serialNumber" class="label-control s21-col-xs-s1 s21-col-xs-offset-1"><small>流水号：</small></label>
+        			<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 form-control" readonly id="serialNumber">
         			</div>
-        			<label for="applicant" class="label-control s21-col-xs-s1"><small>申请人：</small></label>
+        			<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 form-control" readonly id="applicant">
         			</div>
-        			<label for="time" class="label-control s21-col-xs-s1"><small>申请时间：</small></label>
+        			<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 form-control" readonly id="time">
         			</div>
         		</div>
 
         		<div class="form-group">
-        			<label for="borrowTousse_appDept" class="label-control s21-col-xs-s1 s21-col-xs-offset-1"><small>申请科室：</small></label>
+        			<label for="borrowTousse_appDept" 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="borrowTousse_appDept" multiple="multiple"></select>
         			</div>
-        			<label for="borrowTousse_settleDept" class="label-control s21-col-xs-s1"><small>结算科室：</small></label>
+        			<label for="borrowTousse_settleDept" 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="borrowTousse_settleDept" multiple="multiple"></select>
         			</div>
-        			<label for="borrowTousse_handleDept" class="label-control s21-col-xs-s1"><small>处理科室：</small></label>
+        			<label for="borrowTousse_handleDept" 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="borrowTousse_handleDept" multiple="multiple"></select>
         			</div>
         		</div>
         		
         		<div class="form-group">
-        			<label for="remarks" class="label-control s21-col-xs-s1  s21-col-xs-offset-1"><small>备注：</small></label>
+        			<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="form-control" rows="2"></textarea>
         			</div>
@@ -535,11 +535,11 @@
 				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>申请物品信息</div>
 				</div>
         		<div class="form-group">
-        			<label for="borrowTousse_tousse_name" class="label-control s21-col-xs-s1  s21-col-xs-offset-1"><small>器械包名称：</small></label>
+        			<label for="borrowTousse_tousse_name" 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="borrowTousse_tousse_name" multiple="multiple"></select>
         			</div>
-        			<label for="handleDep" class="label-control s21-col-xs-s1"><small>数量：</small></label>
+        			<label for="handleDep" 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 form-control"  id="handleDep">
         			</div>
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r24999 -r25060
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 24999)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView-2.jsp)	(revision 25060)
@@ -8,23 +8,17 @@
 <%@ include file="/dx-disinfectsystem/pages/disinfectsystem/commons/tagLibsPath.jsp"%>
 <title>JSP模板</title>
 
-    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css" type="text/css"/>
-    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/libs/dropkick.css" type="text/css"/>
-    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/libs/enhancementpager.css" type="text/css"/>
-    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.pager.css"type="text/css"/>
-    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/css/smoothness/jquery-ui-1.11.3.custom.css" type="text/css"/>
-    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/examples/examples.css"type="text/css"/>
-    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.columnpicker.css"type="text/css"/>
+ <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css" type="text/css"/>
+ <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/libs/dropkick.css" type="text/css"/>
+ <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/libs/enhancementpager.css" type="text/css"/>
+ <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.pager.css"type="text/css"/>
+ <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/css/smoothness/jquery-ui-1.11.3.custom.css" type="text/css"/>
+ <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/examples/examples.css"type="text/css"/>
+ <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.columnpicker.css"type="text/css"/>
 
-
 <!-- 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 --%>
@@ -35,9 +29,8 @@
 <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">
-<!-- slick.grid -->
-<%-- <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid-master/slick.grid.css" type="text/css"/>
- --%><!-- IE兼容性插件 -->	
+
+<!-- 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">
@@ -56,14 +49,15 @@
 	</div> -->
 	<div class="content-toolbar-container">	
 		<div class="content-toolbar btn-group">
+			
 			<button class="content-toolbar-btn dx-btn-primary dx-btn-lg" id="app_tousses"><span class="glyphicon glyphicon-list-alt">&nbsp;</span>申请器械包</button> 
 			<button class="content-toolbar-btn dx-btn-primary dx-btn-lg" id="app_disposable"><span class="glyphicon glyphicon-list-alt">&nbsp;</span>申请一次性物品</button>
 			<button class="content-toolbar-btn dx-btn-primary dx-btn-lg" id="app_disinfection"><span class="glyphicon glyphicon-list-alt">&nbsp;</span>申请消毒物品</button>
 			<!-- simon 其他改造页面入口 -->
 			<a href="${basePath}/dx-disinfectsystem/pages/disinfectsystem/basedatamanager/supplyroomtype/simonT.jsp">.</a>
 		</div>
 		<div class="btn-group">
-			  <button type="button" class="btn btn-default dropdown-toggle dx-btn-primary dx-btn-lg content-toolbar-btn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+			  <button type="button" class=" content-toolbar-btn dropdown-toggle dx-btn-primary dx-btn-lg content-toolbar-btn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 			    更多申请 <span class="caret"></span>
 			  </button>
 			  <ul class="dropdown-menu">
@@ -130,16 +124,11 @@
 			<button type="button" class="content-search-btn dx-btn-primary dx-btn-sm " id="search_more_btn">更多查询</button>
 		</div>	
 	</div>	
-		
-			
-
 </div>
+
 <div class = "cont">
-	<div id="main" class="content-table table-container">	
-			<!--<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>
-		
-	<div id="page" class="page-footer"></div>
+	<div id="main" class="content-table table-container"></div>
+	<div id="page" class="click-page-footer"></div>
 </div> 
 
 <!--更多查询   表单 begin-->
@@ -188,7 +177,6 @@
         			</div>
         		</div>
         		
-        		
         		<div class="form-group">
         			<label for="search_more_tousse_group" class="search-more-body-label label-control s21-col-xs-s1  s21-col-xs-offset-3"><small>器械包分组(?)：</small></label>
         			<div class="s21-col-xs-4">
@@ -276,13 +264,14 @@
         <button type="button" class="content-modal-tousse-footer-close dx-btn-primary dx-btn-sm">重置</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/jquery-1.9.1/js/jquery-migrate-1.1.1.js"></script>
 <!--jquery event -->
 <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery.event.drag-2.3.0.js"></script>
 
@@ -329,38 +318,29 @@
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/customer/s-validate/s-validate.js"></script>
 
 
-
-<!-- slick.grid -->
-
-<!-- slick.grid 使支持formatter功能 -->
-<!--  slick.grid 使支持单元格编辑功能 -->
-<!-- slick.grid 使支持行内容被选功能 -->
-
-<!-- slick.grid使支持父子表 -->
-
-    <!--add e-->
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/firebugx.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery-ui-1.11.3.min.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery-ui-1.8.16.custom.min.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery.jsonp-2.4.min.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.core.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.formatters.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.editors.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.rowselectionmodel.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.dataview.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.remotemodel.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.pager.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.columnpicker.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.checkboxselectcolumn.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.autotooltips.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellrangedecorator.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellrangeselector.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellcopymanager.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellselectionmodel.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.rowselectionmodel.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/libs/jquery.dropkick-1.0.0.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.grid.js"></script>
+ <!--slick-grid -->
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/firebugx.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery-ui-1.11.3.min.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery-ui-1.8.16.custom.min.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery.event.drag-2.3.0.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery.jsonp-2.4.min.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.core.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.formatters.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.editors.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.rowselectionmodel.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.dataview.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.remotemodel.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.pager.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.columnpicker.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.checkboxselectcolumn.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.autotooltips.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellrangedecorator.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellrangeselector.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellcopymanager.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellselectionmodel.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.rowselectionmodel.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js"></script>
+ <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.grid.js"></script>
     
  <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/s-page.js"></script>      
   
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r24999 -r25060
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 24999)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 25060)
@@ -15,8 +15,8 @@
     <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/css/smoothness/jquery-ui-1.11.3.custom.css" type="text/css"/>
     <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/examples/examples.css"type="text/css"/>
     <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.columnpicker.css"type="text/css"/>
+	
 
-
 <!-- bootstrap -->
 <link rel="stylesheet"href="${basePath}/dx-disinfectsystem/plugins/bootstrap-3.3.7-dist/css/bootstrap.min.css">
 <!-- x-editable-develop -->
@@ -44,7 +44,6 @@
 	<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>
 	
@@ -59,7 +58,7 @@
 			<button class="content-toolbar-btn dx-btn-primary dx-btn-lg" id="app_tousses"><span class="glyphicon glyphicon-list-alt">&nbsp;</span>申请器械包</button> 
 			<button class="content-toolbar-btn dx-btn-primary dx-btn-lg" id="app_disposable"><span class="glyphicon glyphicon-list-alt">&nbsp;</span>申请一次性物品</button>
 			<button class="content-toolbar-btn dx-btn-primary dx-btn-lg" id="app_disinfection"><span class="glyphicon glyphicon-list-alt">&nbsp;</span>申请消毒物品</button>
-			<!-- simon 其他改造页面入口 -->
+			<!-- simon-test 其他改造页面入口 -->
 			<a href="${basePath}/dx-disinfectsystem/pages/disinfectsystem/basedatamanager/supplyroomtype/simonT.jsp">.</a>
 		</div>
 		<div class="btn-group">
@@ -130,18 +129,21 @@
 			<button type="button" class="content-search-btn dx-btn-primary dx-btn-sm " id="search_more_btn">更多查询</button>
 		</div>	
 	</div>	
-		
-			
-
 </div>
+
 <div class = "cont">
-	<div id="main" class="content-table table-container">	
-			<!--<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>
-		
+	<div id="main" class="content-table table-container"></div>
 	<div id="page" class="page-footer"></div>
-</div> 
+</div>
 
+
+<!--悬浮框-->
+ <div id = "applicationDetails" class = "application_details_hide">
+	<table id="applicationDetailsTable" class="table table-striped table-bordered table-hover application_details_table">
+	 	<tr id="applicationDetailsTableTh"><th>物品名称</th><th>申请数量</th><th>回收数量</th><th>装配数量</th><th>灭菌数量</th><th>发货数量</th></tr>
+	</table>
+</div>
+
 <!--更多查询   表单 begin-->
 <div class="search-more-modal modal fade  bs-example-modal-lg" id="search_more_modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" >
   <div class="modal-dialog modal-lg" role="document">
@@ -358,7 +360,6 @@
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellcopymanager.js"></script>
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellselectionmodel.js"></script>
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.rowselectionmodel.js"></script>
-    <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/libs/jquery.dropkick-1.0.0.js"></script>
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js"></script>
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.grid.js"></script>