Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
===================================================================
diff -u -r24936 -r24957
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24936)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24957)
@@ -150,7 +150,7 @@
 				    			</div>
 					    		<div class="assembly-task-inputh" id="assemblyTaskleftFootTableWrapp" style="width:100%;"> 
 					    			 <div id="assemblyTaskleftFootTable" style="width:100%;"></div>
-					    		</div>
+					    		</div> 
 				    		</div >
 		    			</form>
 		    		</div>
@@ -188,7 +188,7 @@
 									    	<input type="text" class="form-control" placeholder="检查人" id="inspectorInput">
 									    </div>
 									  </div>
-									</div> -->
+									</div>-->
 									<div class="assembly-task-middlefoot-formlist">
 									  <div class="form-group pull-left assembly-task-middlefoot-form">
 									    <label>配包人条码:</label>
@@ -384,7 +384,7 @@
 					</div>
 			    </div>
 				<div id="gridContainer">
-					<div id="todayAssemblyRecordTable"></div>
+					<div id="todayAssemblyRecordTable" style="width:100%;"></div>
 					<div class="bottomContain">
 						<div class="pageContain">
 							<div class="pageContainTotal">
@@ -585,6 +585,200 @@
 	       </div>
         </div>
     </div>
+
+
+     <!-- 当天装配记录点击表格每一行模态框 -->
+    <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-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>
+	          			<h4 class="title-font-sub"><i></i>条形码扫描登记</h4>
+	          			<form action="" class="form-inline">    
+			                <div class="form-group basketry">
+							    <label>输入条形码:</label>
+							    <input type="text" class="form-control" placeholder="输入条形码">
+							</div>
+				    	</form>
+	          		</div>
+	          		<div id="printAmend">
+		      			<button type="button" class="dx-btn-primary dx-btn-sm" style="margin-left:0;" id="amendClick">
+	    			   		<span class="glyphicon glyphicon-pencil"></span>&nbsp;修改
+	    			   	</button>
+	    			   	<button type="button" class="dx-btn-primary dx-btn-sm" >
+	    			   		<span class="glyphicon glyphicon-print"></span>&nbsp;打印
+	    			   	</button>
+	    			   	<button type="button" class="dx-btn-primary dx-btn-sm" id="deleteInstrumentBag">
+	    			   		<span class="glyphicon glyphicon-trash"></span>&nbsp;废弃
+	    			   	</button>
+	    			   	<button type="button" class="dx-btn-primary dx-btn-sm" id="urgent">
+	    			   		<span class="glyphicon glyphicon-random"></span>&nbsp;加急
+	    			   	</button>
+	          		</div>
+	          		<div style="width:968px;">
+	          			<div id='printAmendtable' style="height:400px;width:100%;"></div>
+	          		</div>
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="dx-btn-primary dx-btn-lg" data-dismiss="modal">取消</button>
+	           </div>
+	       </div>
+        </div>
+    </div>
+     <!-- 当天装配记录点击表格每一行模态框中的修改按钮模态框 -->
+    <div class="modal fade" id="amendClickModel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+        <div class="modal-dialog" role="document">
+	       <div class="modal-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" >
+	           		<form class="form-inline">
+		           		<div class="amendPrint">
+	          				<div class="form-group pull-left text-right w50">
+						      <label class="control-label">配包人:</label>
+						      <input  type="text" name="" class="form-control"/>
+	          				</div>
+	          				<div class="form-group pull-righ text-right w50"> 
+          						<label for="dateFrom_breakage" class="control-label">审核人:</label>
+          						<input  type="text" name="" class="form-control"/>
+	          				</div>
+		          		</div>
+		          		<div class="amendPrint">
+          					<div class="form-group pull-left text-right w50">
+						     	<label class="control-label">灭菌程序:</label>
+						        <select  name="parentid">
+				    				<option selected="selected" value="666">无</option>
+				    				<option selected="selected" value="666">低温离子器械包</option>
+				    				<option selected="selected" value="666">低温</option>
+				    				<option selected="selected" value="666">器械包</option>
+								</select>
+						    </div>
+						    <div class="form-group pull-right w50 text-right">
+						      	<label class=" control-label">包装类型:</label>
+							    <select  name="parentid">
+				    				<option selected="selected" value="666">棉布</option>
+				    				<option selected="selected" value="666">塑料</option>
+				    				<option selected="selected" value="666">灭菌盒</option>
+								</select>
+          				    </div>
+	          			</div>
+	          			<div class="amendPrint">
+						    <div class="form-group text-right pull-left w50">
+						      	<label class="control-label pull-left">灭菌开始时间:</label>
+						       	<div class="pull-left sterilization-time" >
+									<input id="dateFrom_Amend" type="text" name="" class="form-control" data-date="2018-01-12 10:19:12" data-date-format="hh:ii" />
+									<span class="icon-bg form-control-feedback"></span>
+								</div>
+							</div>
+          					<div class="form-group text-right pull-right w50">
+          						<label for="dateFrom_breakage" class="control-label">炉次:</label>
+          						<input  type="text" name="" class="form-control"/>
+          					</div>
+		          		</div>
+	          		</form>
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="btn" data-dismiss="modal">确定</button>
+	           </div>
+	       </div>
+        </div>
+    </div>
+    <!-- 装配记录废弃模态框 -->
+    <div class="modal fade" id="discardModel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+        <div class="modal-dialog" role="document">
+	       <div class="modal-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 text-center" > 
+	          		<p class="text-danger"><span class='glyphicon glyphicon-exclamation-sign'></span>&nbsp;确定要废弃选中的器械包吗？</p>
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="btn btn-default" onclick="yesDiscard()">是</button>
+	               <button type="button" class="dx-btn-primary dx-btn-lg" data-dismiss="modal">否</button>
+	           </div> 
+	       </div>
+        </div>
+    </div> 
+     <!-- 装配记录加急模态框 -->
+    <div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" id="urgentModel"> 
+        <div class="modal-dialog" role="document">
+	       <div class="modal-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 text-center" > 
+	          		<p class="text-danger"><span class='glyphicon glyphicon-exclamation-sign'></span>&nbsp;确定要加急选中的器械包吗？</p>
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="btn btn-default">是</button>
+	               <button type="button" class="dx-btn-primary dx-btn-lg" data-dismiss="modal">否</button>
+	           </div> 
+	       </div>
+        </div>
+    </div> 
+    <!-- 装配记录表格废弃点是以后的弹框 -->
+  	<div class="modal fade discardReason" id="discardReason" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+	    <div class="modal-dialog" role="document">
+	       <div class="modal-content modal-content-addwidth">
+	           <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="radio">
+					  <label>
+					    <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+					    	填写错误
+					  </label>
+					</div>
+					<div class="radio">
+					  <label>
+					    <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+					    	测试数据
+					  </label>
+					</div>
+					<div class="radio">
+					  <label>
+					    <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+					    	其他
+					  </label>
+					</div>
+					<textarea name=""></textarea>
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="dx-btn-primary dx-btn-lg">确定</button>
+	           </div>
+	       </div>
+	    </div>
+	</div>
+	<!-- 装配按钮打印标签的提示 -->
+  	 <div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" id="printLabel"> 
+        <div class="modal-dialog" role="document">
+	       <div class="modal-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 text-center" > 
+	          		<p class="text-danger">物品是否有缺陷？</p>
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="btn btn-default">正常</button>
+	               <button type="button" class="dx-btn-primary dx-btn-lg" data-dismiss="modal">缺陷</button>
+	           </div> 
+	       </div>
+        </div>
+    </div> 
 	<input type="hidden" value="" id="inspectorCodeInputHidden">
 	<input type="hidden" value="" id="operatorCodeHidden">
 	<input type="hidden" value="" id="reviewerCodeHidden">
