Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r24931 -r24999
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 24931)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 24999)
@@ -74,7 +74,7 @@
 			  </ul>
 		</div>
 		<div id="toolbar_table" class="content-table-top-toolbar s-row btn-group">
-			<button class="content-table-top-toolbar-btn dx-btn-primary dx-btn-lg" id=""><span class="glyphicon glyphicon-list-alt">&nbsp;</span><span>删除</span></button>
+			<button class="content-table-top-toolbar-btn dx-btn-primary dx-btn-lg" id=""><span class="glyphicon glyphicon-list-alt">&nbsp;</span>删除</button>
 			<button class="content-table-top-toolbar-btn dx-btn-primary dx-btn-lg" id=""><span class="glyphicon glyphicon-list-alt">&nbsp;</span>终止</button>
 			<button class="content-table-top-toolbar-btn dx-btn-primary dx-btn-lg" id=""><span class="glyphicon glyphicon-list-alt">&nbsp;</span>打印回收清点单</button>
 			<button class="content-table-top-toolbar-btn dx-btn-primary dx-btn-lg" id=""><span class="glyphicon glyphicon-list-alt">&nbsp;</span>设为已打印</button>
@@ -141,16 +141,7 @@
 		
 	<div id="page" class="page-footer"></div>
 </div> 
-<!-- 申请器械包、申请一次性物品、申请消毒物品   表单 begin-->
 
- <div id = "applicationDetails" class = "application_details_show">
-  		<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">
@@ -373,6 +364,8 @@
     
  <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/s-page.js"></script>      
   
+ <!-- 科室申领模块公共js -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/applicationUtils.js"></script>
 <!-- 引入自身js -->
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js"></script>
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp
===================================================================
diff -u -r24933 -r24999
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp	(.../tousseModal.jsp)	(revision 24933)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp	(.../tousseModal.jsp)	(revision 24999)
@@ -59,11 +59,8 @@
       
       <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>
+        		<h4 class="title-font-sub"><i></i>基础信息</h4>
         		<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">
@@ -102,10 +99,10 @@
         				<textarea  id="remarks" class="content-modal-tousse-body-textarea form-control" rows="2"></textarea>
         			</div>
         		</div>
-        	<div class="panel panel-default">
+        	<!-- <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> -->
+				<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>
         			<div class="s21-col-xs-4">
@@ -121,9 +118,10 @@
         			</div>
         		</div>
         		       
-        	<!-- <div class="tousse_table1" id="table"> -->
-        			<div id="tousse_table" class = "tousse_table"></div>
-        	<!-- </div> -->
+        	<!-- <div class="tousse_table1" id="table">-->
+        			<div id="tousse_table" class = "tousse_table"></div> 
+        			<!-- <div id="fuck" class = "tousse_table"></div>	
+        	 </div> -->
         	</form>
       </div>
       <div class="content-modal-tousse-modal-footer col-xs-offset-3" id="modal-footer">
@@ -157,7 +155,7 @@
 				<!-- <div class="panel panel-default">
 				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>基础信息</div>
 				</div> -->
-        		<div class="form-group form-group2">
+        	<div class="form-group form-group2">
         			<label for="serialNumber" class="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">
@@ -200,7 +198,7 @@
         		<!-- <div class="panel panel-default">
 				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>病人信息</div>
 				</div> -->
-        		<div class="form-group form-group2">
+        		 <div class="form-group form-group2">
         			
         			<label for="departApp" class="label-control s21-col-xs-s1"><small>诊疗号：</small></label>
         			<div class="s21-col-xs-3">
@@ -267,19 +265,19 @@
         			<div class="s21-col-xs-18">
         				<textarea  id="foreignTousse_remark" class="form-control" rows="2"></textarea>
         			</div>
-        		</div>
+        		</div> 
         		
         		<!-- <div class="panel panel-default">
 				  <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>
         			<div class="s21-col-xs-4">
-        				<select class="form-input  form-control"  id="foreignTousse_foreignTousseName1" multiple="multiple"></select>
+        				<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>
         			<div class="s21-col-xs-4">
-        				<select class="form-input  form-control"  id="foreignTousse_suppler1" multiple="multiple"></select>
+        				<select class="form-input  form-control"  id="foreignTousse_suppler" multiple="multiple"></select>
         			</div>
         			<div class="s21-col-xs-6">
         				<span>工具：0件，植入物：0件，共0件</span>
@@ -298,10 +296,11 @@
         			<div class="s21-col-xs-4">
         				<input type="text" class="form-input form-control"  id="foreignTousse_supplierPhoneNumber">
         			</div>
-				</div>
-        		
-        		<div id="foreignApplicationTable" class = "foreign_application_table"></div>	
-        	
+				</div> 
+        	<!-- 	<div id="foreignApplicationTable" style="height:20px;" class = "foreign_application_table"></div>	 -->
+        	<!-- <div style="width:800px;"> -->
+        		 <div id="foreignApplicationTable" class = "foreign_application_table"></div>
+            <!-- </div> -->	
         	</form>
       </div>
        <div class="content-modal-tousse-modal-footer col-xs-offset-3" id="modal-footer">
@@ -312,10 +311,7 @@
         <button type="button" class="content-modal-tousse-footer-close dx-btn-primary dx-btn-sm" 	id="foreignTousseCancel">取消</button>
       </div>
       </div>
-<!--     </div>
-    
-  </div>
-</div> -->
+
 <!--申请外来器械  end-->
 
 
@@ -329,9 +325,10 @@
       </div>
       <div class="modal-body" id="form-body">
         	<form class="form-horizontal">
-				<div class="panel panel-default">
-				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>基础信息</div>
-				</div>
+				<!-- <div class="panel panel-default"> -->
+				  <h4 class="title-font-sub"><i></i>基础信息</h4>
+				  <!-- <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>
         			<div class="s21-col-xs-4">
