Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css
===================================================================
diff -u -r24915 -r24919
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css	(.../assemblyManagement.css)	(revision 24915)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css	(.../assemblyManagement.css)	(revision 24919)
@@ -4,6 +4,7 @@
 .slick-column-name input,.slick-cell input{
 	width:14px;
 }
+*{font-size:12px;}
 table tr{
 	height:30px !important;
 }
@@ -286,7 +287,10 @@
 }
 .assembly-task-middlefoot-form .setInputH input,.assembly-task-middlefoot-form .setInputH select{
     width:100%;
-    height:31px;
+    height:26px;
+    padding-top:0;
+    padding-bottom:0;
+    font-size: 12px; 
 }
 .assembly-task-right{
     padding-left: 0;
@@ -412,6 +416,8 @@
 .spinner input {
   height:23px;
   text-align: right;
+  padding-top:0;
+  padding-bottom:0;
 }
 .input-group-btn-vertical {
   position: relative;
@@ -478,13 +484,17 @@
 .melt div{
     position: absolute;
     top: 0px;
-    right: -1px;
+    right: -2px;
     width: 20px;
     z-index: 10;
 }
 .melt .btn{
-	padding: 7px 8px;
+	padding: 5px 8px 6px 8px;
 }
+.melt .input-group-btn-vertical i{
+	top: -2px;
+    left: 6px;
+}
 .discardReason .radio input{
   margin-left: -121px;
 }
@@ -563,7 +573,7 @@
     margin-right: 2px;
 }
 .modal-content-addwidth{
-	width:700px;
+	width:720px;
 }
 .breakage-date-input .form-control{
 	height: 27px;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js
===================================================================
diff -u -r24917 -r24919
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js	(.../assemblyManagementSlick2.js)	(revision 24917)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js	(.../assemblyManagementSlick2.js)	(revision 24919)
@@ -561,10 +561,12 @@
 	var validDateUnit = $("#packageType option:selected").attr("data-validDateUnit");
 	alert(packageTypeVal+"的失效期为"+validDate+validDateUnit);
 })
+
 $(function(){
-    //页面一加载就获取焦点
-    $("#searchBarcode").focus();
-    $("#searchBarcode").val("");
+	
+    //页面一加载就获取焦点	
+   
+    //$("#searchBarcode").val("");
     loseAndDamageNum();//丢失和报损的数字
     $("#tableTopBox").show();
     $("#tableFootBox").show();
@@ -666,6 +668,9 @@
     gridMaterials.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
     gridMaterials.registerPlugin(materials_checkboxSelector);
     //gridMaterials.init();
+    
+    //获取焦点
+    $("#searchBarcode").focus();
 })/*$(function) end*/
 function topOrFootTableWrappHeight(){
 	var documentHeight  = $(window).height();
@@ -706,7 +711,7 @@
 	        align : 'center',
 	        sortable:true, //正序,逆序
 	        cssClass: "cell-title",
-	        minWidth: 100,
+	        minWidth: 180,
 	        resizable: false,
 	        formatter:tousseNameFormatterTopTable
 	    },
@@ -1211,7 +1216,7 @@
 	        align : 'center',
 	        sortable:true, //正序,逆序
 	        cssClass: "cell-title",
-            minWidth: 100,
+            minWidth: 180,
             resizable: false,
 	        formatter:tousseNameFormatter
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
===================================================================
diff -u -r24915 -r24919
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24915)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24919)
@@ -26,20 +26,11 @@
 <title>装配管理</title>
 <!-- bootstrap -->
 <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-3.3.7-dist/css/bootstrap.min.css">
-<!-- SlickGrid -->
-<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-datetimepicker --%>
+	<%-- 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/index/font-awesome/css/font-awesome.min.css">
 <!-- bootstrap select2 -->
@@ -48,6 +39,16 @@
 <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SelectPage/selectpage.css">
 <!-- bootstrap 多选select  -->
 <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-select-master/dist/css/bootstrap-select.min.css">
+<!-- SlickGrid -->
+<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"/>
+<!--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/common/customCommon.css">
 <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css">
@@ -89,7 +90,7 @@
 				    			<div class="assembly-task-lefttop">
 				    				<div class="form-group basketry">
 									    <label for="searchBarcode">扫描篮筐条码:</label>
-									    <input type="text" class="form-control input-sm" id="searchBarcode" placeholder="扫描篮筐条码">
+									    <input type="text" class="form-control input-sm" id="searchBarcode" name="searchBarcode">
 									</div>
 									<div class="checkbox checkbox-all-table">
 									    <label>
@@ -248,7 +249,7 @@
 									  <div class="form-group pull-left assembly-task-middlefoot-form">
 									    <label>灭菌程序:</label>
 									    <div class="setInputH">
-									    	<select name="" id="sterilingType">
+									    	<select name="" id="sterilingType" class="form-control">
 											</select>
 									    </div>
 									  </div>
@@ -263,14 +264,14 @@
 									  <div class="form-group pull-left assembly-task-middlefoot-form">
 									    <label>包装类型:</label>
 									    <div class="setInputH">
-									    	<select name="" id="packageType">
+									    	<select name="" id="packageType" class="form-control">
 											</select>
 									    </div>
 									  </div>
 									  <div class="form-group pull-right assembly-task-middlefoot-form">
 									    <label>灭菌炉:</label> 
 									    <div class="setInputH" >
-									    	<select name="" id="sterilizerName">
+									    	<select name="" id="sterilizerName" class="form-control">
 											</select>
 									    </div>
 									  </div>
@@ -357,11 +358,11 @@
 						</div> 
 						<div class="form-group ml30  qxb-tm">
 						   <label  class="pull-left text-right w100">器械包条码:</label>
-						   <input type="text" class="form-control pull-left" placeholder="器械包条码" id="instrumentCode">
+						   <input type="text" class="form-control pull-left"  id="instrumentCode">
 					    </div>
 					    <div class="form-group ml30  qxb-tm">
 						   <label  class="pull-left text-right w100" style="padding-right:6px;">配包者:</label>
-						   <input type="text" class="form-control pull-left" placeholder="配包者" style="margin-left: -3px;"  id="packagePeople">
+						   <input type="text" class="form-control pull-left" style="margin-left: -3px;"  id="packagePeople">
 					    </div>
 		    		</div>
 				</form>
@@ -473,7 +474,7 @@
 	          		<form action="" class="form-inline" onsubmit="return false;">    
 		               <div class="form-group basketry">
 						    <label for="addLoseBarcode">篮筐条码:</label>
-						    <input type="text" class="form-control input-sm" id="addLoseBarcode" placeholder="扫描篮筐条码" value="">
+						    <input type="text" class="form-control input-sm" id="addLoseBarcode" value="">
 						    <input type="hidden" value="" id="addLoseBarcodeHidden">
 						    <span style="display:none;"></span>
 						</div>