@@ -654,9 +848,9 @@
 <!-- 引入自身js -->
 
 <!-- <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js"></script>  -->
-<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js"></script>  
+ <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js"></script> 
 <!-- <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/assemblyManagementModal.js"></script>  -->
-<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js"></script>  
+ <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js"></script>  
 <script type="text/javascript">
 	//回收报损
     var LINKTYPE_RECYCLINGRECORD = '<%=RecyclingDamageItem.LINKTYPE_RECYCLINGRECORD%>'; 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js
===================================================================
diff -u -r24943 -r24957
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24943)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24957)
@@ -395,9 +395,9 @@
                     });
                 }
                 //禁止鼠标默认的右击事件
-                $(window).contextmenu(function(e){
+                /*$(window).contextmenu(function(e){
                     e.preventDefault();
-                })
+                })*/
             }else{
              //console.log(result.message);
             }
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/common/customCommon.css
===================================================================
diff -u -r24915 -r24957
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/common/customCommon.css	(.../customCommon.css)	(revision 24915)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/common/customCommon.css	(.../customCommon.css)	(revision 24957)
@@ -2,6 +2,9 @@
     width:100px;
     text-align:right;
 }
+.form-control:focus{
+	border-color: #31b546;
+}
 .over-hidden{overflow:hidden;}
 .modal-header{padding:0px;}
 html{ overflow: hidden;}
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js
===================================================================
diff -u -r24935 -r24957
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js	(.../assemblyManagementSlick3.js)	(revision 24935)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js	(.../assemblyManagementSlick3.js)	(revision 24957)
@@ -294,7 +294,7 @@
 		    		}
 
 		    		$("#checkboxAllToptable").prop("checked", false);
