Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css
===================================================================
diff -u -r24987 -r24995
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css	(.../assemblyManagement.css)	(revision 24987)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css	(.../assemblyManagement.css)	(revision 24995)
@@ -44,7 +44,11 @@
 }
 .assembly-task-left{
     padding-right:0;
+    height:100%;
 }
+.tableTopBox,.tableFootBox{
+	display:none;
+}
 .assembly-task-lefttop{
     margin-left: 0 ;
     margin-right: 0;
@@ -92,6 +96,12 @@
     height:26px;
     font-size:15px;
 }
+.assembly-task-inputh{
+	width:100%;
+}
+.assembly-task-inputh .assemblyTaskleftFootTable,.assembly-task-inputh .assemblyTaskleftTopTable{
+	width:100%;
+}
 .assembly-task-inputh input{
     width:14px;
 }
@@ -115,10 +125,8 @@
 }
 /* 修改select插件end */
 .assembly-task-leftfoot1{
-  /*   background: #C6E3CA;
-    border-top:1px solid #aedeb4;
-    border-bottom:1px solid #aedeb */4;
     padding:3px 0;
+    height:38px;
 }
 .assembly-task-leftfoot1 button b{
    color:red;
@@ -150,7 +158,8 @@
   text-align:right;
   margin-right: 10px;
   height: 40px;
- line-height: 30px;
+  line-height: 30px;
+  display: inline-block;
 }
 .breakage-msg-modelfoot{
     padding: 6px 0;
@@ -161,15 +170,26 @@
     margin-right: 3px;
     margin-left: 9px;
 }
+.breakageDeparent{
+	width:200px
+}
 .reakage-remarkwrapper{
     height:69px;
 }
+.today-assembly-record-model-con{
+	width:1000px;
+	left:50%;
+	margin-left:-500px;
+}
 .reakage-remarkwrapper label{
     width:10%;
     margin-top:10px;
     text-align:right;
     margin-right:10px;
 }
+.addLoseModel-code{
+	width:100%;
+}
 .reakage-msg-remark{
     width: 80%;
     resize: none;
@@ -203,6 +223,9 @@
 .reakage-table td,.reakage-table th{
     text-align: center;
 }
+.breakage-msg-modelfoot .bootstrap-select{
+	width:144px !important;
+}
 .uploadingImg{
     width:100%;
     height:50px;
@@ -295,6 +318,7 @@
     float:left;
     width:50%;
     margin-left: 1%;
+    position:relative;
 }
 .assembly-task-middlefoot-form .setInputH input,.assembly-task-middlefoot-form .setInputH select{
     width:100%;
@@ -304,13 +328,36 @@
     font-size: 15px; 
     padding-right:0px;
 }
+.pack-print-wrapp{
+  text-align: center;
+  margin-top:20px;
+  margin-bottom:50px;
+}
 .assembly-task-right{
     padding-left: 0;
     padding-right: 0;
 }
 .materials-menu{
     width:100%;
 }
+.materialsMenuTable,.todayAssemblyRecordTable{
+	width:100%;
+}
+.packer label{
+	padding-right:6px;
+}
+.packer input{
+	margin-left: -3px;
+}
+.showTip{
+	display:none;
+}
+.addLoseTableWrapper{
+	margin-top:20px;
+}
+.addLoseTableWrapper .addLoseTable{
+	height:300px;
+}
 .assembly-task-right h4,.assembly-materials-all{
     width: 100%;
     background: #C6E3CA;
@@ -412,7 +459,7 @@
     width:300px;
 }
 .breakage-num{
-    width:130px;
+    width:136px;
 }
 .breakage-num input{
     width:80px !important;
@@ -545,6 +592,9 @@
  .toggle.collapse {
    background: url(../../img/collapse.gif) no-repeat center center;
  }
+ .tousse-name-color,.tousse-name-defaultColor{
+      text-align: left;
+ }
 .tousse-name-color .packer-name{
 	background:yellow;
 }
@@ -585,8 +635,13 @@
     margin-right: 2px;
 }
 .modal-content-addwidth{
-	width:720px;
+	width:784px;
+	left:50%;
+	margin-left:-392px;
 }
+.modal-content-addwidth .breakageMsgListTable{
+	height:188px;
+}
 .breakage-date-input .form-control{
 	height: 27px;
 }
@@ -603,7 +658,7 @@
 }
 .amendPrint .form-control,.amendPrint select{
 	height:30px;
-	width: 170px
+	width: 169px
 }
 .sterilization-time{
     margin-left: 4px;
@@ -623,6 +678,18 @@
 .code-register input{
     height:22px;
 }
+.addLoseModel-content{
+	width:880px;
+	margin-left:-440px;
+	left:50%;
+}
+.printAmendtable-wrapp{
+	width:968px;
+}
+.printAmendtable-wrapp .printAmendtable{
+	height:330px;
+	width:100%;
+}
 /*分页start  */
 .bottomContain {
   position: absolute;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
===================================================================
diff -u -r24987 -r24995
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24987)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24995)
@@ -36,7 +36,7 @@
 <!-- bootstrap select2 -->
 <!-- <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/select2-develop/css/select2.min.css"> -->
 <!-- bootstrap select page -->
