Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js
===================================================================
diff -u -r24954 -r24958
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24954)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24958)
@@ -280,7 +280,12 @@
     $(function () {
         $.support.cors = true;
         dataView = new Slick.Data.DataView({ inlineFilters: true });
-        grid = new Slick.Grid("#myGrid", dataView, columns, options);
+        for (var i = 0; i < columns.length; i++) {
+            if (i!=1){
+                visibleColumns.push(columns[i]);//将columns的列push进去
+            }
+        }
+        grid = new Slick.Grid("#myGrid", dataView, visibleColumns, options);
         attachAutoResizeDataGrid(grid, "myGrid", "gridContainer");
         grid.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
         grid.registerPlugin(checkboxSelector);
@@ -487,38 +492,48 @@
     grid01 = new Slick.Grid("#addGoodsGrid", dataView, visibleColumns1, options);
     grid01.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
     grid01.registerPlugin(checkboxSelector);
+    var AllrecordGoods =[];
     $('#tempBarcode').keydown(function(e){
         if(e.keyCode=='13'){
             if($(this).val()==""){
                 alert('请输入条码')
                 return false;
             }else{
                 if($('.Barcode').val()==$(this).val()){
-                    alert('不能重复输入条码');
+                    alert('不能重复输入条码')
                     return false;
+
                 }else{
                     $.ajax({
-                        url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?barcode='+$(this).val(),
+                        url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml',
                         type:'get',
                         dataType:'json',
+                        data:{barcode:$(this).val()},
                         success:function(data){
+                            var database =data.data
                             if(data.success===true){
-                                var database =data.data;
-                                console.log(database.barcode)
-                                // var databaseGood ={"id":(Math.round(Math.random() * 10000)),};
-                                var databaseGood ={"id":data.data.barcode}
+                                var AllBarcode =[];
+                                for(var  i=0;i<AllrecordGoods.length;i++){
+                                    AllBarcode.push(AllrecordGoods[i].barcode)
+                                }
+                                for(var j=0;j<AllBarcode.length;j++){
+                                  if(AllBarcode[j]==$('#tempBarcode').val()){
+                                      alert('这条'+$('#tempBarcode').val()+'已经存在表格中');
+                                      $('#tempBarcode').val('')
+                                      return false;
+                                  }
+                              }
+                                var databaseGood ={id:database.barcode};
                                 $.each(database,function(k,v){
                                     databaseGood[k]=v;
                                 })
-                                dataView.addItem(databaseGood);
-                                console.log(databaseGood)
-                                $('.Barcode').val(data.data.barcode)
-                                grid01.invalidateRows();
+                                AddData.push(databaseGood)
+                                grid01.setData(AddData);
                                 grid01.render();
-                                $('.RecordGoodes').val(JSON.stringify(grid01.getData().getItems()))
+                                $('.Barcode').val(data.data.barcode)
                                 $('#tempBarcode').val('')
-                            }else{
-                                alert(data.message)
+                                $('.RecordGoodes').val(JSON.stringify(grid01.getData()))
+                                AllrecordGoods.push(database)
                             }
                         }
                     })
@@ -528,6 +543,7 @@
     })
     dataView.setItems(AddData);
     dataView.endUpdate();
+
 }
 /* save Data*/
 function KeyBoard(){
@@ -577,27 +593,11 @@
 
     }
     if(addcircuitNurse==''){
-       /* $.testse({
-            'content':'你确定要删除这条数据吗？',
-            'position':'absolute',
-            'actionsheetCloseText':'确定',
-            'status':'2',
-            'elem':"alert-btn-sheet",
-            'buttons':{
-                '确定':function(){
-                    // $('.alert-btn-sheet').close();
-                },
-                '取消':function(){
 
-                }
-            }
-        })*/
         alert('巡回护士不能为空');
         return false;
      }
     if(addhospitalNum==''&&addtreatmentNum==''&&addpatientName==''){
-        // $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>请输入诊疗号或者住院号或者病人姓名')
-        // $ ('#Alert').show ().delay (1500).fadeOut ();
         alert('请输入诊疗号或者住院号或者病人姓名');
     }else{
         $.ajax({
@@ -845,6 +845,7 @@
             autoHeight: false,
             rowHeight: 35
         };
+        var AllrecordGoods =[];//保存修改之前所有的物品
         $.ajax({
             url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadUseItemsByUseRecordId.mhtml',
             async:false,
@@ -856,6 +857,7 @@
                 $('.ModifiedData').val(JSON.stringify(data.rows))
                 var database =data.rows;
                 // console.log(database)
+                AllrecordGoods=database;
                 for(var i=0;i<database.length;i++){
                     var d = (AddData[i] = {});
                     // d.id= database[i].barcode,
@@ -894,20 +896,32 @@
                             data:{barcode:$(this).val()},
                             success:function(data){
                                 var database =data.data
-                                console.log("database",database);
-                                console.log("id",database.barcode);
                                 if(data.success===true){
+                                    // console.log(AllrecordGoods)
+                                    var AllBarcode =[];
+                                    for(var  i=0;i<AllrecordGoods.length;i++){
+                                        AllBarcode.push(AllrecordGoods[i].barcode)
+                                    }
+                                    for(var j=0;j<AllBarcode.length;j++){
+                                        if(AllBarcode[j]==$('#tempBarcodes').val()){
+                                            alert('这条'+$('#tempBarcodes').val()+'已经存在表格中');
+                                            $('#tempBarcodes').val('')
+                                            return false;
+                                        }
+                                    }
+
                                     var databaseGood ={id:database.barcode};
                                     $.each(database,function(k,v){
                                         databaseGood[k]=v;
                                     })
-                                    console.log(databaseGood)
                                     AddData.push(databaseGood)
                                     grid03.setData(AddData);
                                     grid03.render();
                                     $('.Barcode').val(data.data.barcode)
                                     $('#tempBarcodes').val('')
                                     $('.SaveItme').val(JSON.stringify(grid03.getData()))
+                                    AllrecordGoods.push(database)
+
                                 }
                             }
                         })