-		    		//processAfterPacking(false,result,tousseName,inputAmount);
+		    		processAfterPacking(false,result,tousseName,inputAmount);
 		    	}else{
 		    		var addNumHtml= "<div class='panel panel-primary panel-tips'>"
 			               + "<div class='panel-heading'>提示</div>"
@@ -356,7 +356,7 @@
     dataViewTopTable.setFilter(myFilterTopTable);
     dataViewTopTable.endUpdate();
 	leftFootLoad();//刷新左下表格
-	//printLabelsAfterPacking();//打印标签
+	printLabelsAfterPacking();//打印标签
 });
 
 function hidePackingTousseBtnClick_mask(){
@@ -564,17 +564,13 @@
 })
 
 $(function(){
-	
-    //页面一加载就获取焦点	
-   
-    //$("#searchBarcode").val("");
     loseAndDamageNum();//丢失和报损的数字
     $("#tableTopBox").show();
     $("#tableFootBox").show();
   	topOrFootTableWrappHeight();//上下table父级的高度
 
   	//左下表格
-  	$("#assemblyTaskleftFootTable").css("height",($("#tableFootBox").height()-75)+"px");
+  	$("#assemblyTaskleftFootTable").css("height",($("#tableFootBox").height()-78)+"px");
   	leftFootLoad();
   	$("#refreshFootTable").click(function(){
   		leftFootLoad();
@@ -661,7 +657,7 @@
 	gridLose = new Slick.Grid("#addLoseTable",[], visibleColumns_Lose, optionsLose);*/
 	//材料清单
 	materialsTableLoad();
-	$("#materialsMenuTable").css("height",($(window).height()-216)+"px");
+	$("#materialsMenuTable").css("height",($(window).height()-187)+"px");
 	dataViewMaterials = new Slick.Data.DataView({ inlineFilters: true });
     gridMaterials = new Slick.Grid("#materialsMenuTable",[], visibleColumns_Materials, optionsMaterials);
     gridMaterials.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
@@ -673,14 +669,14 @@
 })/*$(function) end*/
 function topOrFootTableWrappHeight(){
 	var documentHeight  = $(window).height();
-    var tabH = documentHeight-39-123;
+    var tabH = documentHeight-133;
  	var tableHTop = tabH*0.45;
  	var tableHFoot = tabH*0.55;
     $("#tableTopBox").css({"height":tableHTop+"px"});  
     $("#tableFootBox").css({"height":tableHFoot+"px"});  
 
     //中间下面的高度
-    var taskmiddleH = documentHeight -335-123;
+    var taskmiddleH = documentHeight-429;
     $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"});
 }
 /*左上表格start*/
@@ -693,15 +689,13 @@
 	    enableAddRow: false,
 	    checked:true,
 	    enableForHeaderCells:true,
-	    asyncEditorLoading: false
+	    asyncEditorLoading: false,
+	    syncColumnCellResize:true//拖动单元格
 	}   
 	assemblyTaskleftTopTable_columns.push(
 	    {
 	        field: 'id',
-	        name: 'ID',
-	        align:'center',
-	        sortable: true,
-	        minWidth: 100
+	        name: 'ID'
 	    },
 	    {
 	    	id: "tousseName",
@@ -952,6 +946,11 @@
 	      
 	    }
 	});
