Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp =================================================================== diff -u -r24232 -r26393 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp (.../invoiceView.jsp) (revision 24232) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp (.../invoiceView.jsp) (revision 26393) @@ -24,6 +24,7 @@ + Index: ssts-web/src/main/webapp/common/common.css =================================================================== diff -u -r26383 -r26393 --- ssts-web/src/main/webapp/common/common.css (.../common.css) (revision 26383) +++ ssts-web/src/main/webapp/common/common.css (.../common.css) (revision 26393) @@ -142,6 +142,10 @@ .invoice-urgentImgDiv{ padding-left: 20px; } +/*发货管理,加急div的间距,样式*/ +.iM-urgentImgDiv{ + height: 15px; +} /*灭菌装载*/ /*待灭菌装载器械信息*/ .sL-beforeSterillzationPackageInfo-img{ @@ -159,4 +163,4 @@ } #sterilizationRecordWin .x-tree-node a span{ display: inline-block; -} \ No newline at end of file +} Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r25150 -r26393 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 25150) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 26393) @@ -500,12 +500,26 @@ var cm = new Ext.grid.ColumnModel([ {id : 'id',dataIndex : 'id',hidden : true}, - {header : "条码",dataIndex : 'barcode',width : 30,menuDisabled : true, + {header : "条码",dataIndex : 'barcode',width : 40,menuDisabled : true, renderer : function(v, p, record) { if(!isUndefinedOrNullOrEmpty(record.data.expensiveDGBarcode)){ return record.data.expensiveDGBarcode; } - return record.data.barcode; + var result = ""; + if(sstsConfig.enableUrgentFunction && record.json.urgentLevel && record.json.urgentLevel.colorCode){ + var colorCode = record.json.urgentLevel.colorCode; + var colorClassName = getClassNameForColor(record.json.urgentLevel.colorCode); + if(colorCode != ""){ + result += "
"; + result += ""; + } + }else{ + result = record.data.barcode; + } + return result; }}, {header : "物品名称",dataIndex : 'showTousseName',width : 80,menuDisabled : true}, {header : "name",dataIndex : 'name',hidden : true,menuDisabled : true}, @@ -1652,8 +1666,17 @@ } function renderCallModifyFunction(v, p, record) { - return "" + v - + ""; + var values = ""; + if(sstsConfig.enableUrgentFunction && record.json.urgent && record.json.urgent == "是"){ + var colorCode = record.json.invoicePlan.urgentLevel.colorCode; + if(colorCode != ""){ + values ="

" + v + + "

"; + } + }else{ + values = "" + v + ""; + } + return values; } function formartPrice(v, p, record) {