Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp
===================================================================
diff -u -r24970 -r25996
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp	(.../index.jsp)	(revision 24970)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp	(.../index.jsp)	(revision 25996)
@@ -311,7 +311,7 @@
 
 				</div>
 				<div class="modal-footer">
-					<button type="button" class="btn btn-default btn_default" data-dismiss="modal">关闭</button>
+					<button type="button" class="btn btn_cols btn_default" data-dismiss="modal">关闭</button>
 					<button type="button" class="btn btn-primary AddRecord" id="addTbale">保存</button>
 				</div>
 			</div>
@@ -640,6 +640,6 @@
 	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table-zh-CN.js"></script>
 	<script src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.js"></script>
 	<script src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.zh-CN.js"></script>
-	<script src="${basePath}/dx-disinfectsystem/js/sterilization/sterilization1.js"></script>
+	<script src="${basePath}/dx-disinfectsystem/js/sterilization/sterilization.js"></script>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css
===================================================================
diff -u -r24980 -r25996
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css	(.../sterilization.css)	(revision 24980)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css	(.../sterilization.css)	(revision 25996)
@@ -522,6 +522,7 @@
 	display: inline-block;
 	padding: 0 5px;
 	font-size: 15px;
+
 }
 .cell-title {
 	font-weight: bold;
@@ -549,7 +550,7 @@
 	height:27px;
 	line-height: 20px;
 	font-size: 14px;
-	width: 40px;
+	/*width: 40px;*/
 	text-align: center;
 	/*background: #7ae271;*/
 	border: 1px solid #54c165;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css
===================================================================
diff -u -r24980 -r25996
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css	(.../index.css)	(revision 24980)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css	(.../index.css)	(revision 25996)
@@ -207,9 +207,11 @@
 }
 .form-shoushu{
     display: inline-block;
-    width: 64%;
+    width: 63%;
 }
-
+label.addoperation{
+    width: 100%;
+}
 .form-li label span{
     display: inline-block;
     font-size: 15px;
@@ -230,7 +232,9 @@
 .fonm-mg{
     margin-left:1%;
 }
-
+select {
+    appearance:none;background:transparent;
+}
 .form-input,#Select,#specialInfection,#addSelect,#addspecialInfection{
     width: 150px;
     border: 1px solid #ddd;
@@ -240,10 +244,31 @@
     color: #000;
     font-size: 12px;
     font-weight: normal;
+
 }
+
+/*body .SlectIeCss{*/
+     /*!important;*/
+/*}*/
+
 .form-shoushu-input{
-    width: 410px;
+    width: 420px;
 }
+
+@media screen and (max-width: 1280px) {
+    .form-shoushu-input{
+        width: 413px;
+    }
+}
+
+.form_input{
+    width: 152px;
+}
+@media screen and (max-width: 1280px) {
+    .form_input{
+        width: 150px;
+    }
+}
 .form_shoushu_input{
     width: 410px;
 }
@@ -396,7 +421,7 @@
     height:150px;
 }
 .addGoodsGrid_body{
-    width: 770px;
+    width: 838px;
 }
 .content_body{
     height:50px;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js
===================================================================
diff -u -r25241 -r25996
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js	(.../todayAssemblyManagementRecord2.js)	(revision 25241)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js	(.../todayAssemblyManagementRecord2.js)	(revision 25996)
@@ -524,6 +524,7 @@
     id:"ajax-combo",
     container:"#instrumentPackerName",
     url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getAllTousseDefinitionData.mhtml",
+   // url:WWWROOT+"/disinfectSystem/baseData/supplyRoomConfigController/getApplicationDepartJson.mhtml",
     ajaxData:{
       'limit':10,
       'spell':'',
Fisheye: Tag 25996 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r25060 -r25996
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 25060)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 25996)
@@ -47,7 +47,8 @@
 </head>
 <body>
 	
-<div class="content">	
+<div class="content">
+	<input type="hidden" class="totalPagesAll">
 	<!-- <div class="content-header s-row">
 		<div class="content-header-title s-col-xs-12">
 			<span>科室申领</span>
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js
===================================================================
diff -u -r24976 -r25996
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24976)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 25996)
@@ -185,22 +185,8 @@
             id: "remark",
             cssClass: "cell-title",
             sortable: true,
-        },
-        {
-            field: 'types',
-            name: '操作',
-            id: "types",
-            cssClass: "cell-title",
-            sortable: true,
-            minWidth:85,
-            width:85,
-            formatter: function (value,row,index,columnDef,dataContext){
-                var delectArray =[];
-                delectArray.push(dataContext.id)
-                return '<a class="listbtn listbtnM"  data-target="#mymodal-details" data-toggle="modal">详情 </a>'+
-                        '<a class="listbtn" onclick="DleteRow('+JSON.stringify(delectArray)+')">删除 </a>'
-            },
         }
+
     )
 
     var options = {
@@ -339,7 +325,6 @@
         //事件
         grid.onClick.subscribe(function(e, args){
             var gridDatastr=[grid.getData()]
-            // console.log(gridDatastr)
             var id=gridDatastr[0][args.row].id;
             AjaxModal(id)
             RecordGoodes(id)
@@ -353,6 +338,7 @@
             pageIng(url,pagercontent,grid,'',mytranslation,'',order,Thisvleu,'');
         });
         grid.onSelectedRowsChanged.subscribe(function(e,args){
+            console.log(args.rows);
             var selectedRows = args.rows;//点击选中的数据
             if(selectedRows==''){
                 $('.DeleteInput').val('');
@@ -375,31 +361,7 @@
                 pageIng(url,pagercontent,grid,'',mytranslation,'',order,Thisvleu,'');
             }
         });
-        //delete
-        $('.DeleteBtn').on('click',function(){
-            if($('.DeleteInput').val()==''){
-                alert('请选择一行数据');
-                return false;
-            }else{
-                var idcards= $('.DeleteInput').val()
-                $('.deleteModalStr').click(function(){
-                    $.ajax({
-                        url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/deleteUseRecord.mhtml',
-                        type:'get',
-                        dataType:'json',
-                        data:{useRecordIds:idcards},
-                        success:function(data){
-                            if(data.success===true){
-                                window.location.href = window.location.href;
-                            }else{
-                                alert(data.message)
-                            }
-                        }
-                    })
-                })
 
-            }
-        });
 
     });
 }
@@ -408,6 +370,35 @@
     HomeList();
     addGoodsGrid();
 });
+//delete
+
+// console.log(idcards)
+$('.DeleteBtn').on('click',function(){
+    // alert('a')
+    if($('.DeleteInput').val()==''){
+        alert('请选择一行数据');
+        return false;
+    }else{
+        $('.deleteModalStr').click(function(){
+            var idcards= $('.DeleteInput').val()
+            $.ajax({
+                url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/deleteUseRecord.mhtml',
+                type:'get',
+                dataType:'json',
+                data:{useRecordIds:idcards},
+                success:function(data){
+                    if(data.success===true){
+                        window.location.href = window.location.href;
+                    }else{
+                        alert(data.message);
+                        return false
+                    }
+                }
+            })
+
+        })
+    }
+});
 /*add  addGoodsGrid list table*/
 function addGoodsGrid(){
     var AddData = [], columns1=[],visibleColumns1=[];
@@ -710,6 +701,7 @@
 })
 /*details*/
 // 封装动态模态框
+
 function AjaxModal(id){
     var str="";
     $.ajax({
@@ -748,6 +740,26 @@
                 $('#remark').val(datas.remark);//备注
                 $('#reviewTime').val(datas.reviewTimeStr);//审核时间
                 $('#patientName').val(datas.patientName);//姓名
+
+                //权限按钮
+                if(datas.status=='已审核'){
+                   $('#recycle').css('display','none');
+                   $('#audit').css('display','none');
+                   $('#ModifySave').css('display','none');
+                }
+                if(datas.status=='未审核'){
+                    $('#recycle').css('display','inline-block');
+                        $('#audit').css('display','inline-block');
+                        $('#ModifySave').css('display','inline-block');
+                        $('#applicationForm').css('display','inline-block');
+                }
+
+                if(datas.status=='已申请') {
+                    $('#recycle').css('display', 'none');
+                    $('#audit').css('display', 'none');
+                    $('#ModifySave').css('display', 'none');
+                    $('#applicationForm').css('display', 'none');
+                }
             }
         }
 
@@ -835,9 +847,7 @@
                 width:100,
                 minWidth: 100,
                 formatter:function(value,row,index,cumnDef,dataContext){
-                    // console.log(cumnDef)
-                    return '<a  class="Btn_a Btn_details">详情</a>'+
-                        '<a  class="Btn_a Btn_detele"  onclick="OnremoveGood('+value+')">删除</a>'
+                    return '<a  class="Btn_a Btn_detele"  onclick="OnremoveGood('+value+')">删除</a>'
                 },
 
                 cssClass: "cell-title",
@@ -864,7 +874,8 @@
             dataType:'json',
             success:function(data){
                 // console.log(data.rows)
-                $('.ModifiedData').val(JSON.stringify(data.rows))
+                $('.ModifiedData').val(JSON.stringify(data.rows));
+                $('.SaveItme').val(JSON.stringify(data.rows))
                 var database =data.rows;
                 // console.log(database)
                 AllrecordGoods=database;
@@ -907,7 +918,6 @@
                             success:function(data){
                                 var database =data.data
                                 if(data.success===true){
-                                    // console.log(AllrecordGoods)
                                     var AllBarcode =[];
                                     for(var  i=0;i<AllrecordGoods.length;i++){
                                         AllBarcode.push(AllrecordGoods[i].barcode)
@@ -941,8 +951,16 @@
         })
 
 
+
+
     })
 }
+
+// 删除加载使用物品明细（本地删除）
+// function OnremoveGood(Index){
+//     console.log(grid03)
+//
+// }
 //封装修改保存
 function ModifySave(){
     var ModifySaveStr = $('.ModifySaveStr').val();
@@ -1035,22 +1053,24 @@
     // alert('a')
     window.location.reload()
 })
