Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingView.jsp
===================================================================
diff -u -r14297 -r14839
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingView.jsp (.../sterilizationLoadingView.jsp) (revision 14297)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingView.jsp (.../sterilizationLoadingView.jsp) (revision 14839)
@@ -11,6 +11,7 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r14408 -r14839
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 14408)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 14839)
@@ -512,6 +512,7 @@
/**
* 审核器械包
*/
+ Ext4.tip.QuickTipManager.init();
function reviewTousse(basketName,basketBarcode){
var isFirstRoomPeople = false;
DWREngine.setAsync(false);
@@ -1044,9 +1045,32 @@
}, this, {
buffer : 250
});
+ var tableContent;
+ grid.on('mouseover', function(e) {// 添加mouseover事件
+ var index = grid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置
+ if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
+ var record = this.getStore().getAt(index);
+ tableContent = record.data['htmlContent'];//
+ if(!tableContent){
+ var isUrgent = record.data['isUrgentTousse'];
+ if('是' == isUrgent){
+ isUrgent = '是';
+ }else{
+ isUrgent = '否';
+ }
+ var content1 ="| " + record.data['tousseDefinition.name'] +" | " + record.data['packageType']+" | " + isUrgent+" | " + record.data['sterileStartDate']+" | "+"
";
+ var content2 ="| " + record.data['operator'] +" | " + record.data['operationTime']+" | " + record.data['sterilingType']+" | " + record.data['validUntil']+" | "+"
";
+ var title2 = ("装配人 | 装配时间 | 灭菌程序 | 有效期至 |
");
+ tableContent = ("器械包名称 | 包装类型 | 是否加急 | 灭菌开始时间 | ");
+ tableContent += "
" +content1+ title2 + content2 +"
";
+ record.set("htmlContent",tableContent);
+ }
+ var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象
+ rowEl.set({
+ 'data-qtip' : tableContent,'data-qwidth':450,'data-qtitle':' 器械包信息:'},false);
+ }
+ });
-
-
var store = new Ext.data.SimpleStore({
fields: [
{name: 'id',type: 'long'},
@@ -1426,6 +1450,29 @@
value:0
}]
});
+ var reviewTableContent;
+ forReviewGrid.on('mouseover', function(e) {// 添加mouseover事件
+ var index = forReviewGrid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置
+ if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
+ var record = this.getStore().getAt(index);
+ reviewTableContent = record.data['htmlContent'];//
+ if(!reviewTableContent){
+ var isUrgent = record.data['isUrgentTousse'];
+ if('是' == isUrgent){
+ isUrgent = '是';
+ }else{
+ isUrgent = '否';
+ }
+ var content ="| " + record.data['tousseDefinitionName'] +" | " + record.data['barcode']+" | " + record.data['packageType']+" | " + record.data['sterileStartDate']+" | " + record.data['sterilingMethod']+" | "+"
";
+ reviewTableContent = ("器械包名称 | 条码 | 包装类型 | 灭菌开始时间 | 灭菌程序 | ");
+ reviewTableContent += "
" + content +"
";
+ record.set("htmlContent",reviewTableContent);
+ }
+ var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象
+ rowEl.set({
+ 'data-qtip' : reviewTableContent,'data-qwidth':450,'data-qtitle':' 器械包信息:'},false);
+ }
+ });
function clearBarcodeAndBasketName(){
Ext.getCmp('barcode').setValue('');
Ext.getCmp('basketName').setValue('');
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
===================================================================
diff -u -r14811 -r14839
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 14811)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 14839)
@@ -225,6 +225,7 @@
}
}
+ Ext4.tip.QuickTipManager.init();
//入筐器械包列表的转换按钮
function transformBtn(v,p,record){
@@ -589,7 +590,25 @@
columns: tousseGridColumnArray,
sm : new Ext.grid.RowSelectionModel({singleSelect:true})
});
-
+ var tousseTableContent;
+ tousseGrid.on('mouseover', function(e) {// 添加mouseover事件
+ var index = tousseGrid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置
+ if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
+ var record = this.getStore().getAt(index);
+ var BorrowName = '';
+ var BorrowAmount = '';
+ tousseTableContent = record.data['htmlContent'];//
+ if(!tousseTableContent){
+ var content ="| " + record.data['tousseDefinitionName'] +" | " + record.data['barcode']+" |
";
+ tousseTableContent = ("器械包名称 | 条码 | ");
+ tousseTableContent += "
" +content+ "
";
+ record.set("htmlContent",tousseTableContent);
+ }
+ var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象
+ rowEl.set({
+ 'data-qtip' : tousseTableContent,'data-qwidth':450,'data-qtitle':' 器械包信息:'},false);
+ }
+ });
stasticsStore = new Ext.data.Store({
autoLoad : true,
url : WWWROOT + '/disinfectSystem/tousseInstanceAction!getBasketStatics.do',
@@ -796,7 +815,26 @@
columns: waitSterileLoadingTousseGridColumnArray,
sm : new Ext.grid.RowSelectionModel({singleSelect:true})
});
-
+ var tableContent;
+ waitSterileLoadingTousseGrid.on('mouseover', function(e) {// 添加mouseover事件
+ var index = waitSterileLoadingTousseGrid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置
+ if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
+ var record = this.getStore().getAt(index);
+ var BorrowName = '';
+ var BorrowAmount = '';
+ tableContent = record.data['htmlContent'];//
+ if(!tableContent){
+ var content ="| " + record.data['tousseName'] +" | " + record.data['objBarcode']+" | " + record.data['reviewTime']+" | "+"
";
+ tableContent = ("器械包名称 | 条码 | 审核时间 | ");
+ tableContent += "
" +content+ "
";
+ record.set("htmlContent",tableContent);
+ }
+ var maxHeight = waitSterileLoadingTousseGrid.getInnerHeight();
+ var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象
+ rowEl.set({
+ 'data-qtip' : tableContent,'data-qwidth':450,'data-qtitle':' 器械包信息:'},false);
+ }
+ });
reviewedPanel = new Ext.tree.ColumnTree({
rootVisible : false,
autoScroll : true,