Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(revision 0)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(revision 24798)
@@ -0,0 +1,889 @@
+//公共
+var grid,grid01,grid02,dataView;
+var options = {
+    enableCellNavigation: true,
+    enableColumnReorder: false,
+    rowHeight: 28,
+    editable: false,
+    enableAddRow: false,
+    forceFitColumns: true,
+    checked:true,
+    enableForHeaderCells:true
+};
+var data =[],columns = [],visibleColumns = [];
+//动态计算表格列宽
+var DATAGRID_MIN_HEIGHT = 0;
+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);
+    });
+}
+function destroyAutoResize() {
+    $(window).trigger('resize').off('resize');
+}
+function calculateGridNewDimensions(gridId, gridContainerId) {
+    var availableHeight = $(window).height() - $('#' + gridId).offset().top - DATAGRID_BOTTOM_PADDING-$('#pager').height()-window.parent.$(".head-index").height()-window.parent.$(".content-index").height()-$('.gridBtn').height()+90;
+    var availableWidth = $('#' + gridContainerId).width();
+    var newHeight = availableHeight;
+    var newWidth = availableWidth;
+    if (newHeight < DATAGRID_MIN_HEIGHT) {
+        newHeight = DATAGRID_MIN_HEIGHT;
+    }
+    if (newWidth < DATAGRID_MIN_WIDTH) {
+        newWidth = DATAGRID_MIN_WIDTH;
+    }
+
+    return {
+        height: newHeight,
+        width: newWidth
+    };
+}
+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 HomeList(){
+    var checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"});
+    columns.push(checkboxSelector.getColumnDefinition());
+    columns.push(
+        {
+            field: 'id',
+            name: 'ID',
+            align:'center',
+            sortable: true,
+            minWidth: 100,
+        },
+        {
+            id: "patientName",
+            name: "病人",
+            field: "patientName",
+            width: 120,
+            minWidth: 120,
+            cssClass: "cell-title",
+            sortable: true,            formatter: function (value,row,index,columnDef,dataContext){
+                return '<a class="color_tbody" data-target="#mymodal-details" data-toggle="modal" onclick="ClickName('+dataContext.id+')">'+dataContext.patientName+'<i class="fafa-edit"></i> </a>'
+            },
+        },
+        { id: "status",
+            field: 'status',
+            name: '状态',
+            sortable: true,
+            cssClass: "cell-title",
+            minWidth: 100,
+
+        },
+        {
+            field: 'hospitalNum',
+            name: '住院号',
+            sortable: true,
+            id: "hospitalNum",
+            cssClass: "cell-title",
+            minWidth: 100,
+            formatter: function (value,row,index,columnDef,dataContext){
+                return '<a class="color_tbody" data-target="#mymodal-details" data-toggle="modal" onclick="ClickName('+dataContext.id+')">'+dataContext.hospitalNum+'<i class="fafa-edit"></i> </a>'
+            },
+        },
+        {
+            field: 'treatmentNum',
+            name: '诊疗号',
+            sortable: true,
+            id: "treatmentNum",
+            cssClass: "cell-title",
+            minWidth: 100,
+            formatter: function (value,row,index,columnDef,dataContext){
+                return '<a class="color_tbody" data-target="#mymodal-details" data-toggle="modal" onclick="ClickName('+dataContext.id+')">'+dataContext.treatmentNum+'<i class="fafa-edit"></i> </a>'
+            },
+        },
+        {
+            field: 'operationTimeStr',
+            name: '手术时间',
+            id: "operationTimeStr",
+            cssClass: "cell-title",
+            sortable: true,
+            minWidth: 100,
+        },
+        {
+            field: 'patientAge',
+            name: '年龄',
+            id: "patientAge",
+            cssClass: "cell-title",
+            sortable: true,
+            minWidth: 100,
+        },
+        {
+            field: 'patientIDCard',
+            name: '身份证号码',
+            id: "patientIDCard",
+            cssClass: "cell-title",
+            sortable: true,
+            minWidth: 100,
+        },
+        {
+            field: 'doctorName',
+            name: '医生',
+            id: "doctorName",
+            cssClass: "cell-title",
+            sortable: true,
+            minWidth: 100,
+        },
+        {
+            field: 'operation',
+            name: '手术名称',
+            id: "operation",
+            cssClass: "cell-title",
+            sortable: true,
+            minWidth: 100,
+
+        },
+        {
+            field: 'operator',
+            name: '录入人',
+            id: "operator",
+            cssClass: "cell-title",
+            sortable: true,
+            minWidth: 100,
+
+        },
+        {
+            field: 'depart',
+            name: '录入科室',
+            id: "depart",
+            cssClass: "cell-title",
+            sortable: true,
+            minWidth: 100,
+
+        },
+        {
+            field: 'enteringDateStr',
+            name: '录入时间',
+            id: "enteringDateStr",
+            cssClass: "cell-title",
+            sortable: true,
+            minWidth: 100,
+
+        },
+        {
+            field: 'applicationTimeStr',
+            name: '申请时间',
+            id: "applicationTimeStr",
+            cssClass: "cell-title",
+            sortable: true,
+            minWidth: 100,
+
+        },
+        {
+            field: 'remark',
+            name: '备注',
+            id: "remark",
+            cssClass: "cell-title",
+            sortable: true,
+            minWidth: 100,
+
+        }
+    )
+    //将id列隐藏
+    for (var i = 0; i < columns.length; i++) {
+        if (i!=1){
+            visibleColumns.push(columns[i]);//将columns的列push进去
+        }
+    }
+    var mytranslation = {
+        pagelabel: "页",
+        currentpage: "当前页",
+        refresh: "刷新",
+        recordstatelabel: "显示",
+        currentrecords: "显示/隐藏当前记录状态",
+        perpage: "每页条数",
+        pageminus: "上一页",
+        pageplus: "下一页",
+        resultset_first: "第一页",
+        resultset_prev: "上一页",
+        resultset_next: "下一页",
+        resultset_last: "最后一页"
+    };
+   dataView = new Slick.Data.DataView({inlineFilters: true});
+    grid = new Slick.Grid("#myGrid", dataView, visibleColumns, options);
+    attachAutoResizeDataGrid(grid, "myGrid", "gridContainer");
+    grid.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
+    grid.registerPlugin(checkboxSelector);
+    var pagercontent =$("#pager");
+    var url=WWWROOT+'/disinfectSystem/useRecord/useRecordController/findUseRecordList.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.endUpdate();
+    grid.render();
+
+    //事件
+    grid.onClick.subscribe(function(e, args){
+        // AjaxModal(205);
+        // RecordGoodes(205);
+        dataView.beginUpdate();
+        dataView.setItems(data);
+        dataView.endUpdate();
+        grid.render();
+    })
+    grid.onSort.subscribe(function (e, args) {
+        order=(args.sortCol.field, args.sortAsc ? 1 : -1);
+        var Thisvleu=$('#txtSearch').val();
+        pageIng(url,pagercontent,grid,'',mytranslation,'',order,Thisvleu,'');
+    });
+    grid.onSelectedRowsChanged.subscribe(function(e,args){
+        var selectedRows = args.rows;//点击选中的数据
+        if(selectedRows==''){
+            $('.DeleteInput').val('');
+        }else{
+            var itemId = new Array();
+            var GridData = grid.getData();//得到的数据
+            for (var i = 0; i < selectedRows.length; i++) {
+                itemId.push(GridData[selectedRows[i]].id)
+                $('.DeleteInput').val(JSON.stringify(itemId));
+                $('.detailsId').val(GridData[selectedRows[i]].id)
+                $('.detailsStatus').val(GridData[selectedRows[i]].status)
+            }
+
+        }
+    })
+    $("#txtSearch").keyup(function (e) {
+        if (e.which == 13) {
+            var Thisvleu=$(this).val();
+            pageIng(url,pagercontent,grid,'',mytranslation,'',order,Thisvleu,'');
+        }
+    });
+    //delete
+    $('.DeleteBtn').on('click',function(){
+        if($('.DeleteInput').val()==''){
+            alert('请选择一行数据');
+        }else{
+            var idcards= $('.DeleteInput').val()
+            $.ajax({
+                url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/deleteUseRecord.mhtml?useRecordIds='+idcards,
+                type:'get',
+                dataType:'json',
+                success:function(data){
+                    if(data.success===true){
+                        window.location.href = window.location.href;
+                    }else{
+                        alert(data.message)
+                    }
+                }
+            })
+        }
+    });
+
+}
+//调用
+$(function(){
+    HomeList();
+    addGoodsGrid();
+});
+/*add  addGoodsGrid list table*/
+
+function addGoodsGrid(){
+    var AddData = [], columns1=[],visibleColumns1=[];
+    var checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"});
+    columns1.push(checkboxSelector.getColumnDefinition());
+    columns1.push(
+        {
+            id:'id',
+            field:'Id',
+            name:'id',
+            cssClass: "cell-title",
+        },
+        {   id:'barcode',
+            field: 'barcode',
+            name: '条码',
+            cssClass: "cell-title",
+
+        },
+        {
+            id:'showTousseName',
+            field: 'showTousseName',
+            name: '名称',
+            cssClass: "cell-title",
+        },
+        {
+            id:'isUrgentForUseRecord',
+            field: 'isUrgentForUseRecord',
+            name: '加急',
+            cssClass: "cell-title",
+            width:50,
+            minWidth: 50,
+        },
+        {
+            id:'amount',
+            field: 'amount',
+            name: '数量',
+            cssClass: "cell-title",
+        },
+        {
+            id:'packageType',
+            field: 'packageType',
+            name: '包装类型',
+            cssClass: "cell-title",
+        },
+        {
+            id:'idCardUseAmount',
+            field: 'idCardUseAmount',
+            name: '批次',
+            cssClass: "cell-title",
+        },
+        {
+            id:'validUntilStr',
+            field: 'validUntil',
+            name: '失效日期',
+            cssClass: "cell-title",
+        },
+        {
+            id:'Img',
+            field: 'Img',
+            name: '图片',
+            formatter: function (value,row,index){
+                return '<a  id="runDataxJob" class="btn btn-xs btn-warning" data-toggle="modal" data-target="#MyImg"><i class="fa fa-edit"></i> 图片</a>'
+            },
+            cssClass: "cell-title",
+        },
+        {
+            id:'includeImplant',
+            field: 'includeImplant',
+            name: '植入物是使用情况',
+            cssClass: "cell-title",
+        },
+        {
+            id:'types',
+            field: 'types',
+            name: '操作',
+            formatter:function(index,row,value){
+                return '<a onclick="addonmover()">删除</a>'
+            },
+            cssClass: "cell-title",
+        }
+    );
+    for (var i = 0; i < columns1.length; i++) {
+        if (i!=1){
+            visibleColumns1.push(columns1[i]);//将columns的列push进去
+        }
+    }
+    dataView = new Slick.Data.DataView({inlineFilters: true});
+    grid01 = new Slick.Grid("#addGoodsGrid", dataView, visibleColumns1, options);
+    grid01.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选
+    grid01.registerPlugin(checkboxSelector);
+    $('#tempBarcode').keydown(function(e){
+        if(e.keyCode=='13'){
+            if($(this).val()==""){
+                alert('请输入条码')
+                return false;
+            }else{
+                if($('.Barcode').val()==$(this).val()){
+                    alert('不能重复输入条码')
+                }else{
+                    $.ajax({
+                        url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?barcode='+$(this).val(),
+                        type:'get',
+                        dataType:'json',
+                        success:function(data){
+                            if(data.success===true){
+                                var database =data.data;
+                                var databaseGood ={"id":(Math.round(Math.random() * 10000)),};
+                                $.each(database,function(k,v){
+                                    databaseGood[k]=v;
+                                })
+                                dataView.addItem(databaseGood);
+                                $('.Barcode').val(data.data.barcode)
+                                grid01.invalidateRows();
+                                grid01.render();
+                                $('.RecordGoodes').val(JSON.stringify(grid01.getData().getItems()))
+                                $('#tempBarcode').val('')
+                            }else{
+                                alert(data.message)
+                            }
+                        }
+                    })
+                }
+            }
+        }
+    })
+    dataView.setItems(AddData);
+    dataView.endUpdate();
+};
+/* save Data*/
+$('.AddRecord').click(function(){
+    var addhospitalNum = $('#addhospitalNum').val();//住院号
+    var addtreatmentNum =$('#addtreatmentNum').val();//诊疗号
+    var addwashHandNurse =$('#addwashHandNurse').val();//洗手护士
+    var addcircuitNurse =$('#addcircuitNurse').val()//巡回护士
+    var adddepart =$('#adddepart').val()//科室
+    var addoperationRoom =$('#addoperationRoom').val()//手术间
+    var addpatientAge=$('#addpatientAge').val()//年纪
+    var patientSex =$('#addSelect').val();//性别
+    var addpatientArea =$('#addpatientArea').val();//病区
+    var addroomNumber =$('#addroomNumber').val()//病室
+    var addbedNumber =$('#addbedNumber').val()//床位
+    var addpatientIDCard =$('#addpatientIDCard').val();//身份证
+    var adddoctorName =$('#adddoctorName').val();//医生
+    var addspecialInfection=$('#addspecialInfection').val();//特殊感染类型
+    var addoperation =$('#addoperation').val();//手术名称
+    var addoperationScheduleId =$('#addoperationScheduleId').val();//手术单号
+    var addoperationTime =$('#addoperationTime').val();//手术时间
+    var  addvisitId =$('#addvisitId').val();//住院次数
+    var addenteringTime=$('#addenteringTime').val();  // enteringDateStr录入时间
+    var addoperator =$('#addoperator').val();//录入人
+    var addreviewer =$('#addreviewer').val() // 缺审核人
+    var addapplicationTime =$('#addapplicationTime').val();// 申请时间
+    var addremark =$('#addremark').val();//备注
+    var addreviewTime =$('#addreviewTime').val();//审核时间
+    var addpatientName =$('#addpatientName').val();//姓名
+    var tempBarcode =$('#tempBarcode').val();//机械报信息
+    var recordGoodsArray=[];
+    var allTableData =$('.RecordGoodes').val();
+    var allTableDataJson=[]
+    if(!allTableData){
+        allTableDataJson;
+    }else{
+        allTableDataJson= JSON.parse(allTableData)
+    }
+    for(var i=0;i<allTableDataJson.length;i++){
+        var objConservation = {};
+        var data = allTableDataJson[i];
+        objConservation.barcode = data.barcode;
+        recordGoodsArray.push(objConservation);
+    }
+    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 ();
+        alert('巡回护士不能为空');
+        return;
+    }
+    if(addhospitalNum==''&&addtreatmentNum==''&&addpatientName==''){
+        // $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>请输入诊疗号或者住院号或者病人姓名')
+        // $ ('#Alert').show ().delay (1500).fadeOut ();
+        alert('请输入诊疗号或者住院号或者病人姓名');
+    }else{
+        $.ajax({
+            url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/saveUseRecord.mhtml',
+            type:'post',
+            async:false,
+            dataType:'json',
+            data:{hospitalNum:addhospitalNum,treatmentNum :addtreatmentNum,addwashHandNurse:addwashHandNurse,
+                circuitNurse:addcircuitNurse,depart:adddepart,operationRoom:addoperationRoom,patientAge:addpatientAge,patientSex:patientSex,patientArea:addpatientArea,roomNumber:addroomNumber,
+                patientIDCard:addpatientIDCard,bedNumber:addbedNumber,doctorName:adddoctorName,surgeon:adddoctorName,specialInfection:addspecialInfection,operation:addoperation,
+                operationScheduleId:addoperationScheduleId,operationTimeStr:addoperationTime,visitId:addvisitId,enteringDateStr:addenteringTime,operator:addoperator,
+                remark:addremark,patientName:addpatientName,applicationTime:addapplicationTime,items:recordGoodsArrays,departCoding:currentOrgUnitCode},
+            success:function(data){
+                if(data.success===true){
+                    $("#mymodal-data").modal('hide');
+                    window.location.href = window.location.href;
+                }else{
+                    alert(data.message)
+                }
+            }
+        })
+    }
+});
+/*details*/
+function ClickName(id){
+    if(id!=''){
+        AjaxModal(id);
+        RecordGoodes(id);
+        $('.ModifySaveId').val(id)
+
+    }
+};
+// 封装动态模态框
+function AjaxModal(id){
+    var str="";
+    $.ajax({
+        url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadUseRecordById.mhtml',
+        type:'get',
+        async:true,
+        dataType:'json',
+        data:{useRecordId:id},
+        success:function(data){
+            if(data.success===true){
+                var datas =data.data;
+                $('.ModifySaveStr').val(JSON.stringify(datas))
+                $('#hospitalNum').val(datas.hospitalNum);//住院号
+                $('#treatmentNum').val(datas.treatmentNum);//诊疗号
+                $('#washHandNurse').val(datas.washHandNurse);//洗手护士
+                $('#circuitNurse').val(datas.circuitNurse)//巡回护士
+                $('#depart').val(datas.depart)//科室
+                $('#depart').attr('disabled',true);
+                $('#operationRoom').val(datas.operationRoom)//手术间
+                $('#patientAge').val(datas.patientAge)//年纪
+                $('#Select').val();//性别
+                $('#patientArea').val(datas.patientArea);//病区
+                $('#roomNumber').val(datas.roomNumber)//病室
+                $('#bedNumber').val(datas.bedNumber)//床位
+                $('#patientIDCard').val(datas.patientIDCard);//身份证
+                $('#doctorName').val(datas.doctorName);//医生
+                $('#specialInfection').val();//特殊感染类型
+                $('#operation').val(datas.operation);//手术名称
+                $('#operationScheduleId').val(datas.operationScheduleId);//手术单号
+                $('#operationTime').val(datas.operationTimeStr);//手术时间
+                $('#visitId').val(datas.visitId);//住院次数
+                $('#enteringTime').val(datas.enteringDateStr);  // enteringDateStr录入时间
+                $('#operator').val(datas.operator);//录入人
+                $('#reviewer').val() // 缺审核人
+                $('#applicationTime').val(datas.applicationTimeStr);// 申请时间
+                $('#remark').val(datas.remark);//备注
+                $('#reviewTime').val(datas.reviewTimeStr);//审核时间
+                $('#patientName').val(datas.patientName);//姓名
+            }
+        }
+
+    })
+
+};
+//加载使用物品明细
+function RecordGoodes(id){
+    var AddData = [];
+    var columns1=[],visibleColumns1=[];
+    $(function () {
+        var checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"});
+        columns1.push(checkboxSelector.getColumnDefinition());
+        columns1.push(
+            {
+                id:'id',
+                field:'Id',
+                name:'id',
+                cssClass: "cell-title",
+                width:30,
+                minWidth: 30,
+            },
+            {   id:'barcode',
+                field: 'barcode',
+                name: '条码',
+                cssClass: "cell-title",
+                width:30,
+                minWidth: 30,
+
+            },
+            {
+                id:'showTousseName',
+                field: 'showTousseName',
+                name: '名称',
+                cssClass: "cell-title",
+            },
+            {
+                id:'isUrgentForUseRecord',
+                field: 'isUrgentForUseRecord',
+                name: '加急',
+                cssClass: "cell-title",
+            },
+            {
+                id:'amount',
+                field: 'amount',
+                name: '数量',
+                cssClass: "cell-title",
+            },
+            {
+                id:'packageType',
+                field: 'packageType',
+                name: '包装类型',
+                cssClass: "cell-title",
+            },
+            {
+                id:'idCardUseAmount',
+                field: 'idCardUseAmount',
+                name: '批次',
+                cssClass: "cell-title",
+            },
+            {
+                id:'validUntilStr',
+                field: 'validUntil',
+                name: '失效日期',
+                cssClass: "cell-title",
+            },
+            {
+                id:'Img',
+                field: 'Img',
+                name: '图片',
+                formatter: function (value,row,index){
+                    return '<a  id="runDataxJob" class="btn btn-xs btn-warning" data-toggle="modal" data-target="#MyImg"><i class="fa fa-edit"></i> 图片</a>'
+                },
+                cssClass: "cell-title",
+            },
+            {
+                id:'includeImplant',
+                field: 'includeImplant',
+                name: '植入物是使用情况',
+                cssClass: "cell-title",
+            },
+            {
+                id:'types',
+                field: 'types',
+                name: '操作',
+                formatter:function(index,row,value){
+                    return '<a onclick="addonmover()">删除</a>'
+                },
+                cssClass: "cell-title",
+            }
+        );
+        for (var i = 0; i < columns1.length; i++) {
+            if (i!=1){
+                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);
+        $.ajax({
+            url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadUseItemsByUseRecordId.mhtml',
+            async:false,
+            type:'get',
+            data:{useRecordId:id},
+            dataType:'json',
+            success:function(data){
+                var database =data.rows;
+                for(var i=0;i<database.length;i++){
+                    var d = (AddData[i] = {});
+                    d.id= i,
+                        d.barcode=database[i].barcode;
+                    d.showTousseName =database[i].barcode;
+                    d.showTousseName =database[i].barcode;
+                    d.isUrgentForUseRecord =database[i].isUrgentForUseRecord;
+                    d.amount =database[i].amount;
+                    d.packageType =database[i].packageType;
+                    d.idCardUseAmount =database[i].idCardUseAmount;
+                    d.validUntilStr =database[i].validUntilStr;
+                    d.includeImplant =database[i].includeImplant;
+                }
+                dataView.beginUpdate();
+                dataView.setItems(AddData);
+                dataView.endUpdate();
+                grid02.render();
+                $('.ModifiedData').val(JSON.stringify(grid02.getData().getItems()))
+            }
+
+
+        });
+        $('#tempBarcodes').keydown(function(e){
+            if(e.keyCode=='13'){
+                if($(this).val()==""){
+                    alert('请输入条码')
+                    return false;
+                }else{
+                    if($('.Barcode').val()==$(this).val()){
+                        alert('不能重复输入条码')
+                    }else{
+                        $.ajax({
+                            url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?barcode='+$(this).val(),
+                            type:'get',
+                            dataType:'json',
+                            success:function(data){
+                                if(data.success===true){
+                                    var database =data.data;
+                                    var databaseGood ={"id":(Math.round(Math.random() * 10000)),};
+                                    $.each(database,function(k,v){
+                                        databaseGood[k]=v;
+                                    })
+                                    dataView.addItem(databaseGood);
+                                    grid02.invalidateRows();
+                                    grid02.render();
+                                    $('.ModifiedData').val(JSON.stringify(grid02.getData().getItems()))
+
+                                }else{
+                                    alert(data.message)
+                                }
+                            }
+                        })
+                    }
+                }
+            }
+        })
+
+    })
+};
+//封装修改保存
+function ModifySave(){
+    var ModifySaveStr = $('.ModifySaveStr').val();
+    var ModifySaveId =$('.ModifySaveId').val();
+    console.log(ModifySaveId)
+    var RecordGoodes =$('#RecordGoodes').val();
+    var hospitalNum = $('#hospitalNum').val();//住院号
+    var treatmentNum =$('#treatmentNum').val();//诊疗号
+    var washHandNurse =$('#washHandNurse').val();//洗手护士
+    var circuitNurse =$('#circuitNurse').val()//巡回护士
+    var depart =$('#depart').val()//科室
+    var operationRoom =$('#operationRoom').val()//手术间
+    var patientAge=$('#patientAge').val()//年纪
+    var patientSex =$('#Select').val();//性别
+    var patientArea =$('#patientArea').val();//病区
+    var roomNumber =$('#roomNumber').val()//病室
+    var bedNumber =$('#bedNumber').val()//床位
+    var patientIDCard =$('#patientIDCard').val();//身份证
+    var doctorName =$('#doctorName').val();//医生
+    var specialInfection=$('#specialInfection').val();//特殊感染类型
+    var operation =$('#operation').val();//手术名称
+    var operationScheduleId =$('#operationScheduleId').val();//手术单号
+    var operationTime =$('#operationTime').val();//手术时间
+    var visitId =$('#visitId').val();//住院次数
+    var enteringTime=$('#enteringTime').val();  // enteringDateStr录入时间
+    var operator =$('#operator').val();//录入人
+    var reviewer =$('#reviewer').val() // 缺审核人
+    var applicationTime =$('#applicationTime').val();// 申请时间
+    var remark =$('#remark').val();//备注
+    var reviewTime =$('#reviewTime').val();//审核时间
+    var patientName =$('#patientName').val();//姓名
+    var tempBarcode =$('#tempBarcodes').val();//机械报信息
+
+    var recordGoodsArray=[];
+    var allTableData =$('.ModifiedData').val();
+    var allTableDataJson=[]
+    if(!allTableData){
+        allTableDataJson;
+    }else{
+        allTableDataJson= JSON.parse(allTableData)
+    }
+    for(var i=0;i<allTableDataJson.length;i++){
+        var objConservation = {};
+        var data = allTableDataJson[i];
+        objConservation.barcode = data.barcode;
+        recordGoodsArray.push(objConservation);
+    }
+    var recordGoodsArrays= JSON.stringify(recordGoodsArray)
+console.log(recordGoodsArrays)
+
+    if(hospitalNum==''&&treatmentNum==''&&patientName==''){
+        $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>请输入诊疗号或者住院号或者病人姓名')
+        $ ('#Alert').show ().delay (1500).fadeOut ();
+    }else{
+        $.ajax({
+            url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/saveUseRecord.mhtml',
+            type:'post',
+            async:false,
+            dataType:'json',
+            data:{id:ModifySaveId,originalFormParams:ModifySaveStr,originalItems:RecordGoodes,hospitalNum:hospitalNum,treatmentNum :treatmentNum,addwashHandNurse:washHandNurse,
+                circuitNurse:circuitNurse,depart:depart,operationRoom:operationRoom,patientAge:patientAge,patientSex:patientSex,patientArea:patientArea,roomNumber:roomNumber,
+                patientIDCard:patientIDCard,bedNumber:bedNumber,doctorName:doctorName,surgeon:doctorName,specialInfection:specialInfection,operation:operation,
+                operationScheduleId:operationScheduleId,operationTimeStr:operationTime,visitId:visitId,enteringDateStr:enteringTime,operator:operator,
+                remark:remark,patientName:patientName,applicationTime:applicationTime,items:recordGoodsArrays,departCoding:currentOrgUnitCode},
+            success:function(data){
+                if(data.success===true){
+                    $("#mymodal-details").modal('hide');
+                    window.location.href = window.location.href;
+                }else{
+                    alert(data.message)
+                }
+            }
+        })
+    }
+}
+$('#ModifySave').click(function(){
+    ModifySave();
+});
+$('.BtnDetails').click(function(){
+    if($('.detailsId').val()==''){
+        alert('请选中一行数据');
+        return false;
+    }else{
+        AjaxModal($('.detailsId').val())
+        RecordGoodes($('.detailsId').val());
+    }
+})
+//审核
+$('.BtnExamine').click(function(){
+    if($('.DeleteInput').val()==''){
+        alert('请选择一条数据');
+        return false;
+    }else{
+        if($('.detailsStatus').val()==='已审核'){
+            alert('本条记录已经通过审核');
+            return false;
+        }
+        if($('.detailsStatus').val()==='已申请'){
+            alert('本条记录已经通过申请');
+            return false;
+        }else{
+            $('.examineAlert').click(function(){
+                var idcards= $('.DeleteInput').val();
+                $.ajax({
+                    url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewMultiUseRecord.mhtml',
+                    type:'get',
+                    dataType:'json',
+                    async:false,
+                    data:{useRecordIds:idcards},
+                    success:function(data){
+                        if(data.success===true){
+                            window.location.href = window.location.href;
+                        }else{
+                            alert(data.message)
+                            return false;
+                        }
+                    }
+                })
+            })
+        }
+
+    }
+});
+//生成申请单
+$('.Createapplication').click(function(){
+    if($('.DeleteInput').val()==''){
+        alert('请选择一条数据');
+        return false;
+    }else{
+        if($('.detailsStatus').val()==='已申请'){
+            alert('本条记录已经通过申请');
+            return false;
+        }else{
+            $('.Createapplication').click(function(){
+                var idcards= $('.DeleteInput').val();
+                var departAll='';
+                var departCoding='';
+                $.ajax({
+                    url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewAndConvertMuitiUseRecordForm.mhtml',
+                    type:'get',
+                    dataType:'json',
+                    async:false,
+                    data:{operator:currentUserFullName,useRecordIds:idcards,depart:departAll,departCoding:currentOrgUnitCode},
+                    success:function(data){
+                        if(data.success===true){
+                            $("#Createapplication").modal('hide');
+                            window.location.href = window.location.href;
+                        }else{
+                            alert(data.message)
+                        }
+                    }
+                })
+            })
+        }
+    }
+})
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp
===================================================================
diff -u -r24762 -r24798
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp	(.../index.jsp)	(revision 24762)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp	(.../index.jsp)	(revision 24798)
@@ -20,24 +20,31 @@
     <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/css/bootstrap-table.css">
     <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/html5shiv-3.7.3/dist/html5shiv.min.js"></script>
     <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/index1.css">--%>
     <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/css/useRecord/index.css">
 
 
 </head>
 <body>
     <input type="hidden" class="DeleteInput">
+    <input type="hidden" class="detailsId">
+    <input type="hidden" class="detailsStatus">
+    <input type='hidden' class="Barcode">
+    <input type="hidden" class="RecordGoodes">
+    <input type="hidden" class="ModifiedData">
+    <input type="hidden" class="ModifySaveId">
+    <input type="hidden" class="ModifySaveStr">
     <div class="content_body">
         <div class="gridBtn">
             <div class="l">
                 <button type="button" class="dx-btn-primary mainNav-shop-btn" data-target="#mymodal-data" data-toggle="modal">
                     <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                     添加
                 </button>
-                <button type="button" class="dx-btn-primary mainNav-shop-btn">修改</button>
+                <button type="button" class="dx-btn-primary mainNav-shop-btn BtnDetails" data-target="#mymodal-details" data-toggle="modal">修改</button>
                 <button type="button" class="dx-btn-primary mainNav-shop-btn DeleteBtn" >删除</button>
-                <button type="button" class="dx-btn-primary mainNav-shop-btn">审核</button>
-                <button type="button" class="dx-btn-primary mainNav-shop-btn">生成申请单</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>
             </div>
             <div class="r gridHead_r">
                 <div class="grid-header" style="width:100%">
@@ -47,7 +54,7 @@
         </div>
     </div>
     <div id="gridContainer">
-        <div id="myGrid" style="height:600px;"></div>
+        <div id="myGrid" style="height:600px; width:600px;"></div>
         <div id="pager" style="width:100%;" class="slick-enhancement-pager"></div>
     </div>
 
@@ -70,7 +77,7 @@
                             <div class="form-li">
                                 <label for="addhospitalNum">
                                     <span><i class="icon_color">*</i> 住院号:</span>
-                                    <input type="text" name="addhospitalNum" id="addhospitalNum" class="form-input">
+                                    <input type="text" name="addhospitalNum" id="addhospitalNum" autofocus="autofocus" class="form-input">
                                 </label>
                             </div>
                             <div class="form-li fonm-mg">
@@ -124,7 +131,6 @@
                             <div class="form-li fonm-mg">
                                 <label>
                                     <span>性别:</span>
-                                    <!--<input type="text" name="Inpatient" id="patientSex" class="form-input">-->
                                     <select name="addSelect" id="addSelect">
                                         <option value="0">男</option>
                                         <option value="1">女</option>
@@ -266,27 +272,303 @@
                             <div class="form-li ">
                                 <label>
                                     <span>已扫描数量:</span>10
-
                                 </label>
                             </div>
                         </li>
                     </ul>
                     <div class="Goods" id="addGoods">
+                        <%--<div class="addGoods_content" style="width:600px;" >--%>
+                            <%--<div id="addGoodsGrid" style="height:150px;"></div>--%>
+                        <%--</div>--%>
+
+                        <div style="width:100%;">
+                            <div >
+                                <div id="addGoodsGrid" style="width:770px; height:150px;"></div>
+                            </div>
+                        </div>
+
+
+                    </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>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--add e-->
+    <!-- details s-->
+    <div  class="modal" id="mymodal-details" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
+        <div class="modal-dialog" style="width: 800px;">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span aria-hidden="true">×</span>
+                        <span class="sr-only">Close</span>
+                    </button>
+                    <h4 class="modal-title">使用记录</h4>
+                </div>
+                <div class="modal-body">
+                    <!-- <p>弹出层主体内容</p> -->
+                    <span class="modal_span">基础数据</span>
+                    <ul id="user_li">
+                        <li class="fonm-Li">
+                            <div class="form-li">
+                                <label for="hospitalNum">
+                                    <span>住院号:</span>
+                                    <input type="text" name="Inpatient" id="hospitalNum" class="form-input">
+                                </label>
+
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="treatmentNum">
+                                    <span>诊疗号:</span>
+                                    <input type="text" name="Inpatient" id="treatmentNum" class="form-input">
+                                </label>
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="washHandNurse">
+                                    <span>洗手护士:</span>
+                                    <input type="text" name="Inpatient" id="washHandNurse" class="form-input">
+                                </label>
+                            </div>
+                        </li>
+                        <li class="fonm-Li">
+                            <div class="form-li">
+                                <label for="circuitNurse">
+                                    <span>巡回护士:</span>
+                                    <input type="text" name="Inpatient" id="circuitNurse" class="form-input">
+                                </label>
+
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="depart">
+                                    <span>科室:</span>
+                                    <input type="text" name="Inpatient" id="depart" class="form-input">
+                                </label>
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="operationRoom">
+                                    <span>手术间:</span>
+                                    <input type="text" name="Inpatient" id="operationRoom" class="form-input">
+                                </label>
+                            </div>
+                        </li>
+                        <li class="fonm-Li">
+                            <div class="form-li">
+                                <label for="patientName">
+                                    <span>姓名:</span>
+                                    <input type="text" name="Inpatient" id="patientName" class="form-input">
+                                </label>
+
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="patientAge">
+                                    <span>年龄:</span>
+                                    <input type="text" name="Inpatient" id="patientAge" class="form-input">
+                                </label>
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label>
+                                    <span>性别:</span>
+
+                                    <select name="Select" id="Select">
+                                        <option value="0">男</option>
+                                        <option value="1">女</option>
+                                    </select>
+                                </label>
+                            </div>
+                        </li>
+                        <li class="fonm-Li">
+                            <div class="form-li">
+                                <label for="patientArea">
+                                    <span>病区:</span>
+                                    <input type="text" name="Inpatient" id="patientArea" class="form-input">
+                                </label>
+
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="roomNumber">
+                                    <span>病室:</span>
+                                    <input type="text" name="Inpatient" id="roomNumber" class="form-input">
+                                </label>
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="bedNumber">
+                                    <span>床位:</span>
+                                    <input type="text" name="Inpatient" id="bedNumber" class="form-input">
+                                </label>
+                            </div>
+                        </li>
+                        <li class="fonm-Li">
+                            <div class="form-li">
+                                <label for="patientIDCard">
+                                    <span>身份证:</span>
+                                    <input type="text" name="Inpatient" id="patientIDCard" class="form-input">
+                                </label>
+
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="doctorName">
+                                    <span>医生:</span>
+                                    <input type="text" name="Inpatient" id="doctorName" class="form-input">
+                                </label>
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="specialInfection">
+                                    <span>特殊感染类型:</span>
+                                    <select name="specialInfection" id="specialInfection">
+                                        <option value="0">爱之病</option>
+                                        <option value="1">艾滋病</option>
+                                    </select>
+                                </label>
+                            </div>
+                        </li>
+                        <li class="fonm-Li">
+                            <div class="form-li form-shoushu">
+                                <label for="operation">
+                                    <span>手术名称:</span>
+                                    <input type="text" name="Inpatient" id="operation" class="form-input form-shoushu-input">
+                                </label>
+
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="operationScheduleId">
+                                    <span>手术单号:</span>
+                                    <input type="text" name="Inpatient" id="operationScheduleId" class="form-input">
+                                </label>
+                            </div>
+
+                        </li>
+                        <li class="fonm-Li">
+                            <div class="form-li">
+                                <label for="operationTime">
+                                    <span>手术时间:</span>
+                                    <input type="text" name="Inpatient" id="operationTime" class="form-input">
+                                </label>
+
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="visitId">
+                                    <span>住院次数:</span>
+                                    <input type="text" name="Inpatient" id="visitId" class="form-input">
+                                </label>
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="enteringTime">
+                                    <span>录入时间:</span>
+                                    <input type="text" name="Inpatient" id="enteringTime" class="form-input">
+                                </label>
+                            </div>
+                        </li>
+                        <li class="fonm-Li">
+                            <div class="form-li">
+                                <label for="operator">
+                                    <span>录入人:</span>
+                                    <input type="text" name="Inpatient" id="operator" class="form-input" disabled="disabled">
+                                </label>
+
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="reviewer">
+                                    <span>审核人:</span>
+                                    <input type="text" name="Inpatient" id="reviewer" class="form-input" disabled="disabled">
+                                </label>
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="applicationTime">
+                                    <span>申请时间:</span>
+                                    <input type="text" name="Inpatient" id="applicationTime" class="form-input" disabled="disabled">
+                                </label>
+                            </div>
+                        </li>
+                        <li class="fonm-Li">
+                            <div class="form-li form-shoushu">
+                                <label for="remark">
+                                    <span>备注:</span>
+                                    <input type="text" name="Inpatient" id="remark" class="form-input form-shoushu-input">
+                                </label>
+
+                            </div>
+                            <div class="form-li fonm-mg">
+                                <label for="reviewTime">
+                                    <span>审核时间:</span>
+                                    <input type="text" name="Inpatient" id="reviewTime" class="form-input" disabled="disabled">
+                                </label>
+                            </div>
+
+                        </li>
+                    </ul>
+                    <span class="modal_span1">使用物品信息</span>
+                    <ul>
+                        <li class="fonm-Li">
+                            <div class="form-li">
+                                <label for="tempBarcode">
+                                    <span>扫描条码:</span>
+                                    <input type="text" name="Inpatient" id="tempBarcodes" class="form-input">
+                                </label>
+
+                            </div>
+                            <div class="form-li ">
+                                <label>
+                                    <span>已扫描数量:</span>10
+                                </label>
+                            </div>
+                        </li>
+                    </ul>
+                    <div class="Goods" id="Goods">
                         <div style="overflow-x: auto">
                             <div class="MinHeight" >
-                                <table id="addGoods-table"></table>
+                                <div class="addGoods_content">
+                                        <div id="GoodsTablGrid" style="height:120px;"></div>
+                                </div>
                             </div>
                         </div>
                     </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"  data-dismiss="modal" aria-label="Close">保存</button>
+                    <button type="button" class="btn btn-default">快速回收</button>
+                    <button type="button" class="btn btn-default">审核</button>
+                    <button type="button" class="btn btn-primary" id="ModifySave">保存</button>
                 </div>
             </div>
         </div>
     </div>
-    <!--add e-->
+    <!-- details 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">
+            <div class="modal-content">
+                <div class="modal-body">
+                    你确定要审核数据吗？
+                </div>
+                <div class="modal-footer" id="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal" id="data-dismiss">取消</button>
+                    <button type="button" class="btn btn-primary" id="SvaExamine">确定</button>
+                </div>
+            </div>
+        </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">
+            <div class="modal-content">
+                <div class="modal-body">
+                    你确定要生成申请单吗？
+                </div>
+                <div class="modal-footer" id="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal" id="data-dismiss">取消</button>
+                    <button type="button" class="btn btn-primary Createapplication">确定</button>
+                </div>
+            </div>
+        </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>
@@ -308,15 +590,15 @@
     <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/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>
     <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table.js"></script>
     <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/useRecord/SlickGridRecord.js"></script>
+    <%--<script src="${basePath}/dx-disinfectsystem/js/useRecord/SlickGridRecord.js"></script>--%>
+    <script src="${basePath}/dx-disinfectsystem/js/useRecord/slickGridRecord.js"></script>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css
===================================================================
diff -u -r24760 -r24798
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css	(.../index.css)	(revision 24760)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/useRecord/index.css	(.../index.css)	(revision 24798)
@@ -294,4 +294,42 @@
 .modal-bodys{
     height: 500px;
     overflow-x: auto;
+}
+
+input{outline:none;border: none;}
+.mygridgoods{
+    width: 100%;
+}
+.gridBtn{
+    width: 100%;
+    height: 70px;
+    line-height: 70px;
+    display: inline-block;
+    background-color: #C6E3CA;
+}
+.gridHead_r{
+    margin-right:10px;
+    margin-top: 25px;
+}
+.gridHead_r input{
+    padding: 2px 10px;
+    height:26px;
+    border: 1px solid #378888;
+    border-radius: 5px;
+    width: 140px;
+
+}
+.grid-header{
+    background:none;
+    border: none !important;
+    border-radius: 5px;
+}
+.addGoods_content{
+    width: 800px;
+}
+#addGoodsGrid{
+    height:200px;
+}
+.content_body{
+    height:70px;
 }
\ No newline at end of file