Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js
===================================================================
diff -u -r24970 -r24975
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js	(.../sterilization1.js)	(revision 24970)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js	(.../sterilization1.js)	(revision 24975)
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 //光标默认
 
 $('#mymodal-data').on('shown.bs.modal', function () {
@@ -25,12 +18,11 @@
         $('#HomeMyGrid').css('height',availableHeight)
     }
 })
-var grid,grid1,grid2,grid3,dataView1,dataView2,options1,options2,options3;
-var visibleColumns1=[];
-var percentCompleteThreshold1 = 0;
+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"});
@@ -40,7 +32,7 @@
                 field: 'sterilizationUser',
                 name: '灭菌员',
                 formatter: function (value,row,index,columnDef,dataContext){
-                    return '<a class="color_tbody" data-target="#mymodal-details" data-toggle="modal">'+dataContext.sterilizationUser+'<i class="fafa-edit"></i> </a>'
+                    return '<a class="color_tbody" data-target="#mymodal-ud" data-toggle="modal">'+dataContext.sterilizationUser+'<i class="fafa-edit"></i> </a>'
                 },
                 align: 'center',
             },
@@ -117,15 +109,17 @@
                 align: 'center',
                 width:120,
                 // minWidth:120,
-                formatter: function (value, row, index) {
+                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-details" data-toggle="modal">详情 </a>'+
-                            '<a class="listbtn" onclick="DleteRow()">删除 </a>'
+                            '<a class="listbtn listbtnM"  data-target="#mymodal-ud" data-toggle="modal">详情 </a>'+
+                            '<a class="listbtn" onclick="DelectRow('+JSON.stringify(delectArray)+')">删除</a>'
                 },
             }
          )
 
-    var options = {
+    options= {
         enableCellNavigation: true,
         enableColumnReorder: false,
         forceFitColumns: true,
@@ -206,7 +200,6 @@
     }
     $(function () {
         $.support.cors = true;
-
         dataView = new Slick.Data.DataView({ inlineFilters: true });
         grid = new Slick.Grid("#HomeMyGrid", dataView, columns, options);
         attachAutoResizeDataGrid(grid, "HomeMyGrid", "gridContainer");
@@ -275,7 +268,14 @@
 
             }
         })
+        grid.onClick.subscribe(function(e, args){
+            var gridDatastr=[grid.getData()]
+            // console.log(gridDatastr)
+            var id=gridDatastr[0][args.row].id;
+            AjaxModal(id);
+            particularsGrid(id);
 
+        })
 
     });
 }
@@ -361,10 +361,13 @@
 })
 //灭菌物品列表
 //父子表
+options1 = {
+    enableCellNavigation: true,
+    enableColumnReorder: false
+};
 var indent = 0;
 var parents = [];
 var checkboxSelector;
-var BasketData =[]
 var columns1 = [
     {id: "barcode", name: "条码", minWidth:120,field: "barcode",formatter:TaskNameFormatter},
     {id: "name", name: "名称", minWidth:120,field: "name",},
@@ -385,6 +388,7 @@
     rowHeight:35,
 };
 var searchString = "";
+var AllsterzationGood=[];
 function percentCompleteSort(a, b) {
     return a["percentComplete"] - b["percentComplete"];
 }
@@ -529,7 +533,6 @@
 
 };
 //扫描条码
