Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js
===================================================================
diff -u -r24864 -r24898
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24864)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24898)
@@ -18,7 +18,20 @@
 
     }
 })
-var grid,grid01,grid02,grid03,dataView;
+$('.PackUpDeleils').click(function(){
+    // alert('a')
+    if($('.packUp_em1').text()==='收起'){
+        $('.PackupContainer').addClass('PackupContainer_hide').removeClass('PackupContainer_Show');
+        $('.packUp_em1').text('展开')
+        $('.icon_packUp').addClass('glyphicon-chevron-down').removeClass('glyphicon-chevron-up')
+    }else{
+        $('.PackupContainer').addClass('PackupContainer_Show').removeClass('PackupContainer_hide');
+        $('.packUp_em1').text('收起');
+        $('.icon_packUp').addClass('glyphicon-chevron-up').removeClass('glyphicon-chevron-down')
+
+    }
+})
+var grid,grid01,grid02,grid03,dataView,dataView1;
 var options = {
     enableCellNavigation: true,
     enableColumnReorder: false,
@@ -265,14 +278,16 @@
     dataView.setItems(data);
     dataView.endUpdate();
     grid.render();
-
     //事件
     grid.onClick.subscribe(function(e, args){
         var gridDatastr=[grid.getData()]
+        // console.log(gridDatastr)
         var id=gridDatastr[0][args.row].id;
         AjaxModal(id)
         RecordGoodes(id)
         grid.render();
+        $('.detailsId').val(id)
+
     })
     grid.onSort.subscribe(function (e, args) {
         order=(args.sortCol.field, args.sortAsc ? 1 : -1);
@@ -429,7 +444,8 @@
                 return false;
             }else{
                 if($('.Barcode').val()==$(this).val()){
-                    alert('不能重复输入条码')
+                    alert('不能重复输入条码');
+                    return false;
                 }else{
                     $.ajax({
                         url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?barcode='+$(this).val(),
@@ -508,15 +524,27 @@
     }
     var recordGoodsArrays= JSON.stringify(recordGoodsArray)
     if(addwashHandNurse==''){
-        alert('洗手护士不能为空');
-        return;
+
     }
     if(addcircuitNurse==''){
-        // $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>巡回护士不能为空');
-        // $ ('#Alert').show ().delay (1500).fadeOut ();
+       /* $.testse({
+            'content':'你确定要删除这条数据吗？',
+            'position':'absolute',
+            'actionsheetCloseText':'确定',
+            'status':'2',
+            'elem':"alert-btn-sheet",
+            'buttons':{
+                '确定':function(){
+                    // $('.alert-btn-sheet').close();
+                },
+                '取消':function(){
+
+                }
+            }
+        })*/
         alert('巡回护士不能为空');
-        return;
-    }
+        return false;
+     }
     if(addhospitalNum==''&&addtreatmentNum==''&&addpatientName==''){
         // $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>请输入诊疗号或者住院号或者病人姓名')
         // $ ('#Alert').show ().delay (1500).fadeOut ();
@@ -670,7 +698,7 @@
 function RecordGoodes(id){
     var AddData = [];
     var columns1=[],visibleColumns1=[];
-    $(function () {
+    $(function(){
         var checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"});
         columns1.push(checkboxSelector.getColumnDefinition());
         columns1.push(
@@ -746,9 +774,9 @@
                 name: '操作',
                 width:100,
                 minWidth: 100,
-                formatter:function(value,row,index,columnDef,dataContext){
+                formatter:function(value,row,index,cumnDef,dataContext){
                     return '<a  class="Btn_a Btn_details">详情</a>'+
-                           '<a  class="Btn_a Btn_detele"  onclick="OnremoveGood('+value+')">删除</a>'
+                        '<a  class="Btn_a Btn_detele"  onclick="OnremoveGood('+value+')">删除</a>'
                 },
                 cssClass: "cell-title",
             }
@@ -758,17 +786,21 @@
                 visibleColumns1.push(columns1[i]);//将columns的列push进去
             }
         }
-        dataView = new Slick.Data.DataView({inlineFilters: true});
-        grid02 = new Slick.Grid("#GoodsTablGrid",dataView, visibleColumns1, options);
-        grid02.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
-        grid02.registerPlugin(checkboxSelector);
+        var options1 = {
+            editable: false,
+            enableAddRow: false,
+            enableCellNavigation: false,
+            autoHeight: false,
+            rowHeight: 35
+        };
         $.ajax({
             url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadUseItemsByUseRecordId.mhtml',
             async:false,
             type:'get',
             data:{useRecordId:id},
             dataType:'json',
             success:function(data){
+                console.log(data.rows)
                 $('.ModifiedData').val(JSON.stringify(data.rows))
                 var database =data.rows;
                 // console.log(database)
@@ -785,72 +817,67 @@
                     d.validUntilStr =database[i].validUntilStr;
                     d.includeImplant =database[i].includeImplant;
                 }
-                dataView.beginUpdate();
-                dataView.setItems(AddData);
-                dataView.endUpdate();
-                grid02.render();
             }
-
-
         });
+        dataView1 = new Slick.Data.DataView({inlineFilters: true});
+        grid03 = new Slick.Grid("#GoodsTablGrid", AddData, visibleColumns1, options1);
+        grid03.render();
         $('#tempBarcodes').keydown(function(e){
             if(e.keyCode=='13'){
-
                 if($(this).val()==""){
                     alert('请输入条码')
                     return false;
                 }else{
-                    // var ModifiedDataGood =[];
-                    // var ModifiedDataGoosd= JSON.parse($('.ModifiedData').val())
-                    // for(var i=0;i<ModifiedDataGoosd.length;i++){
-                    //     ModifiedDataGood.push(ModifiedDataGoosd[i].barcode)
-                    // }
-                    // console.log(ModifiedDataGood)
-                    // for(var j=0;j<ModifiedDataGood.length;j++){
-                    //
-                    //     var tempBarcodeAll =$('#tempBarcodes').val()
-                    //     if(ModifiedDataGood.indexOf(ModifiedDataGood[j])==-1){
-                    //
-                    //         alert('条码'+tempBarcodeAll+'已经存在');
-                    //         return false;
-                    //     }
-                    // }
-                    // console.log(ModifiedDataGood)
                     if($('.Barcode').val()==$(this).val()){
                         alert('不能重复输入条码')
+                        return false;
                     }else{
+                        // var ModifiedDataGood =[];
+                        // var ModifiedDataGoosd= JSON.parse($('.ModifiedData').val())
+                        // for(var i=0;i<ModifiedDataGoosd.length;i++){
+                        //     ModifiedDataGood.push(ModifiedDataGoosd[i].barcode)
+                        // }
+                        // console.log(ModifiedDataGood)
+                        // for(var j=0;j<ModifiedDataGood.length;j++){
+                        //
+                        //     var tempBarcodeAll =$('#tempBarcodes').val()
+                        //     if(ModifiedDataGood.indexOf(ModifiedDataGood[j])==-1){
+                        //
+                        //         alert('条码'+tempBarcodeAll+'已经存在');
+                        //         return false;
+                        //     }
+                        // }
+                        // console.log(ModifiedDataGood)
                         $.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 databaseGood ={id:0};
+                                    var databaseGood ={id:database.barcode};
                                     $.each(database,function(k,v){
                                         databaseGood[k]=v;
                                     })
-                                    dataView.addItem(databaseGood);
-                                    dataView.beginUpdate();
-                                    dataView.setItems(AddData);
-                                    dataView.endUpdate();
-                                    grid02.invalidateRows();
-                                    grid02.render();
+                                    console.log(databaseGood)
+                                    AddData.push(databaseGood)
+                                    grid03.setData(AddData);
+                                    grid03.render();
                                     $('.Barcode').val(data.data.barcode)
-                                    $('#tempBarcode').val('')
-                                    // grid02.getData().getItems()
-                                    console.log(grid02.getData().getItems())
-                                    // console.log(JSON.stringify(grid02.getData().getItems()))
-                                     $('.SaveItme').val(JSON.stringify(grid02.getData().getItems()))
-
+                                    $('#tempBarcodes').val('')
+                                    $('.SaveItme').val(JSON.stringify(grid03.getData()))
                                 }
                             }
                         })
                     }
                 }
             }
         })
+
     })
+
+
 }
 //封装修改保存
 function ModifySave(){
@@ -934,7 +961,7 @@
         return false;
     }else{
         AjaxModal($('.detailsId').val())
-        RecordGoodes($('.detailsId').val());
+        // RecordGoodes($('.detailsId').val());
     }
 })
 //刷新