-<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SelectPage/selectpage.css">
+<!-- <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 -->
@@ -52,10 +52,9 @@
 <!-- 自身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">
-
+<!-- <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/css/bootstrap-ie6.min.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>
@@ -84,9 +83,9 @@
 	    <div class="tab-content over-hidden">
 		    <div role="tabpanel" class="tab-pane active" id="assemblyTask">
 		    	<div class="row">
-		    		<div class="col-md-5 assembly-task-left" style="height:100%;">
+		    		<div class="col-md-5 assembly-task-left">
 		    			<form action="" class="form-inline" onsubmit="return false;">
-		    				<div id="tableTopBox" style="display:none;">
+		    				<div id="tableTopBox" class="tableTopBox">
 				    			<div class="assembly-task-lefttop">
 				    				<div class="form-group basketry">
 									    <label class="pull-left">扫描篮筐条码:</label>
@@ -106,12 +105,12 @@
 								 		<option value="">科室包名</option>
 								 	</select>
 								</div>	    			
-					    		<div id="assemblyTaskleftTopTableWrapp" style="width:100%;" class="assembly-task-inputh input">
-					    			<div id="assemblyTaskleftTopTable" style="width:100%;"></div>
+					    		<div id="assemblyTaskleftTopTableWrapp" class="assembly-task-inputh">
+					    			<div id="assemblyTaskleftTopTable" class="assemblyTaskleftTopTable"></div>
 					    		</div>
 				    		</div>
-				    		<div class="assembly-task-leftfoot" id="tableFootBox" style="display:none;">
-				    			<div class="assembly-task-leftfoot1" style="height:38px;">
+				    		<div class="assembly-task-leftfoot tableFootBox" id="tableFootBox">
+				    			<div class="assembly-task-leftfoot1">
 				    			   <button type="button" class="dx-btn-primary dx-btn-sm btn-my-size" id="addLose">
 				    			   		<span class="glyphicon glyphicon-plus-sign"></span>
 				    			   		补充丢失器械(<b></b>)
@@ -129,7 +128,7 @@
 				    					刷新
 				    				</button>
 				    			</div>
-				    			<div class="assembly-task-leftfoot1" style="height:38px;">
+				    			<div class="assembly-task-leftfoot1">
 				    				<button type="button" class="dx-btn-primary dx-btn-sm btn-my-size" id="addBreakageMsg">
 				    					<span class="glyphicon glyphicon-plus-sign"></span>
 				    					添加报损器械
@@ -148,8 +147,8 @@
 									    </label>
 									</div>
 				    			</div>
-					    		<div class="assembly-task-inputh" id="assemblyTaskleftFootTableWrapp" style="width:100%;"> 
-					    			 <div id="assemblyTaskleftFootTable" style="width:100%;"></div>
+					    		<div class="assembly-task-inputh" id="assemblyTaskleftFootTableWrapp"> 
+					    			 <div id="assemblyTaskleftFootTable" class="assemblyTaskleftFootTable"></div>
 					    		</div> 
 				    		</div >
 		    			</form>
@@ -289,7 +288,7 @@
 									  </div>
 									  <div class="form-group pull-right assembly-task-middlefoot-form">
 									    <label>灭菌日期:</label>