+	//必须加，不加表格不能滚动
+	dataViewTopTable.onRowCountChanged.subscribe(function (e, args) {
+        gridTopTable.updateRowCount();
+        gridTopTable.render();
+    });
 	dataViewTopTable.onRowsChanged.subscribe(function (e, args) {
 		gridTopTable.invalidateRows(args.rows);
 		gridTopTable.render();
@@ -1015,7 +1014,11 @@
 	    	if(result.success == true){
 	    		//assemblyTaskLeftTopTableCon = result.data;
 	    	    var datas =result.data;
-	    	   
+	    	   	var nLength = datas?datas.length:0;
+            	if(nLength == 0){
+					//showResult('该篮筐在'+taskGroup+'内无装配任务！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+					alert('该篮筐在'+taskGroup+'内无装配任务！');
+				}
 	    	    var tempLeftTopTableInputArray = [];
 	    	    var tempTousseNameArray = [];
 	    	    var tempDatas = [];
@@ -1500,6 +1503,11 @@
 	      
 	    }
     });
+	//必须加这段代码，不然表格不能滚动
+  	dataView.onRowCountChanged.subscribe(function (e, args) {
+        grid.updateRowCount();
+        grid.render();
+    });
  	dataView.onRowsChanged.subscribe(function (e, args) {
         grid.invalidateRows(args.rows);
         grid.render();
@@ -1742,7 +1750,6 @@
 /*补充丢失start*/
 //补充按钮丢失弹框
 $("#addLose").click(function(){
-	$(".addLoseModel").modal('show');
     loseOrDamageModel("丢失","");
 });
 //补充报损器械弹框
@@ -2124,7 +2131,8 @@
 	    forceFitColumns: false,
 	    checked:true,
 	    enableForHeaderCells:true,
-	    asyncEditorLoading: false
+	    asyncEditorLoading: false,
+	    syncColumnCellResize:true//拖动单元格
 	};
 	materials_columns = [];
 	materials_checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"});
@@ -2225,6 +2233,10 @@
     })
     gridMaterials.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
     gridMaterials.registerPlugin(materials_checkboxSelector);