@@ -950,7 +977,6 @@
 function OnremoveGood(deleteId){
     var datadelete=grid02.getData().getItems()[deleteId]
     var itemId = new Array()
-
     dataview.deleteItem(itemId[j]);   //删除数据
     grid.invalidate();
     grid.render();//重新渲染
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css
===================================================================
diff -u -r24864 -r24898
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css	(.../index.css)	(revision 24864)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css	(.../index.css)	(revision 24898)
@@ -1,3 +1,6 @@
+button{
+    border: 0;
+}
 .modal-header{
     background: #31b546;
     height:37px;
@@ -178,7 +181,7 @@
 em{
     font-style: normal;
 }
-.PackUp{
+.PackUp,.PackUpDeleils{
     display: inline-block;
     height:25px;
     line-height: 25px;
@@ -238,8 +241,11 @@
     font-weight: normal;
 }
 .form-shoushu-input{
-    width: 405px;
+    width: 410px;
 }
+.form_shoushu_input{
+    width: 410px;
+}
 .modal_span1,.modal_span{
     margin-bottom: 10px;
     background: #f2f2f2;
@@ -343,11 +349,15 @@
 .MinHeight{
     min-width: 1000px;
 }
-.modal-bodys{
-    height: 500px;
-    overflow-x: auto;
+/*.modal-bodys{*/
+    /*overflow-x: auto;*/
+/*}*/
+@media screen and (max-width: 1280px) {
+    .modal-bodys{
+        height: 450px;
+        overflow-x: auto;
+    }
 }
-
 input{outline:none;border: none;}
 .mygridgoods{
     width: 100%;
@@ -380,8 +390,9 @@
     width: 800px;
 }
 #addGoodsGrid,#GoodsTablGrid{
-    min-height:150px !important;
+    /*min-height:150px !important;*/
     width: 100%;
+    height:150px;
 }
 .addGoodsGrid_body{
     width: 770px;
@@ -414,4 +425,19 @@
 }
 .Btn_details{
     margin-right:4px;
+}
+/*btn*/
+.modal-footer{
+    text-align: center;
+}
+.modal-footer .AddRecord{
+    background: #7ae271;
+    color:#fff;
+    border: 1px solid #7ae271;
+
+}
+.btn_default{
+    background: #fff;
+    color:#5bc069;
+    border: 1px solid #7ae271;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp
===================================================================
diff -u -r24864 -r24898
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp	(.../index.jsp)	(revision 24864)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp	(.../index.jsp)	(revision 24898)
@@ -4,6 +4,7 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" type="image/ico" href="favicon.ico" />
     <%@ include file="../commons/tagLibsPath.jsp" %>
     <title>使用记录</title>
@@ -22,8 +23,7 @@
     <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/Respond-master/dest/respond.min.js"></script>
     <%--<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/css/useRecord/index1.css">--%>
     <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/css/useRecord/index.css">
-
-
+    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/css/useRecord/modal.css">
 </head>
 <body>
     <input type="hidden" class="DeleteInput">
@@ -80,7 +80,7 @@
                             <div class="form-li">
                                 <label for="addhospitalNum">
                                     <span><i class="icon_color">*</i> 住院号:</span>
-                                    <input type="text" name="addhospitalNum" id="addhospitalNum" autofocus="autofocus" class="form-input">
+                                    <input type="text" name="addhospitalNum" id="addhospitalNum"  class="form-input"  autofocus="autofocus"/>
                                 </label>
                             </div>
                             <div class="form-li fonm-mg">
@@ -190,7 +190,7 @@
                             <div class="form-li form-shoushu">
                                 <label for="addoperation">
                                     <span>手术名称:</span>
-                                    <input type="text" name="Inpatient" id="addoperation" class="form-input form-shoushu-input">
+                                    <input type="text" name="Inpatient" id="addoperation" class="form-input form-shoushu-input form_shoushu_input">
                                 </label>
 
                             </div>
@@ -287,8 +287,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                    <button type="button" class="btn btn-primary AddRecord"  aria-label="Close">保存</button>
+                    <button type="button" class="btn btn_default" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn  AddRecord"  aria-label="Close">保存</button>
                 </div>
             </div>
         </div>
@@ -305,10 +305,12 @@
                     </button>
                     <h4 class="modal-title"><span class="glyphicon glyphicon-list-alt"></span>使用记录</h4>
                 </div>
-                <div class="modal-body">
-                    <!-- <p>弹出层主体内容</p> -->
+                <div class="modal-body modal-bodys">
+                    <!-- <p>弹出层主体内容</p>-->
+
+
                     <span class="modal_span"><i class="icon_i"></i>基础数据</span>
-                    <ul id="user_li">
+                    <ul id="user_li" class="PackupContainer PackupContainer_Show">
                         <li class="fonm-Li">
                             <div class="form-li">
                                 <label for="hospitalNum">
@@ -496,7 +498,7 @@
 
                         </li>
                     </ul>
-                    <%--<span class="PackUp"><em class="packUp_em">收起</em> <i class="icon_packUp glyphicon glyphicon-chevron-up"></i></span>--%>
+                    <span class="PackUpDeleils"><em class="packUp_em1">收起</em> <i class="icon_packUp glyphicon glyphicon-chevron-up"></i></span>
                     <span class="modal_span1">使用物品信息</span>
                     <ul>
                         <li class="fonm-Li">
@@ -514,18 +516,27 @@
                             </div>
                         </li>
                     </ul>
+    <!--
                     <div class="Goods" id="Goods">
                         <div >
                             <div class="MinHeight" >
                                 <div class="addGoods_content">
                                     <div class="addGoodsGrid_body">
-                                        <div id="GoodsTablGrid"></div>
+                                        <div id="GoodsTablGrid" style="width: 100%;height: 200px;position: relative;"></div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
+
+    -->
+
+                <div class="addGoodsGrid_body">
+                        <div id="GoodsTablGrid"></div>
                 </div>
+
+
+                </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
                     <button type="button" class="btn btn-default">快速回收</button>
@@ -536,7 +547,6 @@
         </div>
     </div>
     <!-- details e-->
-
     <!--delete s-->
     <div  class="modal" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
     <div class="modal-dialog" id="modal-dialog">
@@ -552,7 +562,6 @@
     </div>
     </div>
     <!--delete e-->
-
     <!--examine   e-->
     <div  class="modal examineAlert" id="examine" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
         <div class="modal-dialog" id="modal-dialog">
@@ -568,7 +577,6 @@
         </div>
     </div>
     <!--examine  s-->
-
     <!--Createapplication e-->
     <div  class="modal" id="Createapplication" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
         <div class="modal-dialog" id="modal-dialog">
@@ -584,6 +592,7 @@
         </div>
     </div>
     <!--Createapplication s-->
+
     <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/jquery-1.9.1/js/jquery-1.9.1.js"></script>
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/firebugx.js"></script>
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery-ui-1.11.3.min.js"></script>
@@ -605,7 +614,6 @@
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellcopymanager.js"></script>
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellselectionmodel.js"></script>
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.rowselectionmodel.js"></script>
-    <%--<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/libs/jquery.dropkick-1.0.0.js"></script>--%>
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js"></script>
     <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.grid.js"></script>
     <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
@@ -614,6 +622,8 @@
     <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/useRecord/SlickGridRecord.js"></script>--%>
+    <%--<script src="${basePath}/dx-disinfectsystem/js/useRecord/modal.js"></script>--%>
     <script src="${basePath}/dx-disinfectsystem/js/useRecord/slickGridRecord.js"></script>
+<%----%>
 </body>
 </html>
\ No newline at end of file