-									    <div class="setInputH" style="position:relative;">
+									    <div class="setInputH">
 											<input id="determineDate" type="text" name="" class="form-control " placeholder="默认为今天">
 											<span class="form-control-feedback icon-bg time-icon"></span>
 										</div>
@@ -303,7 +302,7 @@
 									    </div>
 									  </div>
 									</div>
-									<div class="text-center" style="margin-top:20px;margin-bottom:50px;">
+									<div class="pack-print-wrapp">
 					    				<button type="button" class="dx-btn-primary dx-btn-sm center-block" id="packPrint">
 					    					<span class="glyphicon glyphicon-print"></span>
 					    					装配并打印标签
@@ -321,7 +320,7 @@
 		    				<a href="javascript:void(0);" class="btn" role="button">添加质量监测</a>
 		    			</div>
 		    			<div id="materialsMenu" class="materials-menu">
-		    				<div id="materialsMenuTable"></div>
+		    				<div id="materialsMenuTable" class="materialsMenuTable"></div>
 		    			</div>
 		    		</div>
 		    	</div>
@@ -346,12 +345,12 @@
 
 						<div class="pull-left ml30">
 			    			<div class="form-group pull-left text-right w100">
-					      		<label class=" control-label">器械包名称:</label>
+					      		<label class="control-label">器械包名称:</label>
 					    	</div>
 					    	<!-- <select id="sel_menu3" class="js-data-example-ajax form-control" multiple="multiple" style="width:200px;"> -->
 							      <!-- <option value="3620194" selected="selected">请选择</option> -->
 							<!--  </select> -->
-					    	<input type="text" id="instrumentPackerName" data-init="0" class="form-control" style="width:200px"/>
+					    	<input type="text" id="instrumentPackerName" class="form-control " style="width:200px"/>
 						</div>
 		    		</div>
 				   	<div class="today-assemble-record-time"> 
@@ -364,9 +363,9 @@
 						   <label  class="pull-left text-right w100">器械包条码:</label>
 						   <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" style="margin-left: -3px;"  id="packagePeople">
+					    <div class="form-group ml30  qxb-tm packer">
+						   <label  class="pull-left text-right w100">配包者:</label>
+						   <input type="text" class="form-control pull-left" id="packagePeople">
 					    </div>
 		    		</div>
 				</form>
@@ -388,7 +387,7 @@
 					</div>
 			    </div>
 				<div id="gridContainer">
-					<div id="todayAssemblyRecordTable" style="width:100%;"></div>
+					<div id="todayAssemblyRecordTable" class="todayAssemblyRecordTable"></div>
 					<div class="bottomContain">
 						<div class="pageContain">
 							<div class="pageContainTotal">
@@ -451,7 +450,7 @@
     </div> 	
 
     <!-- left foot表格文字提示 -->
-    <div class='alert alert-success' id='showTip' style="display:none;"></div>
+    <div class='alert alert-success showTip' id='showTip'></div>
     <!-- 材料清单表格移动上去的显示的表格 -->
     <div class="metariles-list-tips" style="display:none;">
        <h4 class="title-font">质量,功能检查</h4>
@@ -469,22 +468,22 @@
     <!-- 补充丢失器械模态框 -->
 	<div class="modal fade addLoseModel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
         <div class="modal-dialog" role="document">
-	       <div class="modal-content" style="width:880px;">
+	       <div class="modal-content addLoseModel-content">
 	           <div class="modal-header">
 	               <button type="button" class="close" data-dismiss="modal" aria-label="Close">&times;</button>
 	               <h4 class="modal-title title-font">器械补充</h4>
 	           </div>
-	          <div class="modal-body" > 
+	          <div class="modal-body"> 
 	          		<form action="" class="form-inline" onsubmit="return false;">    
-		               <div class="form-group basketry">
+		               <div class="form-group  addLoseModel-code">
 						    <label for="addLoseBarcode">篮筐条码:</label>
 						    <input type="text" class="form-control input-sm" id="addLoseBarcode" value="">
 						    <input type="hidden" value="" id="addLoseBarcodeHidden">
 						    <span style="display:none;"></span>
 						</div>
 				    </form>