+  /*  dataViewTopTable.onRowCountChanged.subscribe(function (e, args) {
+        gridMaterials.updateRowCount();
+        gridMaterials.render();
+    });*/
 
 }
 function requestMaterialsDataChild(child_tousseName,child_tousseID){
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css
===================================================================
diff -u -r24919 -r24957
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css	(.../assemblyManagement.css)	(revision 24919)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css	(.../assemblyManagement.css)	(revision 24957)
@@ -581,6 +581,27 @@
 .breakage-msg-modeltoplist .btn{
 	height: 27px;
 }
+.amendPrint{
+	width:100%;
+	height: 30px;
+	margin-bottom: 4px;
+}
+.amendPrint .control-label{
+	width:110px;
+}
+.amendPrint .form-control,.amendPrint select{
+	height:30px;
+	width: 170px
+}
+.sterilization-time{
+    margin-left: 4px;
+    position: relative;
+}
+.sterilization-time .form-control-feedback{
+	background-position: 7px -19px;
+    top: -3px;
+    right: -5px;
+}
 /*分页start  */
 .bottomContain {
   position: absolute;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js
===================================================================
diff -u -r24917 -r24957
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js	(.../todayAssemblyManagementRecord2.js)	(revision 24917)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js	(.../todayAssemblyManagementRecord2.js)	(revision 24957)
@@ -1,11 +1,19 @@
+//主表
 var optionsTodayTable;
 var gridTodayTable;
 var columns;
-var TodayPackingTableTable_columns = [];
 var visibleColumns_TodayTable;
 var TodayTable_checkboxSelector;
 var dataViewTodayTable;
 
+//点击主表行的表格
+var optionsPrint;
+var gridPrint;
+var columnsPrint;
+var visibleColumns_Print;
+var Print_checkboxSelector;
+var dataViewPrint;
+
 //搜索
 var searchWords="";
 var requestFilters = [];
@@ -21,6 +29,9 @@
 var DATAGRID_MIN_HEIGHT = 180;
 var DATAGRID_MIN_WIDTH = 300;
 var DATAGRID_BOTTOM_PADDING = 20;
+
+
+
 function todayPackingClcik(obj){
   var objs= obj;
     if(objs===1){
@@ -72,17 +83,9 @@
     }
   }
 }
+//主表
 function TodayTableLoad(){
-  optionsTodayTable = {
-    enableCellNavigation: true,
-    enableColumnReorder: false,
-    forceFitColumns: true,
-    editable: true,
-    enableAddRow: false,
-    asyncEditorLoading: true,
-    topPanelHeight: 25,
-    autoEdit: false,
-  };
+
   columns = [];
   TodayTable_checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"});
   columns.push(TodayTable_checkboxSelector.getColumnDefinition());
@@ -92,7 +95,7 @@
       field: 'id',
       name: 'ID',
       align:'center',
-      sortable: true
+      sortable: true,
     },
     {
       id: "depart",
@@ -108,8 +111,7 @@
       field : 'supplierName',
       align : 'center',
       sortable:true, //正序,逆序
-      cssClass: "cell-title",
-      minWidth:150
+      cssClass: "cell-title"
     },
     {
       id: "tousseName",
@@ -133,8 +135,7 @@
       field : 'amount',
       align : 'center',
       sortable:true, //正序,逆序
-      cssClass: "cell-title",
-      // resizable: false
+      cssClass: "cell-title"
     },
     {
       id:"packer",
@@ -166,7 +167,7 @@
       field : 'foreignMaterialsAmount',
       align : 'center',
       sortable:true, //正序,逆序
-      cssClass: "cell-title",
+      cssClass: "cell-title"
     }, 
     {
       id:"doctor",  
@@ -177,7 +178,17 @@
       cssClass: "cell-title"
     }
   ); 
-
+  optionsTodayTable = {
+    enableCellNavigation: true,
+    enableColumnReorder: false,
+    forceFitColumns: true,
+    editable: true,
+    enableAddRow: false,
+    asyncEditorLoading: true,
+    topPanelHeight: 25,
+    autoEdit: false,
+    syncColumnCellResize:true//拖动单元格
+  };
   //将id列隐藏
   visibleColumns_TodayTable = [];//定义一个数组存放显示的列
   for (var i = 0; i <  columns.length; i++) {
@@ -188,8 +199,6 @@
   mainTable(0,requestFilters);  
  
 }
-
-
 function mainTable(setOffset,setFilters){
   var setLimit= parseInt($("#pageAmount").val());
   var beginSelect = $("#beginSelect option:selected").val();
@@ -222,7 +231,7 @@
     "maxValue": endSelect, 
     "operator": "BETWEEN"
   }
-  setFilters.push(packTime);
+ // setFilters.push(packTime);
   //器械组
 
   //默认传值
@@ -263,8 +272,14 @@
           todayTable_data.push(dataOB);
         }
       }
-      TodayTable_dataView = new Slick.Data.DataView({inlineFilters: true});
+      dataViewTodayTable = new Slick.Data.DataView({inlineFilters: true});
+      gridTodayTable = new Slick.Grid("#todayAssemblyRecordTable",todayTable_data, visibleColumns_TodayTable, optionsTodayTable);
+      dataViewTodayTable.onRowCountChanged.subscribe(function (e, args) {
+        gridTopTable.updateRowCount();
+        gridTopTable.render();
+      });
 
+      $("#todayAssemblyRecordTable .slick-viewport").css({"overflow-x":"auto"});
       if(result.rows != ""){
         $("#PageSize").val(result.limit);
         $("#dataCount").val(result.total);
@@ -274,11 +289,11 @@
             btloadpage();
         }
       }
-     
-      dataViewTodayTable = new Slick.Grid("#todayAssemblyRecordTable",todayTable_data, visibleColumns_TodayTable, optionsTodayTable);
+
       //头部列筛选
