Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp =================================================================== diff -u -r24932 -r24939 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp (.../reviewView.jsp) (revision 24932) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp (.../reviewView.jsp) (revision 24939) @@ -236,7 +236,7 @@
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js =================================================================== diff -u -r24932 -r24939 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js (.../reviewView.js) (revision 24932) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js (.../reviewView.js) (revision 24939) @@ -671,7 +671,7 @@ var isFirstRoomPeople = true; //暂时为true // 如果是一级供应室用户,并且需要入筐;或者是二级供应室用户,并且二级供应室需要入筐 if ((sstsConfig.mustScanBasketForTousseReview && isFirstRoomPeople) || (sstsConfig.mustScanBasketForTousseReviewOf2ndSupplyRoom && !isFirstRoomPeople)) { - console.log(basketName); + // console.log(basketName); if (isUndefinedOrNullOrEmpty(basketName)) { //判断所扫器械包是否已全部加入至虚拟篮筐,如存在有未加入虚拟篮筐的器械包则进行提示,否则通过 //var alreadyJoinVirtualBasket = true;//是否加入虚拟篮筐 @@ -680,6 +680,7 @@ if (!virtualBasketSeqNum || virtualBasketSeqNum == '') { //showResult('请先扫描灭菌篮筐' , null , sstsConfig.messagePauseTimeOnReviewPage); alert('请先扫描灭菌篮筐'); + $("#barcode").focus(); return; } } @@ -1289,6 +1290,7 @@ enableCellNavigation: true, enableColumnReorder: false, rowHeight: 35, + fullWidthRows:'true', // editable: false, // autoEdit: false, // enableAddRow: false, @@ -1393,7 +1395,7 @@ // }) // } // grid.setData(a); - // grid.setData(result.rows); + grid.setData(result.rows); grid.render(); }, error: function () { Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css =================================================================== diff -u -r24840 -r24939 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css (.../reviewView.css) (revision 24840) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css (.../reviewView.css) (revision 24939) @@ -1,53 +1,78 @@ -.over-hidden{ - overflow:hidden; +.over-hidden { + overflow: hidden; } -.review-toolbar{ + +.review-toolbar { /* margin-bottom: 10px; */ background: #C6E3CA; - border-bottom:1px solid #aedebe; + border-bottom: 1px solid #aedebe; padding-top: 2px; padding-bottom: 2px; } -.review-title{ + +.review-title { background: #C6E3CA; - border-bottom:1px solid #aedebe; + border-bottom: 1px solid #aedebe; } -.review-title{ + +.review-title { width: 100%; background: #C6E3CA; border-bottom: 1px solid #aedeb4; margin-top: 0; height: 34px; line-height: 32px; font-size: 15px; - color:#52a652; + color: #52a652; font-weight: bold; margin-bottom: 0; } -.inputNone{ - background:none; - outline:none; - border:0px; + +.inputNone { + background: none; + outline: none; + border: 0px; } -.review-select{ - width:auto; + +.review-select { + width: auto; background-color: #ffffff; border: 1px solid #cccccc; } -.review-GridTab-forReview{ - padding-right:0px; - border-right:1px solid #aedeb4; + +.review-GridTab-forReview { + padding-right: 0px; + border-right: 1px solid #aedeb4; } -.review-GridTab-unReview{ - padding-left: 0; - border-left:1px solid #aedeb4; + +.review-GridTab-unReview { + padding-left: 0; + border-left: 1px solid #aedeb4; } -.yellow{ + +.yellow { background-color: #ffff40 !important; } + .reallyHidden { - display:none !important; + display: none !important; } + +/**********公用***********************/ +.modal-header { + background-color: #23b051; + color: white; + border-top-left-radius: 6px; + border-top-right-radius: 6px; +} + +.center-btn { + display: table; + width: auto; + margin-left: auto; + margin-right: auto; +} + /* .fixed-table-pagination{ position: fixed; bottom: 0;