Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp =================================================================== diff -u -r26117 -r26372 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp (.../reviewView.jsp) (revision 26117) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp (.../reviewView.jsp) (revision 26372) @@ -19,6 +19,7 @@ .my_row_yellow table{ background:yellow;} .my_row_red table{ background:red;} + <% @@ -98,11 +99,13 @@
+
+ Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r26019 -r26372 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 26019) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 26372) @@ -390,7 +390,28 @@ if(haveUnSupplementMaterials == true){ result = "◆ " + result; } - return "" + result + "";; + var newResult = ""; + if(sstsConfig.enableUrgentFunction && record.data.urgentLevel && record.data.urgentLevel.colorCode != undefined){ + //有色背景白字加急 + var colorClassName = getClassNameForColor(record.data.urgentLevel.colorCode); + newResult += "
"; + newResult += "" + result + "
"; + return newResult; + }else if(sstsConfig.enableUrgentFunction && record.data.isUrgentTousse && record.data.isUrgentTousse == "是" && record.data.urgentLevel.colorCode == undefined){ + //无色背景灰字加急 + newResult += "
"; + newResult += "" + result + "
"; + return newResult; + }else{ + return "" + result + ""; + } + } function showPackingRecordFrequency(v, p, record, rowIndex, columnIndex, store) { @@ -755,6 +776,8 @@ var barcode = records[i].data.barcode; var sterileStartDate = records[i].data['sterileStartDate']; var packageType = records[i].data['packageType']; + var isUrgentTousse = records[i].data['isUrgentTousse']; + var urgentLevel = records[i].data['urgentLevel']; var store = Ext.getCmp('forReviewGrid').getStore(); if(isExistRecord(store,'id',tousseId)){ continue; @@ -771,7 +794,9 @@ sterilingMethod:sterilingMethod, sterilingMode:sterilingMode, packageType: packageType, - virtualBasketSeqNum:virtualBasketSeqNum + virtualBasketSeqNum:virtualBasketSeqNum, + isUrgentTousse: isUrgentTousse, + urgentLevel: urgentLevel }); Ext.getCmp('forReviewGrid').getStore().insert(0,tousseInstance); speakBasket.addGoods('',tousseName,1); @@ -813,6 +838,10 @@ } Ext.onReady(function() { + if (sstsConfig.enableUrgentFunction){ + //加急的隐藏域值设置，后台要用到 + document.getElementById("parm_s_needShowUrgentLevel").value = "是"; + } taskGroupObj = getTaskGroupObjByName($Id("parm_s_taskGroup").value); var myData = []; /** @@ -1286,7 +1315,8 @@ {name : 'haveUnSupplementMaterials'}, {name : 'patientName'}, {name : 'treatmentNum'}, - {name : 'hospitalNum'} + {name : 'hospitalNum'}, + {name : 'urgentLevel'} ]; @@ -1529,7 +1559,34 @@ border : false, bodyBorder : false, columns: [ - {id:'tousseName',header: "器械包名称", width: 120, menuDisabled: true, dataIndex: 'tousseDefinitionName'}, + {id:'tousseName',header: "器械包名称", width: 120, menuDisabled: true, dataIndex: 'tousseDefinitionName', + renderer : function(v, p, record){ + var result = ""; + if(sstsConfig.enableUrgentFunction && record.data.urgentLevel && record.data.urgentLevel.colorCode != undefined){ + //有色背景白字加急 + var colorClassName = getClassNameForColor(record.data.urgentLevel.colorCode); + result += "
"; + result += "
"; + }else if(sstsConfig.enableUrgentFunction && record.data.isUrgentTousse && record.data.isUrgentTousse == "是" && record.data.urgentLevel.colorCode == undefined){ + //无色背景灰字加急 + result += "
"; + result += "
"; + }else{ + result += ""; + result += v + ""; + } + + return result; + } + }, {id:'barcode',header: "条码",width: 120, menuDisabled: true, dataIndex: 'barcode'}, {id : 'deleteItem',header : '删除',width : 30,menuDisabled : true, renderer : function(v, p, record) { @@ -1687,7 +1744,9 @@ sterileStartDate: obj.sterileStartDate, sterilingMethod:obj.sterilingMethod, sterilingMode:obj.sterilingMode, - virtualBasketSeqNum:obj.virtualBasketSeqNum + virtualBasketSeqNum:obj.virtualBasketSeqNum, + urgentLevel:obj.urgentLevel, + isUrgentTousse:obj.isUrgentTousse }); Ext.getCmp('forReviewGrid').getStore().insert(0,tousseInstance); clearScanText(); @@ -1719,7 +1778,9 @@ sterileStartDate: tousseInstanceArray[i].sterileStartDate, sterilingMethod:tousseInstanceArray[i].sterilingMethod, sterilingMode:tousseInstanceArray[i].sterilingMode, - virtualBasketSeqNum:tousseInstanceArray[i].virtualBasketSeqNum + virtualBasketSeqNum:tousseInstanceArray[i].virtualBasketSeqNum, + urgentLevel:tousseInstanceArray[i].urgentLevel, + isUrgentTousse:tousseInstanceArray[i].isUrgentTousse }); Ext.getCmp('forReviewGrid').getStore().insert(0,tousseInstance); @@ -2098,7 +2159,29 @@ columns:[{ header:'名称', width:400, - dataIndex:'objName' + dataIndex:'objName', + renderer : function(v, p, record){ + var result = ""; + if(sstsConfig.enableUrgentFunction && record.type == "TOUSSE_IN" && record.urgentLevel && record.urgentLevel.colorCode != undefined){ + //有色背景白字加急 + var colorClassName = getClassNameForColor(record.urgentLevel.colorCode); + result += "
"; + result += ""; + }else if(sstsConfig.enableUrgentFunction && record.type == "TOUSSE_IN" && record.isUrgentTousse && record.isUrgentTousse == "是" && record.urgentLevel && record.urgentLevel.colorCode == undefined){ + //无色背景灰字加急 + result += "
"; + result += ""; + }else{ + result += record.objName; + } + return result; + } },{ header:'条形码', width:300,