-var AllsterzationGood=[];
 $("#barCode").keydown(function(e){
     if(e.keyCode == 13){
         if($(this).val()==''){
@@ -550,7 +553,6 @@
                         if(data.success===true){
                             addItem = data.rows[0];
                             var AllBarcode =[];
-                            // console.log(AllsterzationGood)
                             for(var  i=0;i<AllsterzationGood.length;i++){
                                 AllBarcode.push(AllsterzationGood[i].barcode)
                             }
@@ -619,35 +621,22 @@
 })
 function addCleanBasket(){
     var mrdata = [];
-    var columns2 = [
-        {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"}
-    ];
-     options1 = {
-        enableCellNavigation: true,
-        enableColumnReorder: false
-    };
-    grid1 = new Slick.Grid("#sterilizationListTbale", mrdata, columns2, options1);
+    grid1 = new Slick.Grid("#sterilizationListTbale", mrdata, columns1, options1);
 }
 function addCleanBasket1(){
     var mrdata = [];
-    var columns2 = [
-        {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"}
-    ];
-    options1 = {
-        enableCellNavigation: true,
-        enableColumnReorder: false
-    };
-    grid1 = new Slick.Grid("#udsterilizationListTbale", mrdata, columns2, options1);
+    grid1 = new Slick.Grid("#udsterilizationListTbale", mrdata, columns1, options1);
 }
 //统计数据
+var columns5 = [
+    {id: "name", name: "器械包统计名称", minWidth:277.5,field: "name"},
+    {id: "amount", name: "数量", minWidth:277.5,field: "amount",},
+];
+options3 = {
+    enableCellNavigation: true,
+    enableColumnReorder: false,
+    rowHeight:35,
+};
 function addallTableDatas(){
     var allTableDatas
     if($('#addCleanGetCodeArr').val()===''){
@@ -706,30 +695,17 @@
     }
     var Json =$('#countResults').val();
     var mrdata1=[];
+    var mrdata3=[];
+
+
     if(Json==='没有数据'){
-        var mrdata3=[];
-        var columns5 = [
-            {id: "name", name: "器械包统计名称", minWidth:277.5,field: "name"},
-            {id: "amount", name: "数量", minWidth:277.5,field: "amount",},
-        ];
-        options3 = {
-            enableCellNavigation: true,
-            enableColumnReorder: false,
-            rowHeight:35,
-        };
+        mrdata3=[];
         grid3 = new Slick.Grid("#sterilizationListTotal", mrdata3, columns5, options3);
         mrdata1=[];
     }else{
-        var columns6 = [
-            {id: "name", name: "器械包统计名称", minWidth:277.5,field: "name"},
-            {id: "amount", name: "数量", minWidth:277.5,field: "amount",},
-        ];
-        options3 = {
-            enableCellNavigation: true,
-            enableColumnReorder: false,
-            rowHeight:35,
-        };
-        grid3 = new Slick.Grid("#sterilizationListTotal", mrdata1, columns6, options3);
+
+
+        grid3 = new Slick.Grid("#sterilizationListTotal", mrdata1, columns5, options3);
         var countResultsAll= JSON.parse(Json)
         var databaseGood=[];
         for(var k=0;k<countResultsAll.length;k++){
@@ -741,7 +717,6 @@
 
 }
 function allTableDatas(){
-
     var allTableDatas
     if($('.AllData').val()===''){
         allTableDatas=[]
@@ -798,33 +773,19 @@
     }
     var Json =$('#countResults').val();
     var mrdata1 = [];
+    var mrdata2=[];
     if(Json==='没有数据'){
-        var mrdata2=[];
-        var columns4 = [
-            {id: "name", name: "器械包统计名称", minWidth:277.5,field: "name"},
-            {id: "amount", name: "数量", minWidth:277.5,field: "amount",},
-        ];
+        mrdata1=[];
         options2 = {
             enableCellNavigation: true,
             enableColumnReorder: false,
             rowHeight:35,
         };
-        grid2 = new Slick.Grid("#udsterilizationListTotal", mrdata2, columns4, options2);
+        grid2 = new Slick.Grid("#udsterilizationListTotal", mrdata2, columns5, options3);
         mrdata1=[];
     }else{
-
-        var columns3 = [
-            {id: "name", name: "器械包统计名称", minWidth:277.5,field: "name"},
-            {id: "amount", name: "数量", minWidth:277.5,field: "amount",},
-        ];
-        options2 = {
-            enableCellNavigation: true,
-            enableColumnReorder: false,
-            rowHeight:35,
-        };
-        grid2 = new Slick.Grid("#udsterilizationListTotal", mrdata1, columns3, options2);
+        grid2 = new Slick.Grid("#udsterilizationListTotal", mrdata1, columns5, options3);
         var countResultsAll= JSON.parse(Json)
-        // console.log(countResultsAll)
         var databaseGood=[];
         for(var k=0;k<countResultsAll.length;k++){
             mrdata1.push(countResultsAll[k])
@@ -990,11 +951,7 @@
 })
 //修改灭菌信息
 function  particularsGrid(obj){
-    var dataView2;
-    var indent = 0;
-    var parents = [];
-    var checkboxSelector;
-    var BasketData =[]
+    var BasketData =[];
     var additemGood =[];
     var columns1 = [
         {id: "barcode", name: "条码", minWidth:120,field: "barcode",formatter:TaskNameFormatter},
@@ -1004,21 +961,6 @@
         {id: "type", name: "操作", minWidth:120,cssClass: "cell-effort-driven", field: "type"}
     ];
     var sterilizationGird;
-    var addCleanBasketOption = {
-        enableCellNavigation: true,
-        enableColumnReorder: false,
-        forceFitColumns: true,
-        editable: true,
-        enableAddRow: false,
-        asyncEditorLoading: true,
-        topPanelHeight: 35,
-        autoEdit: false,
-        rowHeight:35,
-    };
-    var searchString = "";
-    function percentCompleteSort(a, b) {
-        return a["percentComplete"] - b["percentComplete"];
-    }
     function requiredFieldValidator(value) {
         if(value == null || value == undefined || !value.length){
             return{
@@ -1035,13 +977,10 @@
     }
     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) {
@@ -1075,7 +1014,6 @@
             return false;
         }
         loadData=[];
-        // console.log(data)
         indent = 0;
         var tempId = 0;
         for(var  i=0;i<data.length;i++){
@@ -1175,7 +1113,6 @@
                     }
                     addCleanBaskets(BasketData);
                     allTableDatas();
-
                 }
 
             } else{
@@ -1216,7 +1153,6 @@
                                         return;
                                     }
                                 }
-
                                 if(data.barcodeType==='用户'){
                                     $('#udsterilization').val(addItem.name);
                                     $('.repetitionBarCod').val($('#udbarCode').val());
@@ -1263,14 +1199,9 @@
             }
         }
     });
-
-
-
-
 //父子表end
 }
 function AjaxModal(obj){
-    var str="",ajaxModalAlert={},ajaxModalAlert1={};
     $.ajax({
         url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationRecord.mhtml',
         type:'get',
@@ -1319,15 +1250,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)
                         }
                     }
                 });
@@ -1356,15 +1279,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)
                         }
 
                     }
@@ -1508,7 +1423,23 @@
     }
 
 })
-
+//列表删除
+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{
+                alert(data.message)
+            }
+        }
+    })
+}
 //时间插件
 $('#addstarttime').datetimepicker({
     language: 'zh-CN',
@@ -1539,4 +1470,4 @@
     startView: 2,//展示的样式，1小时，2日
     minView: 2,//选取到的时间，2天，1小时
     forceParse: 0
-});
\ No newline at end of file
+});