-      var columnpicker = new Slick.Controls.ColumnPicker(visibleColumns_TodayTable, dataViewTodayTable, optionsTodayTable);
-      attachAutoResizeDataGrid(dataViewTodayTable, "todayAssemblyRecordTable", "gridContainer");
+      var columnpicker = new Slick.Controls.ColumnPicker(visibleColumns_TodayTable, gridTodayTable, optionsTodayTable);
+      attachAutoResizeDataGrid(gridTodayTable, "todayAssemblyRecordTable", "gridContainer");
+      gridTodayTableEvent();//点击每一行
     }
   });
 }
@@ -462,4 +477,168 @@
     }
 });
 
+function gridTodayTableEvent(){
+  gridTodayTable.onClick.subscribe(function (e, args) {
+    gridTodayTable.setSelectionModel(new Slick.RowSelectionModel());//选中行
+    $("#todayAssemblyRecordModel").modal("show");
+  })
+}
+gridTodayTableRow();
+//表格每一行
+function gridTodayTableRow(){
+  optionsPrint = {
+    enableCellNavigation: true,
+    enableColumnReorder: false,
+    forceFitColumns: false,//这个配置为false才会滚动
+    editable: true,
+    enableAddRow: false,
+    asyncEditorLoading: true,
+    topPanelHeight: 25,
+    autoEdit: false,
+    syncColumnCellResize:true//拖动单元格
+  };
+  columnsPrint = [];
+  Print_checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"});
+  columnsPrint.push(Print_checkboxSelector.getColumnDefinition());
 
+  columnsPrint.push(
+    {
+      field: 'id',
+      name: 'ID'
+    },
+    {
+      id: "code",
+      name : "条形码",
+      field : 'code',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title",
+      minWidth:100
+    },
+    {
+      id: "bag",
+      name : '器械包',
+      field : 'bag',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title",
+      minWidth:150
+    },
+    {
+      id: "de",
+      name : '科室',
+      field : 'de',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title",
+      minWidth:100
+    },
+    {
+      id: "packer",
+      name : '配包员',
+      field : 'packer',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title",
+      minWidth:100
+    },
+    {
+      id:"assembly",
+      name : '审核人',
+      field : 'assembly',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title",
+      minWidth:100
+      // resizable: false
+    },
+    {
+      id:"washTime",
+      name : '清洗时间',
+      field : 'washTime',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title",
+      minWidth:100
+    }, 
+    {
+      id:"packTime",
+      name : '装配时间',
+      field : 'packtime',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title",
+      minWidth:100
+    }, 
+    {
+      id:"clas",
+      name : '包装类型',
+      field : 'clas',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title"
+    }, 
+    {
+      id:"cx",  
+      name : '灭菌程序',
+      field : 'cx',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title"
+    },
+    {
+      id:"time",  
+      name : '失效日期',
+      field : 'time',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title"
+    },
+    {
+      id:"status",  
+      name : '状态',
+      field : 'status',
+      align : 'center',
+      sortable:true, //正序,逆序
+      cssClass: "cell-title"
+    }
+  ); 
+
+  //将id列隐藏
+  visibleColumns_Print = [];//定义一个数组存放显示的列
+  for (var i = 0; i <  columnsPrint.length; i++) {
+    if (i!=1){
+      visibleColumns_Print.push(columnsPrint[i]);//将columns的列push进去
+    }
+  }  
+
+}
+
+$(function(){
+  dataViewPrint = new Slick.Data.DataView({ inlineFilters: true });
+  gridPrint = new Slick.Grid("#printAmendtable",[], visibleColumns_Print, optionsPrint);
+  gridPrint.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
+  gridPrint.registerPlugin(Print_checkboxSelector);
+  dataViewPrint.onRowCountChanged.subscribe(function (e, args) {
+    gridPrint.updateRowCount();
+    gridPrint.render();
+  });
+
+
+})
+
+//废弃按钮弹框
+$("#deleteInstrumentBag").click(function(){
+  $('#discardModel').modal('show');
+})
+
+//修改按钮弹框
+$("#amendClick").click(function(){
+  $('#amendClickModel').modal('show');
+  $("#amendClickModel .modal-title").text("修改器械包信息");
+})
+
+//加急按钮弹框
+$("#urgent").click(function(){
+  $('#urgentModel').modal('show');
+})
\ No newline at end of file