-//删除行
-function DleteRow(id){
-    $.ajax({
-        url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/deleteUseRecord.mhtml',
-        type:'get',
-        dataType:'json',
-        data:{useRecordIds:JSON.stringify(id)},
-        success:function(data){
-            if(data.success===true){
-                window.location.href = window.location.href;
-            }else{
-                alert(data.message)
-            }
-        }
-    })
-}
+// //删除行
+// function DleteRow(id){
+//     $.ajax({
+//         url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/deleteUseRecord.mhtml',
+//         type:'get',
+//         dataType:'json',
+//         data:{useRecordIds:JSON.stringify(id)},
+//         success:function(data){
+//             if(data.success===true){
+//                 window.location.href = window.location.href;
+//             }else{
+//                 alert(data.message)
+//             }
+//         }
+//     })
+// }
+
+
 // 时间插件
 $('#addenteringTime').datetimepicker({
     language: 'zh-CN',
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js
===================================================================
diff -u -r24938 -r25996
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js	(.../sterilization.js)	(revision 24938)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js	(.../sterilization.js)	(revision 25996)
@@ -1,746 +1,1256 @@
-
-//定义alert公用值
-$('#addHandle').click(function(){
-    $('#sterilization').val(currentUserCode)//科室
-    sterilizationListTotal()
-    addallTableDatas();
-
-})
-$(window).resize(function () {
-    $("#table").bootstrapTable('resetView');
-    $("#Goods-table").bootstrapTable('resetView');
-    $("#modalTables").bootstrapTable('resetView');
+$("input[readOnly]").keydown(function(e) {
+    e.preventDefault();
 });
-var sterilerGroup;
-//主页面表格
-var columnArray=[
+//光标默认
+$('#mymodal-data').on('shown.bs.modal', function () {
+    $("#barCode").focus();
+})
+// $('#mymodal-data').on('hidden.bs.modal', function () {
+//     $("#addCleanGetCodeArr").val('');
+//     $('.repetitionBarCod').val('');
+// })
+$('#mymodal-ud').on('shown.bs.modal', function () {
+    $("#udbarCode").focus();
+})
+//ie8浏览器
+$(function(){
+    var browser=navigator.appName
+    var b_version=navigator.appVersion
+    var version=b_version.split(";");
+    var trim_Version=version[1].replace(/[ ]/g,"");
+    if(browser=="Microsoft Internet Explorer" && trim_Version=="MSIE8.0")
     {
-        checkbox: true,
-        field:'ids',
-    },{
-        field: 'sterilizationUser',
-        title: '灭菌员',
-        formatter: function (value,row,index){
-            return '<a  class="color_tbody"  data-toggle="modal" data-target="#mymodal-ud" onclick="ClickName('+row.id+')">'+row.sterilizationUser+'<i class="fa fa-edit"></i> </a>'
-        },
-        align:'center',
-    }, {
-        field: 'startDateStr',
-        title: '开始时间',
-        align:'center',
-        // formatter: operateFormatter //自定义方法，添加操作按钮
-    }, {
-        field: 'endDateStr',
-        title: '结束时间',
-        align:'center',
-    },
-    {
-        field: 'srSituationComfirmer',
-        title: '确认人',
-        align:'center',
-    },
-    {
-        field: 'sterilizationPurpose',
-        title: '灭菌目的',
-        align:'center',
-    },
-    {
-        field: 'sterilizerName',
-        title: '灭菌炉',
-        align:'center',
-    },
-    {
-        field: 'frequency',
-        title: '炉次',
-        align:'center',
-    },
-    {
-        field: 'status',
-        title: '灭菌状态',
-        align:'center',
+        var availableHeight = $(window).height() -window.parent.$(".head-index").height()-window.parent.$(".content-index").height();
+        $('#HomeMyGrid').css('height',availableHeight)
+    }
+})
+var grid,grid1,grid2,grid3,dataView,dataView1,dataView2,options,options1,options2,options3;
+var searchString = "";
+var columns=[],data=[],data1=[];
+var loadData = [];
+var BasketData =[];
+//主页面
+function sterilizationHome() {
+    var checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"});
+    columns.push(checkboxSelector.getColumnDefinition());
+    columns.push(
+            {
+                field: 'sterilizationUser',
+                name: '灭菌员',
+                formatter: function (value,row,index,columnDef,dataContext){
+                    return '<a class="color_tbody" data-target="#mymodal-ud" data-toggle="modal">'+dataContext.sterilizationUser+'<i class="fafa-edit"></i> </a>'
+                },
+                align: 'center',
+            },
+            {
+                field: 'startDateStr',
+                name: '开始时间',
+                align: 'center',
+                // formatter: operateFormatter //自定义方法，添加操作按钮
+            },
+            {
+                field: 'endDateStr',
+                name: '结束时间',
+                align: 'center',
+            },
+            {
+                field: 'srSituationComfirmer',
+                name: '确认人',
+                align: 'center',
+            },
+            {
+                field: 'sterilizationPurpose',
+                name: '灭菌目的',
+                align: 'center',
+            },
+            {
+                field: 'sterilizerName',
+                name: '灭菌炉',
+                align: 'center',
+            },
+            {
+                field: 'frequency',
+                name: '炉次',
+                align: 'center',
+            },
+            {
+                field: 'status',
+                name: '灭菌状态',
+                align: 'center',
 
-    },
-    {
-        field: 'physicsResult',
-        title: '物理监测结果',
-         align:'center',
-    },
-    {
-        field: 'chemistryResult',
-        title: '化学监测结果',
-         align:'center',
-    },
-    {
-        field: 'sterilizationType',
-        title: '灭菌程序',
-         align:'center',
-    },
-    {
-        field: 'amount',
-        title: '灭菌数量',
-         align:'center',
-    },
-    {
-        field: 'parameter',
-        title: '灭菌参数',
-         align:'center',
-    },		    {
-        field: 'remark',
-        title: '备注',
-         align:'center',
-    },
-    {
-        field: 'types',
-        title: '操作',
-        align:'center',
-        formatter: function (value,row,index){
-            return '<a  class="color_tbody" >重新灭菌 </a>'
-        },
-    },
-]
-var InitTable =function(url){
-    //先销毁表格
-    $('#table').bootstrapTable("destroy");
-    //添加表格
-    $('#table').bootstrapTable({
-        url:url,
-        method:'post',//请求方式
-        search:true,//是否搜索
-        pagination: true,//是否分页
-        pageSize: 20,//单页记录数
-        pageList: [5, 10, 20, 50],//分页步进值
-        sidePagination: "server",//服务端分页
-        contentType: "application/x-www-form-urlencoded",//请求数据内容格式 默认是 application/json 自己根据格式自行服务端处理
-        dataType: "json",//期待返回数据类型
-        queryParamsType: "limit",//查询参数组织方式
-        onColumnSwitch:onColumnSwitch,
-        queryParams :queryParams,
-        searchOnEnterKey: "true",//回车搜索
-        showRefresh: "true",//刷新按钮
-        showColumns: true,//列选择按钮
-        minimumCountColumns: 2,  //最少允许的列数
-        clickToSelect: true,//是否启用点击选中行
-        uniqueId: "ID", //每一行的唯一标识，一般为主键列
-        cardView: false,  //是否显示详细视图
-        detailView: false, //是否显示父子表
-        showExport: true,
-        exportDataType: "selected",//导出checkbox选中的行数
-        paginationLoop: false,//是否无限循环
-        columns: columnArray,
-        height:$(window).height()-($('.Nan-content').height()+$('.content-header').height()+87)
-    });
-    return InitTable;
-}
-//jq过滤事件
-var addArray= new Array();
-var array=[];
-function onColumnSwitch(field,checked){
-    var str ={'Name':field,'states':checked}
-    addArray.push(str);
-    Array.prototype.indexOf = function(val) {
-        for (var i = 0; i < this.length; i++) {
-            if (this[i] == val) return i;
-        }
-        return -1;
+            },
+            {
+                field: 'physicsResult',
+                name: '物理监测结果',
+                align: 'center',
+            },
+            {
+                field: 'chemistryResult',
+                name: '化学监测结果',
+                align: 'center',
+            },
+            {
+                field: 'sterilizationType',
+                name: '灭菌程序',
+                align: 'center',
+            },
+            {
+                field: 'amount',
+                name: '灭菌数量',
+                align: 'center',
+            },
+            {
+                field: 'parameter',
+                name: '灭菌参数',
+                align: 'center',
+            },
+            {
+                field: 'remark',
+                name: '备注',
+                align: 'center',
+            },
+            {
+                field: 'types',
+                name: '操作',
+                align: 'center',
+                // width:120,
+                // minWidth:120,
+                formatter: function (value,row,index,columnDef,dataContext) {
+                    var delectArray =[];
+                    delectArray.push(dataContext.id)
+                    return '<a  class="listbtn listbtnM" >重新灭菌 </a>'
+                            // '<a class="listbtn listbtnM"  data-target="#mymodal-ud" data-toggle="modal">详情 </a>'+
+                            // '<a class="listbtn" onclick="DelectRow('+JSON.stringify(delectArray)+')">删除</a>'
+                },
+            }
+         )
+
+    options= {
+        enableCellNavigation: true,
+        enableColumnReorder: false,
+        forceFitColumns: true,
+        rowHeight:35,
     };
-    Array.prototype.remove = function(val) {
-        var index = this.indexOf(val);
-        if (index > -1) {
-            this.splice(index, 1);
+    //自适应
+    var DATAGRID_MIN_HEIGHT = 180;
+    var DATAGRID_MIN_WIDTH = 300;
+    var DATAGRID_BOTTOM_PADDING = 20;
+    function attachAutoResizeDataGrid(grid, gridId, gridContainerId) {
+        var gridDomElm = $('#' + gridId);
+        if (!gridDomElm || typeof gridDomElm.offset() === "undefined") {
+            return null;
         }
-    };
+        resizeToFitBrowserWindow(grid, gridId, gridContainerId);
+        $(window).on("resize", function () {
+            resizeToFitBrowserWindow(grid, gridId, gridContainerId);
+            resizeToFitBrowserWindow(grid, gridId, gridContainerId);
+        });
 
-    for(var i=0;i<addArray.length;i++){
-        if(addArray[i].states===false){
-            array.remove(addArray[i].Name);
+    }
+    function destroyAutoResize() {
+        $(window).trigger('resize').off('resize');
+    }
+    function calculateGridNewDimensions(gridId, gridContainerId) {
+        var availableHeight = $(window).height() - $('#' + gridId).offset().top - DATAGRID_BOTTOM_PADDING-window.parent.$(".head-index").height()-window.parent.$(".content-index").height();
+        var availableWidth = $('#' + gridContainerId).width();
+
+        var newHeight = availableHeight;
+        var newWidth = availableWidth;
+
+        if (newHeight < DATAGRID_MIN_HEIGHT) {
+            newHeight = DATAGRID_MIN_HEIGHT;
         }
-        if(addArray[i].states===true){
-            array.push(addArray[i].Name);
+        if (newWidth < DATAGRID_MIN_WIDTH) {
+            newWidth = DATAGRID_MIN_WIDTH;
         }
+
+        return {
+            height: newHeight,
+            width: newWidth
+        };
     }
-    $('#hiddens').val(JSON.stringify(array));
+    function resizeToFitBrowserWindow(grid, gridId, gridContainerId) {
+        var newSizes = calculateGridNewDimensions(gridId, gridContainerId);
+        if (newSizes) {
+            $('#' + gridId).height(newSizes.height);
+            $('#' + gridId).width(newSizes.width);
+            if (new RegExp('MSIE [6-8]').exec(navigator.userAgent) === null && grid) {
+                grid.resizeCanvas();
+            }
+        }
+    }
+//配置
+    function isIEPreVer8() { var v = navigator.appVersion.match(/MSIE ([\d.]+)/i); return (v ? v[1] < 8 : false); }
+    var sortcol = "name";
+    var sortdir = 1;
+    var percentCompleteThreshold = 0;
+    var searchString = "";
+    function requiredFieldValidator(value) {
+        if (value == null || value == undefined || !value.length) {
+            return {valid: false, msg: "This is a required field"};
+        }
+        else {
+            return {valid: true, msg: null};
+        }
+    }
+    function myFilter(item, args) {
+        if (item["percentComplete"] < args.percentCompleteThreshold) {
+            return false;
+        }
 
+        if (args.searchString != "" && item["name"].indexOf(args.searchString) == -1) {
+            return false;
+        }
+
+        return true;
+    }
+    $(function () {
+        $.support.cors = true;
+        dataView = new Slick.Data.DataView({ inlineFilters: true });
+        grid = new Slick.Grid("#HomeMyGrid", dataView, columns, options);
+        attachAutoResizeDataGrid(grid, "HomeMyGrid", "gridContainer");
+        grid.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
+        grid.registerPlugin(checkboxSelector);
+        var mytranslation = {
+            pagelabel: "页",
+            currentpage: "当前页",
+            refresh: "刷新",
+            recordstatelabel: "显示",
+            currentrecords: "显示/隐藏当前记录状态",
+            perpage: "每页条数",
+            pageminus: "上一页",
+            pageplus: "下一页",
+            resultset_first: "第一页",
+            resultset_prev: "上一页",
+            resultset_next: "下一页",
+            resultset_last: "最后一页"
+        };
+        var pagercontent =$("#pager");
+        var url=WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/findSterilizationRecordList.mhtml';
+        var search='',searchFields='',order ='desc';
+        function pageIng(remoteUrl,container,datagrid,pagerType,trans,params,order,search,searchFields){
+            new Slick.Controls.EnhancementPager({
+                container: container,
+                remoteUrl:remoteUrl,
+                datagrid: datagrid,
+                pagerType: pagerType,
+                trans: trans, //i18n support
+                params:params,
+                limt:25,
+                order:order,
+                search:search,
+                searchFields:searchFields,
+            });
+        }
+        pageIng(url,pagercontent,grid,'',mytranslation,'',order,'','');
+        dataView.beginUpdate();
+        dataView.setItems(data);
+        dataView.setFilterArgs({
+            percentCompleteThreshold: percentCompleteThreshold,
+            searchString: searchString
+        });
+        dataView.setFilter(myFilter);
+        dataView.endUpdate();
+        dataView.syncGridSelection(grid, true);
+        $("#gridContainer").resizable();
+
+        //事件
+        grid.onSelectedRowsChanged.subscribe(function(e,args){
+            var selectedRows = args.rows;//点击选中的数据
+            if(selectedRows==''){
+                $('.SelectckData').val('');
+                $('.SelectckStatus').val('');
+                $('.detailsId').val('');
+            }else{
+                var itemId = new Array();
+                var GridData = grid.getData();//得到的数据
+                for (var i = 0; i < selectedRows.length; i++) {
+                    // console.log(GridData[selectedRows[i]])
+                    itemId.push(GridData[selectedRows[i]].id)
+                    $('.SelectckData').val(JSON.stringify(itemId));
+                    $('.SelectckStatus').val(GridData[selectedRows[i]].status)
+                    $('.detailsId').val(GridData[selectedRows[i]].id)
+                }
+
+            }
+        })
+        grid.onClick.subscribe(function(e, args){
+            console.log(args)
+            var gridDatastr=[grid.getData()]
+            var id=gridDatastr[0][args.row].id;
+            var status=gridDatastr[0][args.row].status;
+            if(status=='灭菌完成'){
+                alert('不能修改灭菌完成')
+            }
+            AjaxModal(id);
+            particularsGrid(id);
+
+
+        })
+
+    });
 }
-function queryParams(params) {
-    var temp = {   //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
-        limit: params.limit,   //页面大小
-        offset: params.offset,  //页码
-        pageSize: this.pageSize,
-        pageNumber: this.pageNumber,
-        search:params.search,
-        searchFields:$('#hiddens').val(),
+$(function(){
+    sterilizationHome();
+})
+//完成灭菌
+$('#completes').click(function(){
+    if($('.SelectckData').val()==''){
+        alert('至少选择一条灭菌的数据');
+        return false;
+    }else{
+       $('.SvaComplete').click(function(){
+           if($('.SelectckStatus').val()==='灭菌完成'){
+               alert('此条记录已经完成灭菌');
+               return false;
+           }else{
+               $.ajax({
+                   url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/completeSterilizationGoods.mhtml',
+                   type:'get',
+                   dataType:'json',
+                   data:{sterilizationRecordIds:$('.SelectckData').val()},
+                   success:function(data){
+                       if(data.success===true){
+                           window.location.href = window.location.href;
+                       }else{
+                           alert(data.message)
+                       }
+                   }
+               })
+           }
 
-    };
-    return temp;
+       })
+    }
+})
+//灭菌中断
+$('#interrupts').click(function(){
+    if($('.SelectckData').val()==''){
+        alert('至少选择一条灭菌的数据');
+        return false;
+    }else{
+        $('.SaveInterrupt').click(function(){
+           $.ajax({
+                    url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/interruptSterilizationRecord.mhtml',
+                    type:'get',
+                    dataType:'json',
+                    data:{sterilizationRecordId:$('.SelectckData').val()},
+                    success:function(data){
+                        if(data.success===true){
+                            window.location.href = window.location.href;
+                        }else{
+                            alert(data.message)
+                        }
+                    }
+                })
+
+        })
+    }
+})
+//删除灭菌
+$('#Deletings').click(function(){
+    if($('.SelectckData').val()==''){
+        alert('至少选择一条需要删除的数据');
+        return false;
+    }else{
+        $('.SaveDeletings').click(function(){
+            $.ajax({
+                url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/deleteSterilizationRecord.mhtml',
+                type:'get',
+                dataType:'json',
+                data:{sterilizationRecordIds:$('.SelectckData').val()},
+                success:function(data){
+                    if(data.success===true){
+                        window.location.href = window.location.href;
+                    }else{
+                       alert(data.message)
+                    }
+                }
+            })
+        })
+
+    }
+})
+//灭菌物品列表
+//父子表
+options1 = {
+    enableCellNavigation: true,
+    enableColumnReorder: false,
+    rowHeight:35
+};
+var indent = 0;
+var parents = [];
+var checkboxSelector;
+var columns1 = [
+    {id: "barcode", name: "条码", minWidth:120,field: "barcode",formatter:TaskNameFormatter},
+    {id: "name", name: "名称", minWidth:120,field: "name",},
+    {id: "sterilingMode",minWidth:120, name: "灭菌方式", field: "sterilingMode", },
+    {id: "amount", name: "数量", field: "amount"},
+    {id: "type", name: "操作", minWidth:140,cssClass: "cell-effort-driven",
+        field: "type",
+        formatter: function (value,row,index,columnDef,dataContext){
+            return'<a class="listbtn" onclick="DleteRow()">删除 </a>'
+        },
+    }
+];
+var addCleanBasketgrid;
+var addCleanBasketOption = {
+    enableCellNavigation: true,
+    enableColumnReorder: false,
+    forceFitColumns: true,
+    editable: true,
+    enableAddRow: false,
+    asyncEditorLoading: true,
+    topPanelHeight: 35,
+    autoEdit: false,
+    rowHeight:35,
+};
+var searchString = "";
+var AllsterzationGood=[];
+var BasketData=[];
+function percentCompleteSort(a, b) {
+    return a["percentComplete"] - b["percentComplete"];
 }
-var url=WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/findSterilizationRecordList.mhtml';
-InitTable(url);
-for (var i = 0; i < columnArray.length; i++) {
-    // array.push(columnArray[i]["field"])
+function requiredFieldValidator(value) {
+    if(value == null || value == undefined || !value.length){
+        return{
+            valid: false,
+            msg: "This is a required field"
+        };
+    }
+    else{
+        return{
+            valid: true,
+            msg: null
+        };
+    }
 }
-$('#hiddens').val(JSON.stringify(array));
-//今天审核的待灭菌物品 add
-$(function() {
-    $(function() {
-        var oTableInit = new Object();
-        var oInit = new Object();
-        $('#sterilized').bootstrapTable({
-            detailView: true, //父子表
-            striped: true, //是否显示行间隔色
-            sortOrder: "asc", //排序方式
-            pageNumber: 1, //初始化加载第一页，默认第一页
-            height: 480,
-            columns: [{
-                field: 'no',
-                title: '条码',
-                align: 'center',
-            }, {
-                field: 'type',
-                title: '名称',
-                align: 'left',
+function TaskNameFormatter(row, cell, value, columnDef, dataContext){
+    //如果没有数据，就都返回
+    if (value == null || value == undefined || dataContext === undefined) { return ""; }
 
-            }, {
-                field: 'name',
-                title: '灭菌方式',
-                align: 'center',
+    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>";
 
-            }, {
-                field: 'money',
-                title: '数量',
-                align: 'center',
 
-            },{
-                field: 'operation',
-                title: '操作',
-                align: 'center',
-            }
+    //根据ID获取此行内容的索引值
+    var idx = dataView1.getIdxById(dataContext.id);
+    if (loadData[idx + 1] && loadData[idx + 1].indent > loadData[idx].indent) {
 
-            ],
-            data: [
-                { "no": "FF21135", "type": "生产单元一", "name": "PVHI", "money": 35},
-                { "no": "FF21135", "type": "生产单元一", "name": "PVHI", "money": 35},
-                { "no": "FF21135", "type": "生产单元一", "name": "PVHI", "money": 35},
-                { "no": "FF21135", "type": "生产单元一", "name": "PVHI", "money": 35},
-                { "no": "FF21135", "type": "生产单元一", "name": "PVHI", "money": 35},
-                { "no": "FF21135", "type": "生产单元一", "name": "PVHI", "money": 35},
-                { "no": "FF21135", "type": "生产单元一", "name": "PVHI", "money": 35},
-                { "no": "FF21135", "type": "生产单元一", "name": "PVHI", "money": 35},
-                { "no": "FF21135", "type": "生产单元一", "name": "PVHI", "money": 35}
-            ],
-            onExpandRow: function(index, row, $detail) {
-                oTableInit.InitSubTable(index, row, $detail);
+        //如果data中对应的内容不为空，并且此行缩进大于上一行的缩进
+        if (dataContext._collapsed) {
 
+            return spacer + "<span class='toggle expand'></span>&nbsp;<span style='display:inline-block;'>"+value+"</span>" ;//收缩
+        } else {
+            return spacer + " <span class='toggle collapse'></span>&nbsp;<span style='display:inline-block;'>"+value+"</span>";//展开
+        }
+    } else {
+        return spacer + " <span class='toggle'></span>&nbsp;<span>"+value+"</span>";
+    }
+}
+function myFilter(item) {
+    if(item.parent != null){
+        var parent = loadData[item.parent];
+        while(parent){
+            if(parent._collapsed){
+                return false;
             }
+            parent = data[parent.parent];
+        }
+    }
+    return true;
+}
+function addCleanBaskets(data){
+    loadData=[];
+    indent = 0;
+    var tempId = 0;
+    for(var  i=0;i<data.length;i++){
+        if(!data[i].children){
+            var d = (loadData[tempId] = {});
+            var parentId = tempId;
+            d["id"] = tempId;
+            d["name"] = data[i].name;
+            d["indent"] = 0;
+            d["parent"] = null;
+            d["barcode"]=data[i].barcode;
+            d["sterilingMode"]=data[i].sterilingMode;
+            d["amount"]= data[i].amount;
+            d["type"]= "";
+            tempId ++;
+        }else{
+            var d = (loadData[tempId] = {});
+            var parentId = tempId;
+            d["id"] = tempId;
+            d["name"] = data[i].name;
+            d["indent"] = 0;
+            d["parent"] = null;
+            d["barcode"]=data[i].barcode;
+            d["sterilingMode"]=data[i].sterilingMode;
+            d["amount"]= data[i].amount;
+            d["type"]= "";
+            tempId ++;
+            var childrens = data[i].children;
+            if (childrens != undefined || childrens.length > 0) {
+                for(var j=0; j < childrens.length; j++){
+                    var k = (loadData[tempId] = {});
+                    k["id"] =(Math.random()*10000000);
+                    k["indent"] = 1;
+                    k["parent"] = parentId;
+                    k["name"]=childrens[j].name;
+                    k["barcode"]=childrens[j].barcode;
+                    k["sterilingMode"]=childrens[j].sterilingMode;
+                    k["amount"]=childrens[j].amount;
+                    k["type"]="";
+                    tempId ++;
+                }
+            }
+        }
 
-        });
-        oTableInit.InitSubTable=function (index,row,$detail){
-            var cur_table = $detail.html('<table></table>').find('table');
-            var html = "";
-            html += "<table class='table childTable'>";
-            html += "<thead>";
-            html += "<tr>";
-            html += "<th><a class='mainName' data-toggle='modal' data-target='#myModal2'>李秀</a></th>";
-            html += "<th>21</th>";
-            html += "<th>1233</th>";
-            html += "<th>ds</th>";
-            html += "<th>jaaa</th>";
-            html += "<th>耐酸水泥砂浆</th>";
-            html += "<th>21122222</th>";
-            html += "</tr>";
-            html += "</thead>";
-            $detail.html(html);
+    }
+    dataView1.beginUpdate();
+    dataView1.setItems(loadData);
+    dataView1.setFilter(myFilter);
+    dataView1.endUpdate();
+}
+function addCleanAfterAjax(){
+    dataView1 = new Slick.Data.DataView({ inlineFilters: true });
+
+    addCleanBasketgrid = new Slick.Grid("#sterilizationListTbale", dataView1, columns1, addCleanBasketOption);
+
+    dataView1.onRowsChanged.subscribe(function (e, args) {
+        addCleanBasketgrid.invalidateRows(args.rows);
+        addCleanBasketgrid.render();
+    });
+
+    dataView1.onRowCountChanged.subscribe(function (e, args) {
+        addCleanBasketgrid.updateRowCount();
+        addCleanBasketgrid.render();
+    });
+
+    addCleanBasketgrid.onCellChange.subscribe(function (e, args) {
+        dataView1.updateItem(args.item.id, args.item);
+    });
+
+    addCleanBasketgrid.onClick.subscribe(function (e, args) {
+        if($(e.target).hasClass("toggle")){
+            var item = dataView1.getItem(args.row);
+            if(item){
+                if(!item._collapsed){
+                    item._collapsed = true;
+                }
+                else{
+                    item._collapsed = false;
+                }
+                dataView1.updateItem(item.id, item);
+            }
+            e.stopImmediatePropagation();
         }
     });
-});
-//中断记录列表add
-$('#Interruptrecord').bootstrapTable({
-    striped: true,                      //是否显示行间隔色
-    cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-    height: 200,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
-    uniqueId: "id",                     //每一行的唯一标识，一般为主键列
-    detailView: false,                   //是否显示父子表
-    removeByUniqueId:1,
-    columns: [
-        {
-            field: 'tiaoma',
-            title: '操作人'
-        }, {
-            field: 'name',
-            title: '中断时间',
-        }, {
-            field: 'fangshi',
-            title: '中断完成时间'
-        },
-        {
-            field: 'total',
-            title: '中断类型'
-        },
-        {
-            field: 'zuoz',
-            title: '质量监测记录'
+    //自适应
+    //attachAutoResizeDataGrid(addCleanBasketgrid, "addCleanBasketGrid", "addCleanBasketContainer");
+
+};
+//扫描条码
+$("#barCode").keydown(function(e){
+    if(e.keyCode == 13){
+        if($(this).val()==''){
+            alert('请输入条码');
+            return false;
+        } else{
+
+            if($('.repetitionBarCod').val()==$(this).val()){
+                alert('不能重复输入条码');
+                return false;
+            }else{
+                var addItem;
+                $.ajax({
+                    url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
+                    type:"get",
+                    dataType:'json',
+                    data:{barcode:$(this).val()},
+                    success:function(data){
+                        if(data.success===true){
+                            addItem = data.rows[0];
+                            var AllBarcode =[];
+                            for(var  i=0;i<AllsterzationGood.length;i++){
+                                AllBarcode.push(AllsterzationGood[i].barcode)
+                            }
+                            for(var j=0;j<AllBarcode.length;j++){
+                                if(AllBarcode[j]==$('#barCode').val()){
+                                    $('#barCode').val('')
+                                    alert('这条'+$('#barCode').val()+'已经存在表格中');
+                                    addCleanBaskets(AllsterzationGood);
+                                    return false;
+                                }
+                            }
+                            if($('#procedure').val()==null||$('#procedure').val()==''){
+                                alert('灭菌程序不能为空');
+                                $('#barCode').val("")
+                                return false;
+                            }
+                            if($('#procedure').val()!=addItem.sterilingType){
+                                alert(data.barcodeType+[addItem.name]+'的灭菌程序和所选的灭菌程序不同')
+                            }
+                            if(data.barcodeType==='用户'){
+                                $('#sterilization').val(addItem.name);
+                                $('#barCode').val("");
+                                $('.repetitionBarCod').val($('#barCode').val())
+                                return false
+                            }
+                            if(data.barcodeType==='灭菌架'){
+                                $('#sterilization').val(addItem.name);
+                                $('#barCode').val("")
+                                $('.repetitionBarCod').val($('#barCode').val())
+                                return false
+                            }
+                            if(data.barcodeType==='器械包'){
+                                BasketData.push(addItem);
+                                addCleanBaskets(BasketData);
+                                $("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
+                                AllsterzationGood.push(addItem)
+                                $('.repetitionBarCod').val($('#barCode').val())
+                                $('#barCode').val("")
+                                addallTableDatas();
+                                return false
+                            }
+                            if(data.barcodeType==='灭菌篮筐'){
+                                BasketData.push(addItem);
+                                addCleanBaskets(BasketData);
+                                $("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
+                                AllsterzationGood.push(addItem)
+                                $('.repetitionBarCod').val($('#barCode').val())
+                                $('#barCode').val("")
+                                addallTableDatas();
+                                return false
+                            }
+
+                        } else{
+                            alert(data.message);
+                            return false;
+                        }
+
+                    }
+                });
+                addCleanAfterAjax();
+            }
+
         }
-    ],
-    data: [{tiaoma: '010004105',name: '灭菌筐02灭菌筐02灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'}
-    ],
+
+    }
 });
-// add 卸载物品统计列表
-$('#uninstall').bootstrapTable({
-    striped: true,                      //是否显示行间隔色
-    cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-    sortOrder: "asc",                   //排序方式
-    height: 620,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
-    uniqueId: "id",                     //每一行的唯一标识，一般为主键列
-    // showToggle:true,                    //是否显示详细视图和列表视图的切换按钮
-    // cardView: false,                    //是否显示详细视图
-    detailView: false,                   //是否显示父子表
-    removeByUniqueId:1,
-    columns: [
-        {
-            field: 'tiaoma',
-            title: '条码'
-        }, {
-            field: 'name',
-            title: '名称',
-        }, {
-            field: 'fangshi',
-            title: '科室'
-        },
-        {
-            field: 'total',
-            title: '数量'
+//父子表end
+//修改灭菌信息
+function  particularsGrid(obj){
+    var BasketData =[];
+    var columns1 = [
+        {id: "barcode", name: "条码", minWidth:120,field: "barcode",formatter:TaskNameFormatter},
+        {id: "name", name: "名称", minWidth:120,field: "name",},
+        {id: "sterilingMode",minWidth:120, name: "灭菌方式", field: "sterilingMode", },
+        {id: "amount", name: "数量", field: "amount"},
+        {id: "type", name: "操作", minWidth:120,cssClass: "cell-effort-driven", field: "type"}
+    ];
+    var sterilizationGird;
+    function requiredFieldValidator(value) {
+        if(value == null || value == undefined || !value.length){
+            return{
+                valid: false,
+                msg: "This is a required field"
+            };
         }
-    ],
-    data: [{tiaoma: '010004105',name: '灭菌筐02灭菌筐02灭菌筐02',fangshi: '高温',total:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1'},
-        {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1'}
-    ],
-});
-//中断记录列表details
-$('#udInterruptrecord').bootstrapTable({
-    striped: true,                      //是否显示行间隔色
-    cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-    sortOrder: "asc",                   //排序方式
-    height: 200,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
-    uniqueId: "id",                     //每一行的唯一标识，一般为主键列
-    detailView: false,                   //是否显示父子表
-    removeByUniqueId:1,
-    columns: [
-        {
-            field: 'tiaoma',
-            title: '操作人'
-        }, {
-            field: 'name',
-            title: '中断时间',
-            // formatter: operateFormatter //自定义方法，添加操作按钮
-        }, {
-            field: 'fangshi',
-            title: '中断完成时间'
-        },
-        {
-            field: 'total',
-            title: '中断类型'
-        },
-        {
-            field: 'zuoz',
-            title: '质量监测记录'
+        else{
+            return{
+                valid: true,
+                msg: null
+            };
         }
-    ],
+    }
+    function TaskNameFormatter(row, cell, value, columnDef, dataContext){
+        //如果没有数据，就都返回
+        if (value == null || value == undefined || dataContext === undefined) { return ""; }
+        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>";
+        //根据ID获取此行内容的索引值
+        var idx = dataView2.getIdxById(dataContext.id);
+        if (loadData[idx + 1] && loadData[idx + 1].indent > loadData[idx].indent) {
+            // console.log(loadData)
+            //如果data中对应的内容不为空，并且此行缩进大于上一行的缩进
+            if (dataContext._collapsed) {
 
-});
-//今天审核的待灭菌物品 details
-$(function(){
-    var zedAlert={};
+                return spacer + "<span class='toggle expand'></span>&nbsp;<span style='display:inline-block;'>"+value+"</span>" ;//收缩
+            } else {
+                return spacer + " <span class='toggle collapse'></span>&nbsp;<span style='display:inline-block;'>"+value+"</span>";//展开
+            }
+        } else {
+            return spacer + " <span class='toggle'></span>&nbsp;<span>"+value+"</span>";
+        }
+    }
+    function myFilter(item) {
+        if(item.parent != null){
+            var parent = loadData[item.parent];
+            while(parent){
+                if(parent._collapsed){
+                    return false;
+                }
+                parent = loadData[parent.parent];
+            }
+        }
+        return true;
+    }
+    function addCleanBaskets(data){
+        if(data==''){
+            loadData=[];
+            return false;
+        }
+        loadData=[];
+        indent = 0;
+        var tempId = 0;
+        for(var  i=0;i<data.length;i++){
+            if(!data[i].children){
+                var d = (loadData[tempId] = {});
+                var parentId = tempId;
+                d["id"] = tempId;
+                d["name"] = data[i].name;
+                d["indent"] = 0;
+                d["parent"] = null;
+                d["barcode"]=data[i].barcode;
+                d["sterilingMode"]=data[i].sterilingMode;
+                d["amount"]= data[i].amount;
+                d["type"]= "";
+                tempId ++;
+            }else{
+                var d = (loadData[tempId] = {});
+                var parentId = tempId;
+                d["id"] = tempId;
+                d["name"] = data[i].name;
+                d["indent"] = 0;
+                d["parent"] = null;
+                d["barcode"]=data[i].barcode;
+                d["sterilingMode"]=data[i].sterilingMode;
+                d["amount"]= data[i].amount;
+                d["type"]= "";
+                tempId ++;
+                var childrens = data[i].children;
+                if (childrens != undefined || childrens.length > 0) {
+                    for(var j=0; j < childrens.length; j++){
+                        var k = (loadData[tempId] = {});
+                        k["id"] =(Math.random()*10000000);
+                        k["indent"] = 1;
+                        k["parent"] = parentId;
+                        k["name"]=childrens[j].name;
+                        k["barcode"]=childrens[j].barcode;
+                        k["sterilingMode"]=childrens[j].sterilingMode;
+                        k["amount"]=childrens[j].amount;
+                        k["type"]="";
+                        tempId ++;
+                    }
+                }
+            }
+
+        }
+        dataView2 = new Slick.Data.DataView({ inlineFilters: true });
+        sterilizationGird = new Slick.Grid("#udsterilizationListTbale",dataView2, columns1, addCleanBasketOption);
+        dataView2.onRowsChanged.subscribe(function (e, args) {
+            sterilizationGird.invalidateRows(args.rows);
+            sterilizationGird.render();
+        });
+        dataView2.onRowCountChanged.subscribe(function (e, args) {
+            sterilizationGird.updateRowCount();
+            sterilizationGird.render();
+        });
+        sterilizationGird.onCellChange.subscribe(function (e, args) {
+            dataView2.updateItem(args.item.id, args.item);
+        });
+        sterilizationGird.onClick.subscribe(function (e, args) {
+            if($(e.target).hasClass("toggle")){
+                var item = dataView2.getItem(args.row);
+                if(item){
+                    if(!item._collapsed){
+                        item._collapsed = true;
+                    }
+                    else{
+                        item._collapsed = false;
+                    }
+                    dataView2.updateItem(item.id, item);
+                }
+                e.stopImmediatePropagation();
+            }
+        });
+        dataView2.setItems(loadData);
+        dataView2.setFilter(myFilter);
+        sterilizationGird.render()
+    }
+    var AllsterzationGood=[];
+    var addItem;
     $.ajax({
-        // url:'http://rap2api.taobao.org/app/mock/85153/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationRecord.mhtml',
-        type:'get',
+        url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationGoods.mhtml',
+        type:"get",
         dataType:'json',
-        async:true,
+        data:{id:obj},
         success:function(data){
-            var datas =data.rows;
             if(data.success===true){
-                $("#udsterilized").bootstrapTable("load", datas)
-            }else{
-                if(zedAlert.dialog13){
-                    return zedAlert.dialog13.show();
+                if(data.rows.length<=0){
+                    addCleanBasket1();
+                    allTableDatas();
+                    return false;
+                }else{
+                    for(var i=0;i<data.rows.length;i++){
+                        additemGood.push(data.rows[i])
+                        $('.AllData').val(JSON.stringify(additemGood))
+                        BasketData.push(data.rows[i])
+                        AllsterzationGood.push(data.rows[i])
+                    }
+                    addCleanBaskets(BasketData);
+                    allTableDatas();
                 }
-                zedAlert.dialog13 = jqueryAlert({
-                    'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                    'content' : data.message,
-                    'closeTime' : 3000,
-                    'option':'absolute',
-                })
+
+            } else{
+                alert(data.message);
+                return false;
             }
 
         }
-    })
-})
-$(function() {
-    //先销毁表格，在初始化
-    $(function() {
-        var oTableInit = new Object();
-        var oInit = new Object();
-        $('#udsterilized').bootstrapTable({
-            detailView: true, //父子表
-            striped: true, //是否显示行间隔色
-            sortOrder: "asc", //排序方式
-            pageNumber: 1, //初始化加载第一页，默认第一页
-            height: 480,
-            columns: [{
-                field: 'barcode',
-                title: '条码',
-                align: 'center',
-            }, {
-                field: 'name',
-                title: '名称',
-                align: 'left',
+    });
+    var additemGood =[];
+    $("#udbarCode").keydown(function(e){
+        if(e.keyCode == 13){
+            if($(this).val()==''){
+                alert('请输入条码');
+                return false;
+            }else{
+                if($('.repetitionBarCod').val()==$(this).val()){
+                    alert('不能输入重复条码');
+                    return false;
+                }else{
+                    var addItem;
+                    $.ajax({
+                        url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
+                        type:"get",
+                        dataType:'json',
+                        data:{barcode:$(this).val()},
+                        success:function(data){
+                            if(data.success===true){
+                                addItem = data.rows[0];
+                                var AllBarcode =[];
+                                for(var  i=0;i<AllsterzationGood.length;i++){
+                                    AllBarcode.push(AllsterzationGood[i].barcode)
+                                }
+                                var AllBarcodd=[];
+                                for(var j=0;j<AllBarcode.length;j++){
+                                    // AllBarcodd.push(AllBarcode[j])
+                                    if(AllBarcode[j]==$('#udbarCode').val()){
+                                        $('#barCode').val('')
+                                        alert('这条'+$('#barCode').val()+'已经存在表格中');
+                                        return false;
+                                        addCleanBaskets(AllsterzationGood);
 
-            }, {
-                field: 'name',
-                title: '灭菌方式',
-                align: 'center',
+                                    }
 
-            }, {
-                field: 'amount',
-                title: '数量',
-                align: 'center',
 
-            },{
-                field: 'loads',
-                title: '载入',
-                align: 'center',
-            },{
-                field: 'reviewTime',
-                title: '审核时间',
-                align: 'center',
-            },{
-                field: 'isUrgentTousse',
-                title: '加急',
-                align: 'center',
-            },{
-                field: 'types',
-                title: '操作',
-                align: 'center',
+                                }
+                                // console.log(AllBarcodd)
+                                // if($('#procedure').val()==null||$('#procedure').val()==''){
+                                //     alert('灭菌程序不能为空');
+                                //     $('#barCode').val("")
+                                //     return false;
+                                // }
+                                // if($('#procedure').val()!=addItem.sterilingType){
+                                //     alert(data.barcodeType+[addItem.name]+'的灭菌程序和所选的灭菌程序不同')
+                                // }
+                                if(data.barcodeType==='用户'){
+                                    $('#udsterilization').val(addItem.name);
+                                    $('.repetitionBarCod').val($('#udbarCode').val());
+                                    $('#udbarCode').val("");
+                                    return false;
+                                }
+                                if(data.barcodeType==='灭菌架'){
+                                    $('#udsterilizationName').val(addItem.name);
+                                    $('.repetitionBarCod').val($('#udbarCode').val());
+                                    $('#udbarCode').val("");
+                                    return false;
+                                }
+                                if(data.barcodeType==='器械包'){
+                                    additemGood.push(addItem);
+                                    BasketData.push(addItem);
+                                    addCleanBaskets(BasketData);
+                                    $('.repetitionBarCod').val($('#udbarCode').val());
+                                    AllsterzationGood.push(addItem);
+                                    $('#udbarCode').val("");
+                                    $('.AllData').val(JSON.stringify(additemGood));
+                                    allTableDatas();
+                                    return false;
+                                }
+                                if(data.barcodeType==='灭菌篮筐'){
+                                    additemGood.push(addItem);
+                                    BasketData.push(addItem);
+                                    addCleanBaskets(BasketData);
+                                    $('.repetitionBarCod').val($('#udbarCode').val());
+                                    AllsterzationGood.push(addItem);
+                                    $('#udbarCode').val("");
+                                    $('.AllData').val(JSON.stringify(additemGood));
+                                    allTableDatas();
+                                    return false;
+                                }
+                            } else{
+                                alert(data.message);
+                                return false;
+                            }
+                        }
+                    });
+                    addCleanAfterAjax();
+                }
+
             }
-            ],
+        }
+    });
+//父子表end
+}
+//默认加载表格
+$('#addHandle').click(function(){
+    $('#sterilization').val(currentUserCode)//科室
+    addCleanBasket();
+    addallTableDatas()
+})
+function addCleanBasket(){
+    var mrdata = [];
+    grid1 = new Slick.Grid("#sterilizationListTbale", BasketData, columns1, options1);
+}
+function addCleanBasket1(){
+    var mrdata = [];
+    grid1 = new Slick.Grid("#udsterilizationListTbale", mrdata, columns1, options1);
+}
+//统计数据
+var columns5 = [
+    {id: "name", name: "器械包统计名称", minWidth:290,field: "name"},
+    {id: "amount", name: "数量", minWidth:290,field: "amount",},
+];
+options3 = {
+    enableCellNavigation: true,
+    enableColumnReorder: false,
+    rowHeight:35,
+};
+function addallTableDatas(){
+    var allTableDatas
+    if($('#addCleanGetCodeArr').val()===''){
+        allTableDatas=[]
+    }else{
+        allTableDatas= JSON.parse($('#addCleanGetCodeArr').val());
+    }
+    var alltotle=[] ,allchildren=[],countResult={},countResults=[] ,countResultall;
+    if(allTableDatas==''){
+        $('#addsterils_1').text('0');
+        $('#addsterils_2').text('0');
+        $('#addsterils_3').text('0');
+        $('#addsterils_4').text('0');
+        $('#addsterils_5').text('0');
+        $('#addsterilslor').text('0');
+        countResultall="没有数据"
+        $('#countResults').val(countResultall)
+    }else {
+        for(var i =0; i < allTableDatas.length; i++){
+            var objs =allTableDatas[i]
+            if(allTableDatas[i].type===1){
+                alltotle.push(allTableDatas[i].type)
+                for(var j=0;j<objs.children.length;j++){
+                    allchildren.push(objs.children[j])
+                    //获取children的数据进行统计
+                    var objChildren =objs.children[j]
+                    if(countResult[objChildren.name]){
+                        countResult[objChildren.name]=countResult[objChildren.name] + 1;
+                    }else{
+                        countResult[objChildren.name]=1;
+                    }
+                }
+            }else{
 
-            onExpandRow: function(index, row, $detail) {
-                oTableInit.InitSubTable(index, row, $detail);
+                if(objs.type===2){
+                    allchildren.push(objs.type)
+                    if(countResult[objs.name]){
+                        countResult[objs.name]=countResult[objs.name]+1;
+                    }else{
+                        countResult[objs.name]=1;
+                    }
 
+                }
             }
+        }
+        $('#addsterils_1').text(alltotle.length);
+        $('#addsterils_2').text(allchildren.length);
+        $('#addspan_color').text(allchildren.length);
+        var countResultarr =countResult
+        for (var prop in countResultarr) {
+            countResults.push({'id':Math.floor(Math.random()*100000),'name':prop,"amount":countResultarr[prop]})
+        }
+        countResultall= JSON.stringify(countResults)
+        $('#countResults').val(countResultall)
 
-        });
-        oTableInit.InitSubTable=function (index,row,$detail){
-            var cur_table = $detail.html('<table></table>').find('table');
-            var html = "";
-            html += "<table class='table childTable'>";
-            $.ajax({
-            	 url:WWWROOT+'disinfectSystem/tousseInstanceController/getTodayPendingSterilizationTousseAndBasket.mhtml',
-                type:'post',
-                async:false,
-                dataType:'json',
-                success:function(data){
-                    var datas =data.data[index].children;
-                    for (var i=0;i<datas.length;i++){
-                        if(data.success===true){
-                            html += "<tbody>";
-                            html += "<tr>";
-                            html += "<td></td>";
-                            html += "<td>"+datas[i].barcode+"</td>";
-                            html += "<td>"+datas[i].name+"</td>";
-                            html += "<td>"+datas[i].typeForSterilizationStatistics+"</td>";
-                            html += "<td>"+datas[i].amount+"</td>";
-                            html += "<td></td>";
-                            html += "<td>"+datas[i].reviewTime+"</td>";
-                            html += "<td>-</td>";
-                            html += "<td>-</td>";
-                            html += "</tr>";
-                        }
-                        html += "</tbody>";
-                        $detail.html(html);
+    }
+    var Json =$('#countResults').val();
+    var mrdata1=[];
+    var mrdata3=[];
+
+
+    if(Json==='没有数据'){
+        mrdata3=[];
+        grid3 = new Slick.Grid("#sterilizationListTotal", mrdata3, columns5, options3);
+        mrdata1=[];
+    }else{
+
+
+        grid3 = new Slick.Grid("#sterilizationListTotal", mrdata1, columns5, options3);
+        var countResultsAll= JSON.parse(Json)
+        var databaseGood=[];
+        for(var k=0;k<countResultsAll.length;k++){
+            mrdata1.push(countResultsAll[k])
+        }
+        grid3.setData(mrdata1);
+        grid3.render();
+    }
+
+}
+function allTableDatas(){
+    var allTableDatas
+    if($('.AllData').val()===''){
+        allTableDatas=[]
+    }else{
+        allTableDatas= JSON.parse($('.AllData').val());
+    }
+    var alltotle=[] ,allchildren=[],countResult={},countResults=[] ,countResultall;
+    if(allTableDatas==''){
+        $('#sterils_1').text('0');
+        $('#sterils_2').text('0');
+        $('#sterils_3').text('0');
+        $('#sterils_4').text('0');
+        $('#sterils_5').text('0');
+        $('#span_color').text('0');
+        countResultall="没有数据"
+        $('#countResults').val(countResultall)
+    }else {
+        for(var i =0; i < allTableDatas.length; i++){
+            var objs =allTableDatas[i]
+            if(allTableDatas[i].type===1){
+                alltotle.push(allTableDatas[i].type)
+                for(var j=0;j<objs.children.length;j++){
+                    allchildren.push(objs.children[j])
+                    // console.log(objs.children[j])
+                    //获取children的数据进行统计
+                    var objChildren =objs.children[j]
+                    if(countResult[objChildren.name]){
+                        countResult[objChildren.name]=countResult[objChildren.name] + 1;
+                    }else{
+                        countResult[objChildren.name]=1;
                     }
+                }
+            }else{
+                if(objs.type===2){
+                    allchildren.push(objs.type)
+                    if(countResult[objs.name]){
+                        countResult[objs.name]=countResult[objs.name]+1;
+                    }else{
+                        countResult[objs.name]=1;
+                    }
 
                 }
+            }
+        }
+        $('#sterils_1').text(alltotle.length);
+        $('#sterils_2').text(allchildren.length);
+        $('#span_color').text(allchildren.length);
+        var countResultarr =countResult
+        for (var prop in countResultarr) {
+            countResults.push({'id':Math.floor(Math.random()*100000),'name':prop,"amount":countResultarr[prop]})
+        }
+        countResultall= JSON.stringify(countResults)
+        $('#countResults').val(countResultall)
+    }
+    var Json =$('#countResults').val();
+    var mrdata1 = [];
+    var mrdata2=[];
+    if(Json==='没有数据'){
+        mrdata1=[];
+        options2 = {
+            enableCellNavigation: true,
+            enableColumnReorder: false,
+            rowHeight:35,
+        };
+        grid2 = new Slick.Grid("#udsterilizationListTotal", mrdata2, columns5, options3);
+        mrdata1=[];
+    }else{
+        grid2 = new Slick.Grid("#udsterilizationListTotal", mrdata1, columns5, options3);
+        var countResultsAll= JSON.parse(Json)
+        var databaseGood=[];
+        for(var k=0;k<countResultsAll.length;k++){
+            mrdata1.push(countResultsAll[k])
+        }
+        grid2.setData(mrdata1);
+        grid2.render();
 
-            })
+    }
 
-        }
-    });
-});
-// 卸载物品统计列表details
+}
+////灭菌目的 //灭菌炉列表 //灭菌程序关联
 $(function(){
-    var TousseAlert={};
+    var paramName = "sterilerGroup";
+    var reg = new RegExp("(^|&)" + paramName + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
+    var r = window.location.search.substr(1).match(reg);  //匹配目标参数
+    if (r != null) {
+        sterilerGroup = decodeURI(r[2])
+    }
     $.ajax({
-        url:WWWROOT+'disinfectSystem/sterilization/tousseInstanceController/getSterileUnloadTousseBySterileRecordId.mhtml',
-        dataType:'json',
+        url:WWWROOT+'/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml',
         type:'get',
-        async:false,
+        dataType:'json',
+        data:{sterilerGroup:sterilerGroup},
         success:function(data){
             if(data.success===true){
-                var datas=data.rows;
-                $("#uduninstall").bootstrapTable("load", datas)
-            }else {
-                if(TousseAlert.dialog13){
-                    return TousseAlert.dialog13.show();
+                var datas =data.rows;
+                var str = "";
+                str=" <option value='' selected class='Option'></option>"
+                for(var  j=0;j<datas.length;j++){
+                    str +=" <option value='"+datas[j].name+"' >"+datas[j].name+"</option> ";
                 }
-                TousseAlert.dialog13 = jqueryAlert({
-                    'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                    'content' : data.message,
-                    'closeTime' : 3000,
-                    'option':'absolute',
-                })
+                $('#sters').append(str)
+            }else{
+                alert(data.message)
             }
+
         }
+
     })
-})
-$('#uduninstall').bootstrapTable({
+    $('#sters').change(function(){
+        $.ajax({
+            url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getMaxFrequency.mhtml',
+            dataType:'json',
+            type:'get',
+            async:false,
+            data:{sterilizerName:$('#sters').val()},
+            success:function(data){
+                if(data.success===true){
+                    $('#furnace').val(data.data.maxFrequency);
+                    $('#furnace').attr('disabled','disabled');
+                }else {
+                  alert(data.message)
+                }
+            }
+        })
+        $.ajax({
+            url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml',
+            type:'get',
+            dataType:'json',
+            async:false,
+            data:{sterilizerName:$('#sters').val()},
+            success:function(data){
+                var datas= data.rows;
+                if(data.success===true){
+                    var str = "";
+                    // str=" <option value='' selected class='procedure'></option>"
+                    for(var i=0;i<datas.length;i++) {
+                        if(datas[i].sterilisation==='无'){
+                            str +=" <option data-itme='' value='' >"+datas[i].sterilisation+"</option> ";
+                        }else{
+                            str +=" <option data-itme="+datas[i].parameter+" value='"+datas[i].sterilisation+"' >"+datas[i].sterilisation+"</option> ";
+                        }
 
-    striped: true,                      //是否显示行间隔色
-    cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-    sortOrder: "asc",                   //排序方式
-    height: 620,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
-    uniqueId: "id",                     //每一行的唯一标识，一般为主键列
-    removeByUniqueId:1,
-    columns: [
-        {
-            field: 'barcode',
-            title: '条码'
-        }, {
-            field: 'name',
-            title: '名称',
-            // formatter: operateFormatter //自定义方法，添加操作按钮
-        }, {
-            field: 'depart',
-            title: '科室'
-        },
-        {
-            field: 'amount',
-            title: '数量'
-        }
-    ],
-});
-//灭菌物品统计 details
-function udsterilizationListTotal(){
-    $('#udsterilizationListTotal').bootstrapTable({
-        striped: true,                      //是否显示行间隔色
-        cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        sortOrder: "asc",                   //排序方式
-        height: 200,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
-        uniqueId: "id",                     //每一行的唯一标识，一般为主键列
-        removeByUniqueId:1,
-        columns: [
-            {
-                field: 'name',
-                title: '器械包统计名称'
-            },
-            {
-                field: 'amount',
-                title: '数量'
+                    }
+                    $("#procedure").html(str);
+                }else {
+                  alert(data.message)
+                }
             }
+        })
+    })
+    $('#procedure').change(function(){
+        $('#form_input').text($(this).find("option:selected").attr("data-itme"))
 
-        ],
-    });
-}
-udsterilizationListTotal();
-//时间插件
-$('#startTime').datetimepicker('setDate', new Date());
-$("#terminaltime").datetimepicker({
-    language: 'zh-CN',
-    weekStart: 1,
-    todayBtn: 1,//显示为今天的按钮，0无1有
-    autoclose: 1,//单击时间后日历框是否自动关闭，1关闭，0不关闭
-    todayHighlight: 1,//今天高亮显示
-    startView: 2,//展示的样式，1小时，2日
-    minView: 2,//选取到的时间，2天，1小时
-    forceParse: 0
-});
-$('#starttime').datetimepicker({
-    language: 'zh-CN',
-    weekStart: 1,
-    todayBtn: 1,//显示为今天的按钮，0无1有
-    autoclose: 1,//单击时间后日历框是否自动关闭，1关闭，0不关闭
-    todayHighlight: 1,//今天高亮显示
-    startView: 2,//展示的样式，1小时，2日
-    minView: 2,//选取到的时间，2天，1小时
-    forceParse: 0
-});
-$('#addstarttime').datetimepicker({
-    language: 'zh-CN',
-    weekStart: 1,
-    todayBtn: 1,//显示为今天的按钮，0无1有
-    autoclose: 1,//单击时间后日历框是否自动关闭，1关闭，0不关闭
-    todayHighlight: 1,//今天高亮显示
-    startView: 2,//展示的样式，1小时，2日
-    minView: 2,//选取到的时间，2天，1小时
-    forceParse: 0
-});
-$('#udendtime').datetimepicker({
-    language: 'zh-CN',
-    weekStart: 1,
-    todayBtn: 1,//显示为今天的按钮，0无1有
-    autoclose: 1,//单击时间后日历框是否自动关闭，1关闭，0不关闭
-    todayHighlight: 1,//今天高亮显示
-    startView: 2,//展示的样式，1小时，2日
-    minView: 2,//选取到的时间，2天，1小时
-    forceParse: 0
-});
-//灭菌物品列表 details
-function loadSterilizationGoods(obj){
-    var loadAlert={};
+    })
     $.ajax({
-        url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationGoods.mhtml',
+        url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getSterilizationPurposeList.mhtml',
         type:'get',
         dataType:'json',
-        async:false,
-        data:{id:obj},
         success:function(data){
             var datas =data.rows;
             if(data.success===true){
-                $('#udsterilizationListTbale').bootstrapTable('load',datas)
-            }else{
-                if(loadAlert.dialog13){
-                    return loadAlert.dialog13.show();
+                for(var i=0;i<datas.length;i++){
+                    var opt = $("<option value="+datas[i].optionText+">"+datas[i].optionText+"</option>");
+                    $('#purpose').append(opt)
                 }
-                loadAlert.dialog13 = jqueryAlert({
-                    'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                    'content' : data.message,
-                    'closeTime' : 3000,
-                    'option':'absolute',
-                })
+            }else{
+                alert(data.message)
             }
+
         }
     })
-}
-$('#udbarCode').on('keydown',function(e){
-    var udAlert={};
-    if(e.keyCode=='13'){
-        if($(this).val()==""){
-            alert('请输入条码')
-            return false;
-        }else{
-            $.ajax({
-                url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
-                type:'get',
-                dataType:'json',
-                async:false,
-                data:{barcode:$(this).val()},
-                success:function(data){
-                    var datas =data.rows;
 
-                    if(data.success===true){
-                        if(data.barcodeType==='器械包'){
-                            $('#udsterilizationListTbale').bootstrapTable('append',datas);
-                            $('#udbarCode').val("")
-                            allTableDatas();
-                        }
-                        if(data.barcodeType==='用户'){
-                            $('#sterilization').val(datas[0].name);
-                            $('#udbarCode').val("")
-                        }
-                        if(data.barcodeType==='灭菌篮筐'){
-                            $('#udsterilizationListTbale').bootstrapTable('append',datas);
-                            $('#udbarCode').val("")
-                            allTableDatas();
-                        }
-                        if(data.barcodeType==='灭菌架'){
-                            $('#sterilization').val(datas[0].name);
-                            $('#udbarCode').val("")
-                        }
-                    }
-                    else{
-                        if(udAlert.dialog13){
-                            return udAlert.dialog13.show();
-                        }
-                        udAlert.dialog13 = jqueryAlert({
-                            'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                            'content' : data.message,
-                            'closeTime' : 3000,
-                            'option':'absolute',
-                        })
-                    }
-                }
-            })
-        }
-
-    }
 })
-$(function(){
-    var oTableInit = new Object();
-    $('#udsterilizationListTbale').bootstrapTable({
-        detailView: true, //父子表
-        striped: true, //是否显示行间隔色
-        // pagination: true, //是否显示分页（*）
-        sortOrder: "asc", //排序方式
-        pageNumber: 1, //初始化加载第一页，默认第一页
-        height: 200,
-        columns: [
-            {
-                field: 'barcode',
-                title: '条码',
-                align: 'center',
-            }, {
-                field: 'name',
-                title: '名称',
-                align: 'left',
+// 添加灭菌
+$('#addTbale').on('click',function(){
+    var sterilization =$('#sterilization').val();
+    var sterilizationName =$('#sterilizationName').val();
+    var furnace =$('#furnace').val();
+    var sters =$('#sters').val()
+    var procedure =$('#procedure').val()
+    var purpose =$('#purpose').val()
+    var addstarttime =$('#addstarttime').val();
+    var form_input =$('#form_input').html();
+    var Sterilizingnote =$('#Sterilizingnote').val();
+    var sterilingGoodsArray = [];//[{"containerBarcode":"01","children":["001","002"]}, {"containerBarcode":"02","children":["003","004"]} , {"tousseInstanceBarcode":"003"}]
+    var allTableData;
+    if($('#addCleanGetCodeArr').val()===''){
+        allTableData=[];
+    }else{
+        allTableData=JSON.parse($('#addCleanGetCodeArr').val());
+    }
 
-            }, {
-                field: 'sterilingMode',
-                title: '灭菌方式',
-                align: 'center',
-
-            }, {
-                field: 'amount',
-                title: '数量',
-                align: 'center',
-
-            },{
-                field: 'type',
-                title: '操作',
-                formatter:function(index,row,value){
-                    return '<a onclick="onmover('+value+')">删除</a>'
-                }
+    for(var i=0;i<allTableData.length;i++){
+        var obj = {};
+        var data = allTableData[i];
+        if(data.children && data.children.length > 0){
+            obj.containerBarcode = data.barcode;
+            var tousseBarcodeArray = [];
+            for (var j = 0; j < data.children.length; j++) {
+                tousseBarcodeArray.push(data.children[j].barcode);
             }
-        ],
-        onExpandRow: function (index, row, $detail) {
-            InitSubTable(index, row, $detail);
+            obj.children = tousseBarcodeArray;
+            sterilingGoodsArray.push(obj);
+        }else{
+            obj.tousseInstanceBarcode = data.barcode;
+            sterilingGoodsArray.push(obj);
         }
-    });
-    InitSubTable = function(index, row, $detail) {
-        var rowChildren =row.children;
-        var cur_table = $detail.html('<table></table>').find('table');
-        var html = "";
-        html += "<table class='table'>";
-        for(var i=0;i<rowChildren.length;i++){
-            html += "<tr  align='center'>"
-                + "<td></td>"
-                + "<td>" + rowChildren[i].barcode + "</td>"
-                + "<td>" + rowChildren[i].name + "</td>"
-                + "<td>" + rowChildren[i].sterilingMode + "</td>"
-                + "<td>" + rowChildren[i].amount + "</td>"
-                + "<td></td>"
-                + "</tr>";
-        }
-        html +="</table>";
-        $detail.html(html); // 关键地方
+    }
+    var sterilingGoodsArrays= JSON.stringify(sterilingGoodsArray)
+    // console.log(sterilingGoodsArrays)
+    if(sters==''){
+        alert('请选择灭菌炉名称');
+        return false;
+    }
+    if(procedure==''){
+        alert('请选择灭菌程序');
+        return false;
+    }
+    if(purpose==''){
+        alert('请选择灭菌目的');
+        return false;
+    }else{
+        $.ajax({
+            url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/saveSterilizationRecord.mhtml',
+            type:'post',
+            dataType:'json',
+            async:false,
+            data:{id:'',recordId:'',barcodePositionInfo:'',sterilizationGoods:sterilingGoodsArrays,sterilizationUser:sterilization,sterilizationShelf:sterilizationName,sterilizerName:sters,srSituationComfirmer:'',frequency:furnace,cycleCounter:'',sterilizationType:procedure,sterilizationPurpose:purpose,startDate:addstarttime,endDate:'',parameter:form_input,remark:Sterilizingnote},
+            success:function(data){
+                if(data.success===true){
+                    $("#mymodal-data").modal('hide');
+                    window.location.href = window.location.href;
+                }else{
+                    alert(data.message)
+                }
 
-    };
+            }
+        })
+    }
 })
-//ajax  修改 deteils
+//绑定详情数据
 function AjaxModal(obj){
-    var str="",ajaxModalAlert={},ajaxModalAlert1={};
     $.ajax({
         url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationRecord.mhtml',
         type:'get',
@@ -750,6 +1260,25 @@
         success:function(data){
             if(data.success===true){
                 var datas=data.data;
+                if(datas.status==='灭菌完成'){
+                    $('#udsterilization').val(datas.sterilizationUser);
+                    $('#udsterilization').attr('disabled',true);
+                    $('#udsterilizationName').val(datas.sterilizationShelf);
+                    $('#udsterilizationName').attr('disabled',true);
+                    $('#udfurnace').val(datas.frequency);
+                    $('#udfurnace').attr('disabled',true);
+                    $('#udsters').attr('disabled',true);
+                    $('#udsters').css('background','#ebebe4');
+                    $('#udprocedure').attr('disabled',true)
+                    $('#udprocedure').css('background','#ebebe4');
+                    $('#udpurpose').attr('disabled',true)
+                    $('#udpurpose').css('background','#ebebe4');
+                    $('#udstarttime').attr('disabled',true)
+                    $('#udendtime').attr('disabled',true)
+                    $('#textareas').attr('disabled',true)
+                    $('#udSterilizingnote').attr('disabled',true)
+                    $('#udBiomonitoring ').attr('disabled',true)
+                }
                 $('#udsterilization').val(datas.sterilizationUser);
                 $('#udsterilization').attr('disabled',true);
                 $('#udsterilizationName').val(datas.sterilizationShelf);
@@ -789,15 +1318,7 @@
                             }
                             $("#udsters").html(str);
                         } else{
-                            if(ajaxModalAlert.dialog13){
-                                return ajaxModalAlert.dialog13.show();
-                            }
-                            ajaxModalAlert.dialog13 = jqueryAlert({
-                                'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                                'content' : data.message,
-                                'closeTime' : 3000,
-                                'option':'absolute',
-                            })
+                            alert(data.message)
                         }
                     }
                 });
@@ -826,15 +1347,7 @@
                             }
                             $("#udpurpose").html(str);
                         }else{
-                            if(ajaxModalAlert1.dialog13){
-                                return ajaxModalAlert1.dialog13.show();
-                            }
-                            ajaxModalAlert1.dialog13 = jqueryAlert({
-                                'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                                'content' : data.message,
-                                'closeTime' : 3000,
-                                'option':'absolute',
-                            })
+                            alert(data.message)
                         }
 
                     }
@@ -861,65 +1374,12 @@
 
     })
 }
-function ClickName (obj){
-    var clickNameAlert={};
-    if(obj!==''){
-        AjaxModal(obj);
-        // 灭菌物品列表
-        loadSterilizationGoods(obj)
-        $('#deteils').val(obj)
-        allTableDatas();
-
-    }else {
-        if(clickNameAlert.dialog13){
-            return clickNameAlert.dialog13.show();
-        }
-        clickNameAlert.dialog13 = jqueryAlert({
-            'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-            'content' : '选择一行',
-            'closeTime' : 3000,
-            'option':'absolute',
-        })
-    }
-}
-//修改时重新条用 灭菌目的 //灭菌炉列表 //灭菌程序关联
-$('#udsters').change(function(){
-    var ududstersAlert={};
-    $('#udprocedure').html("<option></option>");
-    $.ajax({
-        url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml',
-        type:'get',
-        dataType:'json',
-        data:{sterilizerName:$('#udsters').val()},
-        success:function(data){
-            var datas= data.rows;
-            if(data.success===true){
-                var str = "";
-                for(var i=0;i<datas.length;i++) {
-                    str +=" <option data-itme="+datas[i].parameter+" value='"+datas[i].sterilisation+"' >"+datas[i].sterilisation+"</option> ";
-                }
-                $("#udprocedure").html(str);
-            }else {
-                if(ududstersAlert.dialog13){
-                    return ududstersAlert.dialog13.show();
-                }
-                ududstersAlert.dialog13 = jqueryAlert({
-                    'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                    'content' : data.message,
-                    'closeTime' : 3000,
-                    'option':'absolute',
-                })
-            }
-        }
-    })
+$('.Close').click(function(){
+    $('.AllData').val('')
 })
-$('#udprocedure').change(function(){
-    $('#textareas').text($(this).find("option:selected").attr("data-itme"))
-})
 //修改保存
 $('#conservation').on('click',function(){
-    var sterilingGoodsAlert={},coAlert={};
-   var deteilsId= $('#deteils').val();
+    var deteilsId= $('.detailsId').val();
     var udsterilization =$('#udsterilization').val();
     var udsterilizationName =$('#udsterilizationName').val();
     var udfurnace =$('#udfurnace').val();
@@ -944,7 +1404,12 @@
     var textareas=$('#textareas').html();
     var udSterilizingnote=$('#udSterilizingnote').val();
     var sterilingGoodsArray = [];//[{"containerBarcode":"01","children":["001","002"]}, {"containerBarcode":"02","children":["003","004"]} , {"tousseInstanceBarcode":"003"}]
-    var allTableData = $('#udsterilizationListTbale').bootstrapTable('getData');
+    var allTableData;
+    if($('.AllData').val()===''){
+        allTableData=[];
+    }else{
+        allTableData=JSON.parse($('.AllData').val());
+    }
     for(var i=0;i<allTableData.length;i++){
         var objConservation = {};
         var data = allTableData[i];
@@ -962,788 +1427,115 @@
         }
     }
     var sterilingGoodsArrays= JSON.stringify(sterilingGoodsArray)
-    if(sterilingGoodsArrays === '[]'){
-        if(sterilingGoodsAlert.dialog3){
-            return sterilingGoodsAlert.dialog3.show();
-        }
-        sterilingGoodsAlert.dialog3 = jqueryAlert({
-            'modal'   : true,
-            'contentTextAlign' : 'left',
-            'animateType': 'scale',
-            'bodyScroll' : 'true',
-            'title'   : '请确认',
-            'content' : '没有添加灭菌的物品，继续灭菌吗？',
-            'position':'absolute',
-            'width'   : '250',
-            'height'  : '150',
-            'buttons' :{
-                '确定' : function(){
-                    SaveConservation();
-                    sterilingGoodsAlert.dialog3.close();
-
-                },
-                '取消' : function(){
-                    sterilingGoodsAlert.dialog3.close();
-                }
-            }
-        })
-    }else{
-        SaveConservation();
-    }
-    function   SaveConservation(){
-        $.ajax({
-            url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/saveSterilizationRecord.mhtml',
-            type:'post',
-            dataType:'json',
-            async:false,
-            data:{id:deteilsId, recordId:'',barcodePositionInfo:'',sterilizationUser:udsterilization,sterilizationShelf:udsterilizationName,
-                frequency:udfurnace,sterilizerName:sterilizermames,sterilizationType:udprocedure,sterilizationPurpose:sterilizationP,startDate:udstarttime,parameter:textareas,
-                remark:udSterilizingnote,sterilizationGoods:sterilingGoodsArrays,srSituationComfirmer:'',cycleCounter:5,endDate:''},
-            success:function(data){
-                if(data.success===true){
-                    $("#mymodal-data").modal('hide');
-                    window.location.href = window.location.href;
-                }else{
-                    if(coAlert.dialog13){
-                        return coAlert.dialog13.show();
-                    }
-                    coAlert.dialog13 = jqueryAlert({
-                        'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                        'content' : data.message,
-                        'closeTime' : 3000,
-                        'option':'absolute',
-                    })
-                }
-            }
-        })
-    }
-})
-//完成灭菌
-$("#completes").on("click", function () {
-    var cAlert={},cdAlert={},addcdAlert={},ajaxAlert={};
-    var rows = $("#table").bootstrapTable('getSelections');
-    if(rows.length ==0){
-        complete();
-        return false;
-    }else{
-        if(rows[0].status==='灭菌完成'){
-            if(cdAlert.dialog13){
-                return cdAlert.dialog13.show();
-            }
-            cdAlert.dialog13 = jqueryAlert({
-                'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                'content' : '不能重复提交灭菌记录',
-                'closeTime' : 2000,
-            })
-        }else{
-            if(addcdAlert.dialog9){
-                return addcdAlert.dialog9.show();
-            }
-            addcdAlert.dialog9 = jqueryAlert({
-                'contentTextAlign' : 'center',
-                'width'   : '200',
-                'height'  : '120',
-                'title'   : '请确认',
-                'content' : '确定灭菌完成吗？',
-                'modal'   : true,
-                'position':'absolute',
-                'buttons' : {
-                    '确定' : function(){
-                        addcdAlert.dialog9.close();
-                        var arrays = new Array();// 声明一个数组
-                        $(rows).each(function () {// 通过获得别选中的来进行遍历
-                            arrays.push(this.id);// cid为获得到的整条数据中的一列
-                        });
-                        var idcards =JSON.stringify(arrays)
-                        $.ajax({
-                            url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/completeSterilizationGoods.mhtml',
-                            type:'get',
-                            dataType:'json',
-                            data:{sterilizationRecordIds:idcards},
-                            success:function(data){
-                                if(data.success===true){
-                                    window.location.href = window.location.href;
-                                }else{
-                                    if(ajaxAlert.dialog13){
-                                        return ajaxAlert.dialog13.show();
-                                    }
-                                    ajaxAlert.dialog13 = jqueryAlert({
-                                        'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                                        'content' : data.message,
-                                        'closeTime' : 3000,
-                                        'option':'absolute',
-                                    })
-                                    return false;
-                                }
-                            }
-                        })
-                    },
-                    '取消' : function(){
-                        c.dialog9.close();
-                    }
-                }
-            })
-        }
-    }
-
-    function complete(){
-        if(cAlert.dialog13){
-            return cAlert.dialog13.show();
-        }
-        cAlert.dialog13 = jqueryAlert({
-            'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/warning.png',
-            'content' : '请选择需要完成灭菌的记录信息！',
-            'closeTime' : 3000,
-        })
-    }
-})
-//灭菌失败
-$('#fails').on('click',function(){
-    var rows = $("#table").bootstrapTable('getSelections');
-    if (rows.length ==0) {// rows 主要是为了判断是否选中，下面的else内容才是主要
-        $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>    请至少选中一条灭菌记录！')
-        $ ('#Alert').show ().delay (1500).fadeOut ();
-        return false;
-    }
-    if(rows.length==2){
-        $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>    最多选择一条灭菌记录！')
-        $ ('#Alert').show ().delay (1500).fadeOut ();
-        return false;
-    }else {
-        $('#failOk').on('click',function(){
-            var arrays = new Array();// 声明一个数组
-            $(rows).each(function () {// 通过获得别选中的来进行遍历
-                arrays.push(this.id);// cid为获得到的整条数据中的一列
-            });
-            var idcards =JSON.stringify(arrays)
-            $.ajax({
-                url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/failureSterilizationRecord.mhtml?sterilizationRecordId='+idcards,
-                type:'get',
-                dataType:'json',
-                success:function(data){
-                    if(data.success===true){
-                        window.location.href = window.location.href;
-                    }else{
-                        $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna> '+data.message+'！')
-                        $ ('#Alert').show ().delay (1500).fadeOut ();
-                        return false;
-                    }
-                }
-            })
-        })
-    }
-})
-//灭菌中断
-$('#interrupts').on('click',function(){
-    var rows = $("#table").bootstrapTable('getSelections');
-    if (rows.length ==0) {// rows 主要是为了判断是否选中，下面的else内容才是主要
-        $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>    请至少选中一条灭菌记录！')
-        $ ('#Alert').show ().delay (1500).fadeOut ();
-        return false;
-    }
-    if(rows.length==2){
-        $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>    最多选择一条操作记录！')
-        $ ('#Alert').show ().delay (1500).fadeOut ();
-        return false;
-    }else {
-        $('#interruptsOk').on('click',function(){
-            var arrays = new Array();// 声明一个数组
-            $(rows).each(function () {// 通过获得别选中的来进行遍历
-                arrays.push(this.id);// cid为获得到的整条数据中的一列
-            });
-            var idcards =JSON.stringify(arrays)
-            $.ajax({
-                url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/interruptSterilizationRecord.mhtml?sterilizationRecordId='+idcards,
-                type:'get',
-                dataType:'json',
-                success:function(data){
-                    if(data.success===true){
-                        window.location.href = window.location.href;
-                    }else{
-                        $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna> '+data.message+'！')
-                        $ ('#Alert').show ().delay (1500).fadeOut ();
-                        return false;
-                    }
-                }
-            })
-        })
-    }
-})
-//删除灭菌记录
-$("#Deletings").on("click", function () {
-    var dAlert={},deteilsAlert={},deAlert={};
-    var rows = $("#table").bootstrapTable('getSelections');
-    if(rows.length==0){
-        Deletings();
-        return false;
-    }else{
-        if(dAlert.dialog9){
-            return dAlert.dialog9.show();
-        }
-        dAlert.dialog9 = jqueryAlert({
-            'contentTextAlign' : 'center',
-            'width'   : '284',
-            'height'  : '150',
-            'title'   : '请确认',
-            'content' : '确定删除这些记录吗？',
-            'modal'   : true,
-            'position':'absolute',
-            'buttons' : {
-                '确定' : function(){
-                    dAlert.dialog9.close();
-                    var arrays = new Array();// 声明一个数组
-                    $(rows).each(function () {// 通过获得别选中的来进行遍历
-                        arrays.push(this.id);// cid为获得到的整条数据中的一列
-                    });
-                    var idcards =JSON.stringify(arrays)
-                    $.ajax({
-                        url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/deleteSterilizationRecord.mhtml',
-                        type:'get',
-                        dataType:'json',
-                        data:{sterilizationRecordIds:idcards},
-                        success:function(data){
-                            if(data.success===true){
-                                window.location.href = window.location.href;
-                            }else{
-                                if(deAlert.dialog13){
-                                    return deAlert.dialog13.show();
-                                }
-                                deAlert.dialog13 = jqueryAlert({
-                                    'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                                    'content' : data.message,
-                                    'closeTime' : 3000,
-                                    'option':'absolute',
-                                })
-                                return false;
-                            }
-                        }
-                    })
-                },
-                '取消' : function(){
-                    dAlert.dialog9.close();
-                }
-            }
-        })
-    }
-    function Deletings(){
-        if(deteilsAlert.dialog13){
-            return deteilsAlert.dialog13.show();
-        }
-        deteilsAlert.dialog13 = jqueryAlert({
-            'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/warning.png',
-            'content' : '请选择需要删除的记录信息！',
-            'closeTime' : 3000,
-        })
-    }
-})
-//灭菌目的 //灭菌炉列表 //灭菌程序关联
-$(function(){
-    var steAlert={},SterilizationPurposeList={},getAllSterilizer={};
-	var paramName = "sterilerGroup";
-    var reg = new RegExp("(^|&)" + paramName + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
-    var r = window.location.search.substr(1).match(reg);  //匹配目标参数
-    if (r != null) {
-    	sterilerGroup = decodeURI(r[2])
-    }
     $.ajax({
-        url:WWWROOT+'/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml',
-        type:'get',
+        url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/saveSterilizationRecord.mhtml',
+        type:'post',
         dataType:'json',
-        data:{sterilerGroup:sterilerGroup},
+        async:false,
+        data:{id:deteilsId, recordId:'',barcodePositionInfo:'',sterilizationUser:udsterilization,sterilizationShelf:udsterilizationName,
+            frequency:udfurnace,sterilizerName:sterilizermames,sterilizationType:udprocedure,sterilizationPurpose:sterilizationP,startDate:udstarttime,parameter:textareas,
+            remark:udSterilizingnote,sterilizationGoods:sterilingGoodsArrays,srSituationComfirmer:'',cycleCounter:5,endDate:''},
         success:function(data){
             if(data.success===true){
-                var datas =data.rows;
-                var str = "";
-                str=" <option value='' selected class='Option'></option>"
-                for(var  j=0;j<datas.length;j++){
-                    str +=" <option value='"+datas[j].name+"' >"+datas[j].name+"</option> ";
-                }
-                $('#sters').append(str)
+                $("#mymodal-data").modal('hide');
+                window.location.href = window.location.href;
             }else{
-                if(getAllSterilizer.dialog13){
-                    return getAllSterilizer.dialog13.show();
-                }
-                getAllSterilizer.dialog13 = jqueryAlert({
-                    'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                    'content' : data.message,
-                    'closeTime' : 3000,
-                    'option':'absolute',
-                })
+                alert(data.message)
             }
-
         }
-
     })
-    $('#sters').change(function(){
-        $.ajax({
-            url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getMaxFrequency.mhtml',
-            dataType:'json',
-            type:'get',
-            async:false,
-            data:{sterilizerName:$('#sters').val()},
-            success:function(data){
-                if(data.success===true){
-                    $('#furnace').val(data.data.maxFrequency);
-                    $('#furnace').attr('disabled','disabled');
-                }else {
-                    if(steAlert.dialog13){
-                        return steAlert.dialog13.show();
-                    }
-                    steAlert.dialog13 = jqueryAlert({
-                        'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                        'content' : data.message,
-                        'closeTime' : 3000,
-                        'option':'absolute',
-                    })
-                }
-            }
-        })
-        $.ajax({
-            url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml',
-            type:'get',
-            dataType:'json',
-            async:false,
-            data:{sterilizerName:$('#sters').val()},
-            success:function(data){
-                var datas= data.rows;
-                if(data.success===true){
-                    var str = "";
-                    // str=" <option value='' selected class='procedure'></option>"
-                    for(var i=0;i<datas.length;i++) {
-                        if(datas[i].sterilisation==='无'){
-                            str +=" <option data-itme='' value='' >"+datas[i].sterilisation+"</option> ";
-                        }else{
-                            str +=" <option data-itme="+datas[i].parameter+" value='"+datas[i].sterilisation+"' >"+datas[i].sterilisation+"</option> ";
-                        }
 
-                    }
-                    $("#procedure").html(str);
-                }else {
-                    if(steStr.dialog13){
-                        return steStr.dialog13.show();
-                    }
-                    steStr.dialog13 = jqueryAlert({
-                        'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                        'content' : data.message,
-                        'closeTime' : 3000,
-                        'option':'absolute',
-                    })
-                }
-            }
-        })
-    })
-    $('#procedure').change(function(){
-        $('#form_input').text($(this).find("option:selected").attr("data-itme"))
-
-    })
+})
+//修改时重新条用 灭菌目的 //灭菌炉列表 //灭菌程序关联
+$('#udsters').change(function(){
+    var ududstersAlert={};
+    $('#udprocedure').html("<option></option>");
     $.ajax({
-        url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getSterilizationPurposeList.mhtml',
+        url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml',
         type:'get',
         dataType:'json',
+        data:{sterilizerName:$('#udsters').val()},
         success:function(data){
-            var datas =data.rows;
+            var datas= data.rows;
             if(data.success===true){
-                for(var i=0;i<datas.length;i++){
-                    var opt = $("<option value="+datas[i].optionText+">"+datas[i].optionText+"</option>");
-                    $('#purpose').append(opt)
+                var str = "";
+                for(var i=0;i<datas.length;i++) {
+                    str +=" <option data-itme="+datas[i].parameter+" value='"+datas[i].sterilisation+"' >"+datas[i].sterilisation+"</option> ";
                 }
-            }else{
-                if(SterilizationPurposeList.dialog13){
-                    return SterilizationPurposeList.dialog13.show();
+                $("#udprocedure").html(str);
+            }else {
+                if(ududstersAlert.dialog13){
+                    return ududstersAlert.dialog13.show();
                 }
-                SterilizationPurposeList.dialog13 = jqueryAlert({
+                ududstersAlert.dialog13 = jqueryAlert({
                     'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
                     'content' : data.message,
                     'closeTime' : 3000,
                     'option':'absolute',
                 })
             }
-
         }
     })
-
 })
-//扫描条码add //灭菌物品列表 add //统计数量表格
-$('#barCode').on('keydown',function(e){
-    var barAlert={};
-    if(e.keyCode=='13'){
-       if($(this).val()==""){
-           alert('请输入条码')
-           return false;
-       }else{
-           $.ajax({
-               url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
-               type:'get',
-               dataType:'json',
-               async:false,
-               data:{barcode:$(this).val()},
-               success:function(data){
-                   var datas =data.rows;
-                   console.log()
-                   if(data.success===true){
-                       if(data.barcodeType==='器械包'){
-                           $('#sterilizationListTbale').bootstrapTable('append',datas);
-                           $('#barCode').val("")
-                           addallTableDatas();
-                       }
-                       if(data.barcodeType==='用户'){
-                    	   $('#sterilization').val(datas[0]['name']);
-                    	   $('#barCode').val("")
-                       }
-                       if(data.barcodeType==='灭菌篮筐'){
-                    	   $('#sterilizationListTbale').bootstrapTable('append',datas);
-                           $('#barCode').val("")
-                           addallTableDatas();
-                       }
-                       if(data.barcodeType==='灭菌架'){
-                    	   $('#sterilization').val(datas[0]['name']);
-                    	   $('#barCode').val("")
-                       }
-                   }else{
-                       if(barAlert.dialog13){
-                           return barAlert.dialog13.show();
-                       }
-                       barAlert.dialog13 = jqueryAlert({
-                           'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                           'content' : data.message,
-                           'closeTime' : 3000,
-                           'option':'absolute',
-                       })
-                   }
-               }
-           })
-       }
-
-    }
+$('#udprocedure').change(function(){
+    $('#textareas').text($(this).find("option:selected").attr("data-itme"))
 })
-$(function(){
-    var oTableInit = new Object();
-    $('#sterilizationListTbale').bootstrapTable({
-        detailView: true, //父子表
-        striped: true, //是否显示行间隔色
-        // pagination: true, //是否显示分页（*）
-        sortOrder: "asc", //排序方式
-        pageNumber: 1, //初始化加载第一页，默认第一页
-        height: 200,
-        columns: [
-            {
-                field: 'barcode',
-                title: '条码',
-                align: 'center',
-            }, {
-                field: 'name',
-                title: '名称',
-                align: 'left',
-
-            }, {
-                field: 'sterilingMode',
-                title: '灭菌方式',
-                align: 'center',
-
-            }, {
-                field: 'amount',
-                title: '数量',
-                align: 'center',
-
-            },{
-                field: 'type',
-                title: '操作',
-                align: 'center',
-                formatter:function(index,row,value){
-                    return '<a onclick="addmover('+value+')">删除</a>'
-                }
-            }
-        ],
-        onExpandRow: function (index, row, $detail) {
-            InitSubTable(index, row, $detail);
-        }
-    });
-    InitSubTable = function(index, row, $detail) {
-        var rowChildren =row.children;
-        var cur_table = $detail.html('<table></table>').find('table');
-        var html = "";
-        html += "<table class='table'>";
-        for(var i=0;i<rowChildren.length;i++){
-            html += "<tr  align='center'>"
-                + "<td></td>"
-                + "<td>" + rowChildren[i].barcode + "</td>"
-                + "<td>" + rowChildren[i].name + "</td>"
-                + "<td>" + rowChildren[i].sterilingMode + "</td>"
-                + "<td>" + rowChildren[i].amount + "</td>"
-                + "<td></td>"
-                + "</tr>";
-        }
-        html +="</table>";
-        $detail.html(html); // 关键地方
-
-    };
-})
-function sterilizationListTotal(){
-    $('#sterilizationListTotal').bootstrapTable({
-        striped: true,                      //是否显示行间隔色
-        cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        sortOrder: "asc",                   //排序方式
-        height: 200,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
-        uniqueId: "id",                     //每一行的唯一标识，一般为主键列
-        detailView: false,                   //是否显示父子表
-        removeByUniqueId:1,
-        columns: [
-            {
-                field: 'name',
-                title: '器械包统计名称'
-            },
-            {
-                field: 'amount',
-                title: '数量'
-            }
-
-        ],
-    });
-}
-sterilizationListTotal();
-// 添加灭菌
-$('#addTbale').on('click',function(){
-    var MAlert={},addM={};
-    var sterilization =$('#sterilization').val();
-    var sterilizationName =$('#sterilizationName').val();
-    var furnace =$('#furnace').val();
-    var sters =$('#sters').val()
-    var procedure =$('#procedure').val()
-    var purpose =$('#purpose').val()
-    var addstarttime =$('#addstarttime').val();
-    var form_input =$('#form_input').html();
-    var Sterilizingnote =$('#Sterilizingnote').val();
-    var sterilingGoodsArray = [];//[{"containerBarcode":"01","children":["001","002"]}, {"containerBarcode":"02","children":["003","004"]} , {"tousseInstanceBarcode":"003"}]
-    var allTableData = $('#sterilizationListTbale').bootstrapTable('getData');
-    for(var i=0;i<allTableData.length;i++){
-        var obj = {};
-        var data = allTableData[i];
-        if(data.children && data.children.length > 0){
-            obj.containerBarcode = data.barcode;
-            var tousseBarcodeArray = [];
-            for (var j = 0; j < data.children.length; j++) {
-                tousseBarcodeArray.push(data.children[j].barcode);
-            }
-            obj.children = tousseBarcodeArray;
-            sterilingGoodsArray.push(obj);
-        }else{
-            obj.tousseInstanceBarcode = data.barcode;
-            sterilingGoodsArray.push(obj);
-        }
-    }
-    var sterilingGoodsArrays= JSON.stringify(sterilingGoodsArray)
-
-    if(sters==''||procedure==''||purpose==''){
-        if(MAlert.dialog13){
-            return MAlert.dialog13.show();
-        }
-        MAlert.dialog13 = jqueryAlert({
-            'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/warning.png',
-            'content' : '输入表单各项值',
-            'closeTime' : 3000,
-            'option':'absolute',
-        })
-    }else{
-        $.ajax({
-            url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/saveSterilizationRecord.mhtml',
-            type:'post',
-            dataType:'json',
-            async:false,
-            data:{id:'',recordId:'',barcodePositionInfo:'',sterilizationGoods:sterilingGoodsArrays,sterilizationUser:sterilization,sterilizationShelf:sterilizationName,sterilizerName:sters,srSituationComfirmer:'',frequency:furnace,cycleCounter:'',sterilizationType:procedure,sterilizationPurpose:purpose,startDate:addstarttime,endDate:'',parameter:form_input,remark:Sterilizingnote},
-            success:function(data){
-                if(data.success===true){
-                    $("#mymodal-data").modal('hide');
-                    window.location.href = window.location.href;
-                }else{
-                    if(addM.dialog13){
-                        return addM.dialog13.show();
-                    }
-                    addM.dialog13 = jqueryAlert({
-                        'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/error.png',
-                        'content' : data.message,
-                        'closeTime' : 3000,
-                        'option':'absolute',
-                    })
-                }
-
-            }
-        })
-    }
-})
-//修改每一行的数据
 $('#updateHandle').click(function(){
-    var upAlert={};
-    var rows = $("#table").bootstrapTable('getSelections');
-    if (rows.length ==0) {// rows 主要是为了判断是否选中，下面的else内容才是主要
-        Alert();
+    if($('.detailsId').val()===''){
+        alert('请选择一条数据');
         return false;
-    }else {
-            var arrays
-            $(rows).each(function () {// 通过获得别选中的来进行遍历
-                arrays=(this.id);// cid为获得到的整条数据中的一列
-            });
-            var obj =arrays
-            AjaxModal(obj);
-            loadSterilizationGoods(obj);
-            $('#deteils').val(obj);
-            allTableDatas();
-    }
-    function Alert(){
-        if(upAlert.dialog13){
-            return upAlert.dialog13.show();
-        }
-        upAlert.dialog13 = jqueryAlert({
-            'icon':WWWROOT+'/dx-disinfectsystem/plugins/jqAlert/img/warning.png',
-            'content' : '请选择需要修改的使用记录信息！',
-            'closeTime' : 3000,
-        })
-    }
-})
-//详情灭菌物品列表 删除  灭菌物品统计
-function onmover(od){
-    // $('#od').val(od);
-    var paJoin=new Array();
-    var ids =$('#udsterilizationListTbale').bootstrapTable('getData')[od];
-     paJoin.push(ids.barcode)
-    $('#udsterilizationListTbale').bootstrapTable('remove', {
-        field: 'barcode',
-        values: paJoin
-    });
-    allTableDatas();
-}
-function allTableDatas(){
-    var allTableDatas = $('#udsterilizationListTbale').bootstrapTable('getData');
-    var alltotle=[] ,allchildren=[],countResult={},countResults=[] ,countResultall;
-    if(allTableDatas==''){
-        $('#sterils_1').text('0');
-        $('#sterils_2').text('0');
-        $('#sterils_3').text('0');
-        $('#sterils_4').text('0');
-        $('#sterils_5').text('0');
-        $('#span_color').text('0');
-        countResultall="没有数据"
-        $('#countResults').val(countResultall)
-    }else {
-       for(var i =0; i < allTableDatas.length; i++){
-           var objs =allTableDatas[i]
-           if(allTableDatas[i].type===1){
-            alltotle.push(allTableDatas[i].type)
-              for(var j=0;j<objs.children.length;j++){
-                  allchildren.push(objs.children[j])
-                  //获取children的数据进行统计
-                  var objChildren =objs.children[j]
-                  if(countResult[objChildren.name]){
-                      countResult[objChildren.name]=countResult[objChildren.name] + 1;
-                  }else{
-                      countResult[objChildren.name]=1;
-                  }
-              }
-           }else{
-               if(objs.type===2){
-                   allchildren.push(objs.type)
-                   if(countResult[objs.name]){
-                       countResult[objs.name]=countResult[objs.name]+1;
-                   }else{
-                       countResult[objs.name]=1;
-                   }
-
-               }
-           }
-        }
-       $('#sterils_1').text(alltotle.length);
-       $('#sterils_2').text(allchildren.length);
-       $('#span_color').text(allchildren.length);
-        var countResultarr =countResult
-        for (var prop in countResultarr) {
-            countResults.push({'name':prop,"amount":countResultarr[prop]})
-        }
-       countResultall= JSON.stringify(countResults)
-       $('#countResults').val(countResultall)
-
-    }
-    var Json =$('#countResults').val();
-    if(Json==='没有数据'){
-        $("#udsterilizationListTotal").bootstrapTable('destroy');
-        udsterilizationListTotal();
     }else{
-        $('#udsterilizationListTotal').bootstrapTable('load',JSON.parse(Json))
+        var obj =$('.detailsId').val();
+        AjaxModal(obj);
+        particularsGrid(obj);
     }
 
-}
-//add  灭菌物品列表 删除  灭菌物品统计
-function addmover(od){
-    // $('#od').val(od);
-    var paJoin=new Array();
-    var ids =$('#sterilizationListTbale').bootstrapTable('getData')[od];
-    paJoin.push(ids.barcode)
-    $('#sterilizationListTbale').bootstrapTable('remove', {
-        field: 'barcode',
-        values: paJoin
-    });
-    addallTableDatas();
-}
-function addallTableDatas(){
-    var allTableDatas = $('#sterilizationListTbale').bootstrapTable('getData');
-    var alltotle=[] ,allchildren=[],countResult={},countResults=[] ,countResultall;
-    if(allTableDatas==''){
-        $('#addsterils_1').text('0');
-        $('#addsterils_2').text('0');
-        $('#addsterils_3').text('0');
-        $('#addsterils_4').text('0');
-        $('#addsterils_5').text('0');
-        $('#addsterilslor').text('0');
-        countResultall="没有数据"
-        $('#countResults').val(countResultall)
-    }else {
-        for(var i =0; i < allTableDatas.length; i++){
-            var objs =allTableDatas[i]
-            if(allTableDatas[i].type===1){
-                alltotle.push(allTableDatas[i].type)
-                for(var j=0;j<objs.children.length;j++){
-                    allchildren.push(objs.children[j])
-                    //获取children的数据进行统计
-                    var objChildren =objs.children[j]
-                    if(countResult[objChildren.name]){
-                        countResult[objChildren.name]=countResult[objChildren.name] + 1;
-                    }else{
-                        countResult[objChildren.name]=1;
-                    }
-                }
+})
+//列表删除
+function DelectRow(id){
+    $.ajax({
+        url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/deleteSterilizationRecord.mhtml',
+        type:'get',
+        dataType:'json',
+        data:{sterilizationRecordIds:JSON.stringify(id)},
+        success:function(data){
+            if(data.success===true){
+                alert('成功删除数据');
+                window.location.href = window.location.href;
             }else{
-
-                if(objs.type===2){
-                    allchildren.push(objs.type)
-                    if(countResult[objs.name]){
-                        countResult[objs.name]=countResult[objs.name]+1;
-                    }else{
-                        countResult[objs.name]=1;
-                    }
-
-                }
+                alert(data.message)
             }
         }
-        $('#addsterils_1').text(alltotle.length);
-        $('#addsterils_2').text(allchildren.length);
-        $('#addspan_color').text(allchildren.length);
-        var countResultarr =countResult
-        for (var prop in countResultarr) {
-            countResults.push({'name':prop,"amount":countResultarr[prop]})
-        }
-        countResultall= JSON.stringify(countResults)
-        $('#countResults').val(countResultall)
-
-    }
-    var Json =$('#countResults').val();
-    if(Json==='没有数据'){
-        $("#sterilizationListTotal").bootstrapTable('destroy');
-        sterilizationListTotal();
-    }else{
-        $('#sterilizationListTotal').bootstrapTable('load',JSON.parse(Json))
-    }
-
+    })
 }
-
-
-
-
-
+//时间插件
+$('#addstarttime').datetimepicker({
+    language: 'zh-CN',
+    weekStart: 1,
+    todayBtn: 1,//显示为今天的按钮，0无1有
+    autoclose: 1,//单击时间后日历框是否自动关闭，1关闭，0不关闭
+    todayHighlight: 1,//今天高亮显示
+    startView: 2,//展示的样式，1小时，2日
+    minView: 2,//选取到的时间，2天，1小时
+    forceParse: 0
+});
+$('#udstarttime').datetimepicker({
+    language: 'zh-CN',
+    weekStart: 1,
+    todayBtn: 1,//显示为今天的按钮，0无1有
+    autoclose: 1,//单击时间后日历框是否自动关闭，1关闭，0不关闭
+    todayHighlight: 1,//今天高亮显示
+    startView: 2,//展示的样式，1小时，2日
+    minView: 2,//选取到的时间，2天，1小时
+    forceParse: 0
+});
+$('#udendtime').datetimepicker({
+    language: 'zh-CN',
+    weekStart: 1,
+    todayBtn: 1,//显示为今天的按钮，0无1有
+    autoclose: 1,//单击时间后日历框是否自动关闭，1关闭，0不关闭
+    todayHighlight: 1,//今天高亮显示
+    startView: 2,//展示的样式，1小时，2日
+    minView: 2,//选取到的时间，2天，1小时
+    forceParse: 0
+});
Fisheye: Tag 25996 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp
===================================================================
diff -u -r24980 -r25996
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp	(.../index.jsp)	(revision 24980)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp	(.../index.jsp)	(revision 25996)
@@ -6,6 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" type="image/ico" href="favicon.ico" />
+    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
     <%@ include file="../commons/tagLibsPath.jsp" %>
     <title>使用记录</title>
     <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css" type="text/css"/>
@@ -46,6 +47,7 @@
                 <button type="button" class="dx-btn-primary mainNav-shop-btn DeleteBtn" data-target="#deleteModal" data-toggle="modal">删除</button>
                 <button type="button" class="dx-btn-primary mainNav-shop-btn BtnExamine" data-toggle="modal" data-target="#examine">审核</button>
                 <button type="button" class="dx-btn-primary mainNav-shop-btn Createapplication" data-toggle="modal" data-target="#Createapplication">生成申请单</button>
+                <button type="button" class="dx-btn-primary mainNav-shop-btn Createapplication" data-toggle="modal" data-target="#Createapplication">转未审核</button>
             </div>
             <div class="r gridHead_r">
                 <div class="grid-header" style="width:100%">
@@ -133,7 +135,7 @@
                             <div class="form-li fonm-mg">
                                 <label>
                                     <span>性别:</span>
-                                    <select name="addSelect" id="addSelect">
+                                    <select name="addSelect" id="addSelect" class="SlectIeCss">
                                         <option value="0">男</option>
                                         <option value="1">女</option>
                                     </select>
@@ -189,17 +191,16 @@
                             <div class="form-li form-shoushu">
                                 <label for="addoperation">
                                     <span>手术名称:</span>
-                                    <input type="text" name="Inpatient" id="addoperation" class="form-input form-shoushu-input form_shoushu_input">
+                                    <input type="text" name="Inpatient" id="addoperation" class="form-input form-shoushu-input">
                                 </label>
 
                             </div>
-                            <div class="form-li fonm-mg">
+                            <div class="form-li fonm-mg form_m">
                                 <label for="addoperationScheduleId">
                                     <span>手术单号:</span>
-                                    <input type="text" name="Inpatient" id="addoperationScheduleId" class="form-input">
+                                    <input type="text" name="Inpatient" id="addoperationScheduleId" class="form-input form_input">
                                 </label>
                             </div>
-
                         </li>
                         <li class="fonm-Li">
                             <div class="form-li">
@@ -251,14 +252,14 @@
                                 </label>
 
                             </div>
-                            <div class="form-li fonm-mg">
+                            <div class="form-li fonm-mg form_m">
                                 <label for="addreviewTime">
                                     <span>审核时间:</span>
-                                    <input type="text" name="Inpatient" id="addreviewTime" class="form-input" disabled='disabled'>
+                                    <input type="text" name="Inpatient" id="addreviewTime" class="form-input form_input" disabled='disabled'>
                                 </label>
                             </div>
-
                         </li>
+
                     </ul>
                     <span class="PackUp"><em class="packUp_em">收起</em> <i class="icon_packUp glyphicon glyphicon-chevron-up"></i></span>
                     <span class="modal_span1"><i class="icon_i"></i>使用物品信息</span>
@@ -521,8 +522,9 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn  btn_default" data-dismiss="modal">关闭</button>
-                    <button type="button" class="btn btn_default">快速回收</button>
-                    <button type="button" class="btn btn_default">审核</button>
+                    <button type="button" class="btn btn_default" id="recycle">快速回收</button>
+                    <button type="button" class="btn btn_default" id="applicationForm">生成申请单</button>
+                    <button type="button" class="btn btn_default" id="audit">审核</button>
                     <button type="button" class="btn btn-primary AddRecords" id="ModifySave">保存</button>
                 </div>
             </div>