-				   <div id="addLoseTableWrapper" class="over-hidden" style="margin-top:20px;">	
-				   		<div id="addLoseTable" style="height:300px;"></div>			   	
+				   <div id="addLoseTableWrapper" class="over-hidden addLoseTableWrapper">	
+				   		<div id="addLoseTable" class="addLoseTable"></div>			   	
 				   </div> 
 	           </div>
 	           <div class="modal-footer text-center">
@@ -507,12 +506,12 @@
           			<form class="form-inline">
 	          			<div class="breakage-msg-modeltoplist">
 	          				<div class="pull-left w50" >
-	          					<span class="breakage-msg-lefttxt" style="display: inline-block;">报损人:</span>
+	          					<span class="breakage-msg-lefttxt">报损人:</span>
 	          					<b>admin</b>
 	          				</div>
 	          				<div class="pull-left w50">
 								<label  class="pull-left breakage-msg-lefttxt" for="breakageDeparent">报损科室:</label>
-								<select name="parentid" style="width:200px" id="breakageDeparent">
+								<select name="parentid" id="breakageDeparent" class="breakageDeparent">
 					    			<option selected="selected" value="666"></option>
 								</select>
 							</div>
@@ -543,7 +542,7 @@
 		          	</form>
 	          		<h4 class="title-font-sub"><i></i>器械报损明细</h4>
       				<form class="form-inline breakage-msg-modelfoot">
-      					<div class="pull-left">
+      					<div class="pull-left" style="width:208px;">
 							<label  class="pull-left text-right " for="bagName">包名称:</label>
 							<select class="selectpicker"  data-live-search="true">
 							    <option value="1">广东省</option>
@@ -553,9 +552,9 @@
 							    <option value="5">山东省</option>                            
 							</select>
 						</div>
-					   	<div class="pull-left">
+					   	<div class="pull-left" style="width:250px;">
 							<label  class="pull-left text-right mt4" for="materialsName">材料名称:</label>
-							<select class="selectpicker" data-live-search="true" style="width:115px;">
+							<select class="selectpicker" data-live-search="true">
 							    <option value="1">广东省</option>
 							    <option value="2">广西省</option>
 							    <option value="3">福建省</option>
@@ -579,7 +578,7 @@
 					    </div>
 		        	</form>
 		        	<div id="breakageMsgList">
-		        		<div id="breakageMsgListTable" style="height:300px;"></div>
+		        		<div id="breakageMsgListTable" class="breakageMsgListTable"></div>
 		        	</div>
 	           </div>
 	           <div class="modal-footer text-center">
@@ -594,7 +593,7 @@
      <!-- 当天装配记录点击表格每一行模态框 -->
     <div class="modal fade" id="todayAssemblyRecordModel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
         <div class="modal-dialog" role="document" >
-	       <div class="modal-content" style="width:1000px;left:50%;margin-left:-500px;">
+	       <div class="modal-content today-assembly-record-model-con">
 	           <div class="modal-header">
 	               <button type="button" class="close" data-dismiss="modal" aria-label="Close">&times;</button>
 	               <h4 class="modal-title title-font">重新打印标签</h4>
@@ -623,8 +622,8 @@
 	    			   		<span class="glyphicon glyphicon-random"></span>&nbsp;加急
 	    			   	</button>
 	          		</div>
-	          		<div style="width:968px;">
-	          			<div id='printAmendtable' style="height:400px;width:100%;"></div>
+	          		<div class="printAmendtable-wrapp">
+	          			<div id='printAmendtable' class="printAmendtable"></div>
 	          		</div>
 	           </div>
 	           <div class="modal-footer text-center">
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js
===================================================================
diff -u -r24989 -r24995
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js	(.../assemblyManagementSlick3.js)	(revision 24989)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js	(.../assemblyManagementSlick3.js)	(revision 24995)
@@ -705,7 +705,6 @@
 	        field : 'tousseName',
 	        align : 'center',
 	        sortable:true, //正序,逆序
-	        cssClass: "cell-title",
 	        minWidth: 180,
 	        resizable: false,
 	        formatter:tousseNameFormatterTopTable
@@ -720,7 +719,7 @@
 	        cssClass: "cell-title",
 	        minWidth: 100,
 	        resizable: false,