@@ -354,29 +351,29 @@
         			</div>
         			<label for="customizeTousse_urgency" class="label-control s21-col-xs-s1"><small>紧急度：</small></label>
         			<div class="s21-col-xs-4">
-        				<select class="form-input  form-control"  id="customizeTousse_urgency" multiple="multiple"></select>
+        				<select class="form-control"  id="customizeTousse_urgency">
+        					<option>紧急</option>
+        					<option>普通</option>
+        				</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>
         			<div class="s21-col-xs-16">
-        				<textarea  id="remarks" class="form-control" rows="2"></textarea>
+        				<textarea  id="customizeTousseRemarks" class="form-control" rows="2"></textarea>
         			</div>
         		</div>
-        		<div class="panel panel-default">
+        		<h4 class="title-font-sub"><i></i>申请物品/材料信息</h4>
+        		<!-- <div class="panel panel-default">
 				  <div class="panel-heading"><span class="glyphicon glyphicon-arrow-right">&nbsp;</span>申请物品/材料信息</div>
-				</div>
+				</div> -->
         		<div class="form-group">
         			<label for="customizeTousseTousseDatalist" class="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 class="form-input  form-control" style="" onchange="document.getElementById('customizeTousse_tousse_name').value=this.value"> 
-								<option value="A类">A类</option> 
-								<option value="B类">B类</option> 
-								<option value="C类">C类</option> 
-								<option value="D类">D类</option> 
+							<select id="customizeTousseNameSelect" class="form-input  form-control" style="" onchange="document.getElementById('customizeTousse_tousse_name').value=this.value"> 
 							</select> 
-							<input id="customizeTousse_tousse_name" 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;"> 
+							<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>
         			<div class="s21-col-xs-4">
@@ -387,7 +384,7 @@
         		<div class="form-group">
         			<label for="customizeTousse_material_name" 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="customizeTousse_material_name" multiple="multiple"></select>
+        				<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>
         			<div class="s21-col-xs-4">
@@ -397,15 +394,16 @@
         				<button type="button" class="dx-btn-primary dx-btn-sm" id="customizeTousse_add_tousse"><span class="glyphicon glyphicon-plus"></span>添加</button>
         			</div>
         		</div>
-        		<div id="customizeTousseTable" class = "foreign_application_table"></div>	
+        		<div id="customizeTousseTable" style="height:10px;" class = "foreign_application_table"></div>	
+        		<div id="fuck" class = "foreign_application_table"></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" data-dismiss="modal">提交</button>
-	        <button type="button" class="content-modal-tousse-footer-close dx-btn-primary dx-btn-sm">取消</button>
-	          <button type="button" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm">打印预览</button>
-	        <button type="button" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm" data-dismiss="modal">打印</button>
+	        <button type="button" id="customizeTousseSubmit" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm" data-dismiss="modal">提交</button>
+	        <button type="button" id="customizeTousseCancel" class="content-modal-tousse-footer-close dx-btn-primary dx-btn-sm">取消</button>
+	          <button type="button" id="customizeToussePrintPreview" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm">打印预览</button>
+	        <button type="button" id="customizeToussePrint" class="content-modal-tousse-footer-submit dx-btn-primary dx-btn-sm" data-dismiss="modal">打印</button>
       </div>
       
     </div>
@@ -481,7 +479,8 @@
         				<input type="text" class="form-input form-control"  id="foreignProxyDisinfection_num">
         			</div>
         		</div>
-        		<div id="foreignProxyDisinfectionTable" class = "foreignProxyDisinfection_table"></div>	
+        		<div id="foreignProxyDisinfectionTable" class = ""></div>	
+        		<div id="fuck" class = "tousse_table"></div>	
         	</form>
       </div>
       <div class="content-modal-tousse-modal-footer col-xs-offset-3" id="modal-footer">
@@ -562,15 +561,15 @@
         			</div>
         		</div>
         		<div id="borrowTousseTable" class = "borrowTousse_table"></div>
+        		<div id="fuck" class = "tousse_table"></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" data-dismiss="modal">提交</button>
 	        <button type="button" class="content-modal-tousse-footer-close dx-btn-primary dx-btn-sm">取消</button>
       </div>
     </div>
-<!--   </div>
-</div> -->
+
 <!--借物单 end-->
 
 
@@ -581,7 +580,7 @@
 <!-- jquery 1.9.1 -->
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/jquery-1.9.1/js/jquery-1.9.1.js"></script>
  <!--jquery event -->
-<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid-master/lib/jquery.event.drag-2.3.0.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery.event.drag-2.3.0.js"></script>
 
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/js/bootstrap-ie.js"></script>
 
@@ -626,7 +625,7 @@
 
     <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-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>
@@ -645,21 +644,24 @@
     <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/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>    
- 	  
+
+	 <!-- 科室申领模块公共js -->
+	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/applicationUtils.js"></script>
 	<!-- 引入自身js -->
-	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/applicationPublicMethod.js"></script>
-	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js"></script>
-	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/foreignTousseInfoForm.js"></script>
-	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/foreignProxyDisinfectionForm.js"></script>
+  	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js"></script>
+ 	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/foreignTousseInfoForm.js"></script>
+ 	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/foreignProxyDisinfectionForm.js"></script>
 	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/customTousseForm.js"></script>
-	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/borrowingTousseForm.js"></script>
+	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/recyclingApplication/borrowingTousseForm.js"></script> 
 	
+	
+	<script type="text/javascript">
+
+	
+	</script>
 </body>
-<!--     <script type="text/javascript">
-   	 var WWWROOT = '${basePath}';
-    </script> -->
+
 </html>
\ No newline at end of file