Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js =================================================================== diff -u -r24969 -r24983 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js (.../reviewView.js) (revision 24969) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js (.../reviewView.js) (revision 24983) @@ -3,6 +3,13 @@ var taskGroup; //审核界面的审核人是否默认为上一次审核的审核人(未配置或配置为false以外的值表示是,为false表示否) sstsConfig.reviewPageReviewerDefaultLastReviewer var reviewPageReviewerDefaultLastReviewer = true; +//审核物品按钮的提示信息 +var openMustScanBasketTips=""; +if(sstsConfig.openMustScanBasketTips){ + openMustScanBasketTips = sstsConfig.openMustScanBasketTips; +}else{ + openMustScanBasketTips = "是否完成对下列器械包的审核？"; +} //左边待审核器械包列表grid var forReviewGrid; //右边右边待审核的器械包列表grid @@ -11,8 +18,9 @@ var reviewedChartGrid; //入筐器械包列表grid var reviewedBasketGrid; -/****************/ +/*********************/ + /** * 文档就绪后执行 */ @@ -23,24 +31,29 @@ var r = window.location.search.substr(1).match(reg); //匹配目标参数 if (r != null) { taskGroup = decodeURI(r[2]) - } + }; //渲染grid renderGrids(); //是否显示灭菌日期 if (sstsConfig.printLabelWhenReviewing) { $('#sterileDate').parent().show(); datePick("sterileDate", "yyyy-mm-dd hh:ii", "bottom-right"); //加载时间插件 + }; + //ie浏览器下 + if(isIE){ + //input readOnly 防止按breakspace键返回到页面 + $("input[readOnly]").keydown(function(e) { + e.preventDefault(); + }); } //页面一加载就获取焦点 $("#barcode").focus(); - //点击导航 的审核统计、入筐器械包时才渲染数据 $("a[href='#reviewedChartTab']").click(function () { //获得数据 setGridData(reviewedChartGrid, WWWROOT + "/disinfectSystem/packingReviewController/loadReviewRecord.mhtml", { taskGroup: taskGroup }); - // // attachAutoResizeDataGrid(reviewedChartGrid,'reviewedChartGridId','reviewedChartGridContainer',30); //设置已审核器械包数 setReviewedsum(); @@ -799,25 +812,20 @@ // doPrintLabels(tousses,cfg);//打印接口 // } alert("审核成功"); - //待审核列表刷新 + //重新加载待审核列表 // $("#unReviewTousseTable").bootstrapTable("refresh"); renderGridDateAndPage(unReviewTousseGrid, 'unReviewGridPager', WWWROOT + "/disinfectSystem/packingReviewController/findUnReviewedTousseInstanceList.mhtml", { taskGroup: taskGroup - }); - //审核统计刷新 + }); + //清空审核统计 // $("#reviewedChartTable").bootstrapTable("refresh"); - //已审核列表清空 + //清空已审核列表 cleanGridDataView(forReviewGrid); // clearBarcodeAndBasketName(); clearReviewInfoByConfig(); onScannedTousseAmountChanged(); // 待审核包数量数量变化处理 - //重新加载 - renderGridDateAndPage(unReviewTousseGrid, 'unReviewGridPager', - WWWROOT + "/disinfectSystem/packingReviewController/findUnReviewedTousseInstanceList.mhtml", { - taskGroup: taskGroup - }); } else { alert("审核失败：" + result.message); } @@ -837,16 +845,9 @@ * @param {*} value 需要判断的数据 */ function isExist(data, field, value) { - //是否为数组 - if (Array.isArray(data)) { - for (var i = 0; i < data.length; i++) { - var record = data[i]; - if (record[field] == value) { - return true; - } - } - } else { - if (data[field] == value) { + for (var i = 0; i < data.length; i++) { + var record = data[i]; + if (record[field] == value) { return true; } } @@ -1077,9 +1078,10 @@ minWidth: 150 }) - // 创建unReviewTousseGrid + //创建unReviewTousseGrid unReviewTousseGrid = renderGrid("unReviewTousseGridId",unReviewTousseGridColums, "", checkboxSelector); - attachAutoResizeDataGrid(unReviewTousseGrid, 'unReviewTousseGridId', 'unReviewToussegridContainer',115);//调整列宽高度 + //调整列宽高度 + attachAutoResizeDataGrid(unReviewTousseGrid, 'unReviewTousseGridId', 'unReviewToussegridContainer',115); //加载数据并分页 renderGridDateAndPage(unReviewTousseGrid, 'unReviewGridPager', WWWROOT + "/disinfectSystem/packingReviewController/findUnReviewedTousseInstanceList.mhtml", { @@ -1097,7 +1099,6 @@ //被选中后不能触发双击事件 // unReviewTousseGrid.setSelectedRows([args.row]); }); - /*********** 左边 页面的已加入的待审核器械包列表*************/ var forReviewGridColumns = [{ field: 'tousseId', @@ -1129,35 +1130,31 @@ width: 120, minWidth: 120, cssClass: "cell-title", - sortable: true, - minWidth: 100 + sortable: true }, { id: "sterileStartDate", name: "灭菌开始日期", field: "sterileStartDate", width: 120, minWidth: 120, cssClass: "cell-title", - sortable: true, - minWidth: 100 + sortable: true }, { id: "sterilingMethod", name: "灭菌程序", field: "sterilingMethod", - width: 120, - minWidth: 120, + width: 130, + minWidth: 130, cssClass: "cell-title", - sortable: true, - minWidth: 100 + sortable: true }, { id: "sterilingMode", name: "灭菌方式", field: "sterilingMode", - width: 120, - minWidth: 120, + width: 125, + minWidth: 125, cssClass: "cell-title", - sortable: true, - minWidth: 100 + sortable: true }, { id: "virtualBasketSeqNum", name: "虚拟篮筐", @@ -1181,9 +1178,10 @@ var forReviewGridOptions = { enableCellNavigation: true, enableColumnReorder: false, - forceFitColumns: true, - // autoHeight: true, rowHeight: 35, + fullWidthRows:'true' + // forceFitColumns: true, + // autoHeight: true, // editable: false, // enableAddRow: false, // checked: true, @@ -1193,7 +1191,8 @@ inlineFilters: true }); forReviewGrid = new Slick.Grid("#forReviewGridId", forReviewGridDataView, forReviewGridColumns, forReviewGridOptions); - attachAutoResizeDataGrid(forReviewGrid, 'forReviewGridId', 'forReviewGridContainer',90);//调整列宽高度 + //调整列宽高度 + attachAutoResizeDataGrid(forReviewGrid, 'forReviewGridId', 'forReviewGridContainer',90); //当行数改变时触发 forReviewGridDataView.onRowCountChanged.subscribe(function (e, args) { forReviewGrid.updateRowCount(); @@ -1315,9 +1314,6 @@ grid.setSelectionModel(new Slick.RowSelectionModel({ selectActiveRow: false //单选 })); - $(".slick-viewport").css({ - "overflow-x": "auto" - }); return grid; }; @@ -1329,6 +1325,7 @@ * @param {*} params */ function renderGridDateAndPage(grid, pagerId, url, params) { + jQuery.support.cors=true; var mytranslation = { pagelabel: "页", currentpage: "当前页", @@ -1350,7 +1347,6 @@ var search = '', searchFields = '', order = 'desc'; - function pageIng(remoteUrl, container, datagrid, pagerType, trans, params, order, search, searchFields) { new Slick.Controls.EnhancementPager({ container: container, @@ -1389,6 +1385,7 @@ $.ajax({ type: 'get', url: url, + cache: false, async: false, dataType: 'json', data: data, @@ -1538,6 +1535,12 @@ width: newWidth }; }; +function isIE() { + if (!!window.ActiveXObject || "ActiveXObject" in window){ + return true; + }else{ + return false; + } + } - /************************************** */ \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/review-Image.js =================================================================== diff -u -r24952 -r24983 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/review-Image.js (.../review-Image.js) (revision 24952) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/review-Image.js (.../review-Image.js) (revision 24983) @@ -51,7 +51,7 @@ var materialGridTableOptions = { enableCellNavigation: true, enableColumnReorder: false, - rowHeight: 35, + rowHeight: 35 // editable: false, // enableAddRow: false, // forceFitColumns: true//强迫适应宽度 Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css =================================================================== diff -u -r24952 -r24983 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css (.../reviewView.css) (revision 24952) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css (.../reviewView.css) (revision 24983) @@ -46,7 +46,7 @@ } .review-GridTab-unReview { - padding-left: 0; + padding-left: 0px; border-left: 1px solid #aedeb4; } @@ -70,6 +70,7 @@ } /**********公用***********************/ +*{font-size:12px;} .modal-header { background-color: #23b051; color: white; Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp =================================================================== diff -u -r24969 -r24983 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp (.../reviewView.jsp) (revision 24969) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp (.../reviewView.jsp) (revision 24983) @@ -29,11 +29,11 @@ + + + - - @@ -91,13 +91,13 @@ -
+
-
- +
+