-	         focusable: false,
+	        focusable: false,
 		 	formatter:amountFormatterTopTable
 		},
 	    {
@@ -1068,6 +1067,7 @@
     			var tempId = 0;
     			loadDataTop = [];
     			loadDataTop = requestData(datas);//加载数据
+    			var filterTopTable = new Slick.Controls.ColumnPicker(visibleColumnsTopTable, gridTopTable, optionsTopTable);
     			gridTopTable.invalidateAllRows();
 		    	dataViewTopTable.beginUpdate();
 			    dataViewTopTable.setItems(loadDataTop);
@@ -1151,7 +1151,7 @@
 	if(dataContext.parent == null){
 		var inputId = 'inputTop_'+dataContext.tousseID;
 	  	  return  "<div class='input-group spinner'>"
-	        + "<input id='"+inputId+"' type='text' class='form-control showNum_"+dataContext.tousseID+"' value='" + value + "' tousseName='"+dataContext.tousseName+"'  max-value='" + value +"' />"
+	        + "<input id='"+inputId+"' type='text' class='form-control showNum_"+dataContext.tousseID+"' value='" + value + "' tousseName='"+dataContext.tousseName+"'  max-value='" + value +"' onblur='numChange(this)'/>"
 	        + "<div class='input-group-btn-vertical'>"
 	        + "<button class='btn btn-default ' type='button' onclick='addNum(this)'><i class='fa fa-caret-up'></i></button>"
 	        + "<button class='btn btn-default ' type='button' onclick='reduceNum(this)'><i class='fa fa-caret-down'></i></button>"
@@ -1234,7 +1234,6 @@
 	    	id: "tousseName",
 	        name : '物品名称',
 	        field : 'tousseName',
-	        align : 'center',
 	        sortable:true, //正序,逆序
 	        cssClass: "cell-title",
             minWidth: 180,
@@ -1254,7 +1253,7 @@
 		    	if(dc.parent == null){
 		    		var inputId = 'input_'+dc.tousseID;
 				  	  return  "<div class='input-group spinner'>"
-				        + "<input id='"+inputId+"' type='text' class='form-control showNum_"+dc.tousseID+"' value='" + v + "' tousseName='"+dc.tousseName+"'  max-value='" + v +"' />"
+				        + "<input id='"+inputId+"' type='text' class='form-control showNum_"+dc.tousseID+"' value='" + v + "' tousseName='"+dc.tousseName+"'  max-value='" + v +"' onblur='numChange(this)'/>"
 				        + "<div class='input-group-btn-vertical'>"
 				        + "<button class='btn btn-default ' type='button' onclick='addNum(this)'><i class='fa fa-caret-up'></i></button>"
 				        + "<button class='btn btn-default ' type='button' onclick='reduceNum(this)'><i class='fa fa-caret-down'></i></button>"
@@ -1380,8 +1379,10 @@
     	data: {"taskGroup":taskGroup}, 
     	success:function(data){
     		footTableLastestSelects = [];
+
     		var datas =data.data;
     		loadData = [];
+    		var filterFootTable = new Slick.Controls.ColumnPicker(visibleColumns, grid, options);
     		loadData = requestData(datas);//加载数据
     		grid.invalidateAllRows();
 		    dataView.beginUpdate();
@@ -1394,6 +1395,8 @@
 }
 
 function leftFootTable(){
+	//头部列筛选
+  
 	if (dataView == undefined || dataView == null) {
 		dataView = new Slick.Data.DataView({ inlineFilters: true });
 	}
@@ -1584,10 +1587,8 @@
    
     value = value.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
     //制造一个占位
-   // var spacer = "<span style='display:inline-block;height:1px;width:" + (15 * dataContext["indent"]) + "px'></span>";
-    var spacer = "<span></span>";
+   var spacer = "<span style='display:inline-block;height:1px;width:" + (15 * dataContext["indent"]) + "px'></span>";
 
-
     //根据ID获取此行内容的索引值
     var idx = dataView.getIdxById(dataContext.id);
     
@@ -1617,7 +1618,7 @@
         	return spacer + "<input type='checkbox'  style='width:14px;'/>&nbsp; <span class='toggle collapse'></span>&nbsp;<span class='packer-name'>"+value+"</span>";//展开
       	}
     } else {
-       return spacer + " <span class='toggle'></span>&nbsp;<span class='packer-name'>"+value+"</span>";
+       return spacer + "<span class='toggle'></span>&nbsp;<span class='packer-name'>"+value+"</span>";
     }
 }
 function myFilter(item) {
@@ -1755,10 +1756,9 @@
 	    		$('.deleteMsgModel').modal('hide');
 	    		leftFootLoad();//刷新左下表格
 	    		//当没有扫条码，上面表格不刷新
-	    		if(searchBarcodeHidden == undefined || searchBarcodeHidden ==""){
-	    			return;
-	    		}
-	    		reloadTopTableMoreborde(basketBarcodesAll.join(";"));//刷新左上表格
+	    		 if(basketBarcodesAll.length > 0){
+	     			reloadTopTableMoreborde(basketBarcodesAll.join(";"));//左上表格的刷新
+	     	    }
 	    	}else{
 	    		//删除失败
 	    		alert(result.message);
@@ -2198,7 +2198,7 @@
 	        align : 'center',
 	        sortable:true, //正序,逆序
 	        cssClass: "cell-title",
-            minWidth: 230,
+            minWidth: 262,
             resizable: false,
 	        formatter:function(row, cell, value, columnDef, dataContext){
 	        	if(dataContext.washQualityCheckPoint == undefined ){
@@ -2254,8 +2254,6 @@
 	    success: function(result) {
 	    	var materialsParData = result.rows;
 	        if(result.success == true){
-	        	//alert("11111111111111111111111111");
-	        	//alert(materialsParData);
 	        	loadMaterials_ParData = [];
 	        	for (var i = 0; i < materialsParData.length; i++) {
 			        var d = (loadMaterials_ParData[i] = {});
@@ -2267,13 +2265,11 @@
 			        d["washQualityCheckMethod"] =materialsParData[i].washQualityCheckMethod;
 			        d["functionCheck"] =materialsParData[i].functionCheck;
 			    }
-			    //alert("3333");
 			    //dataView = new Slick.Data.DataView({ inlineFilters: true });
     			//grid = new Slick.Grid("#assemblyTaskleftFootTable", dataView, visibleColumns, options);
 			   // gridMaterials = new Slick.Grid("#materialsMenuTable", loadMaterials_ParData, visibleColumns_Materials, optionsMaterials);
  				gridMaterials.setData(loadMaterials_ParData);
                 gridMaterials.render();
-			    // alert("44444444");
 		        //器械总数
 		        $("#materialTotalAmount").text(result.materialTotalAmount);
 		        //一次性物品总数
@@ -2380,6 +2376,27 @@
 }
 /*材料清单表格end*/
 /*数量增减start*/
+function numChange(that){
+	var inputVals =$(that).val();
+	var inputTouseName = $(that).attr("tousseName");
+	var inputMaxValue = parseInt($(that).attr("max-value"));
+	if(inputVals > 0 && inputVals > inputMaxValue){
+		$(that).css({"border":"1px solid #ccc"});
+		var addNumHtml= "<div class='panel panel-primary panel-tips'>"
+	               + "<div class='panel-heading'>提示</div>"
+	               + "<div class='panel-body'>"
+	               + ""+inputTouseName+"装配数量不能大于"+inputMaxValue+""
+	               + "</div>"
+	               + "</div>";
+        $("body").append(addNumHtml);
+        $(that).val(inputMaxValue);
+	    return;
+    } 
+   	if(inputVals < 0){	
+	    $(that).val(inputMaxValue);
+    }
+
+}
 function addNum(that){
 	var numVals = parseInt($(that).parent().siblings("input").val());
 	var touseName = $(that).parent().siblings("input").attr("tousseName");
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js
===================================================================
diff -u -r24990 -r24995
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js	(.../todayAssemblyManagementRecord2.js)	(revision 24990)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js	(.../todayAssemblyManagementRecord2.js)	(revision 24995)
@@ -243,7 +243,7 @@
     "maxValue": endSelect, 
     "operator": "BETWEEN"
   }
-  setFilters.push(packTime);
+  //setFilters.push(packTime);
   
 
   //默认传值