Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js =================================================================== diff -u -r38247 -r38702 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 38247) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 38702) @@ -208,6 +208,39 @@ return "

" + v + "

"; } +//DGSDBZXYY-241:包状态背景颜色 +function renderPackageStatusColor(v, p, record){ + var packageStatus = record.data['packageStatus']; + var color = ""; + var fontSizeColor = ""; + if(packageStatus == '已终止'){ + color = "red"; + }else if(packageStatus == '待接收'){ + color = '#ffff00';//黄色 + }else if(packageStatus == '已归还'){ + color = '#00b050';//绿色 + fontSizeColor = '#fff'; + }else if(packageStatus == '待归还'){ + color = '#ffa500';//橙色 + }else if(packageStatus.split(';').length > 1){ + if(packageStatus.indexOf('待接收') >= 0){ + color = '#ffff00';//黄色 + }else if(packageStatus.indexOf('已接收') >= 0){ + color = '#ffffff';//白色 + }else if(packageStatus.indexOf('已使用') >= 0){ + color = '#ffffff';//白色 + }else if(packageStatus.indexOf('待二次回收') >= 0){ + color = '#ffffff';//白色 + }else if(packageStatus.indexOf('待归还') >= 0){ + color = '#ffa500';//橙色 + }else if(packageStatus.indexOf('已归还') >= 0){ + color = '#00b050';//绿色 + fontSizeColor = '#fff'; + } + } + return "

" + v + "

"; +} + /** * 批量确认归还或者提前归还. * @param returnType 归还的类型(值有两种情况:“确认归还”、“提前归还”) @@ -365,7 +398,7 @@ { header: "外来器械包条码", width: 150, dataIndex: 'barcodes', hidden: !sstsConfig.showForeignTousseApplicationBarcode, sortable: false }, { header: "供应商", width: 150, dataIndex: 'supplierName' }, { header: surgeryName, width: 150, dataIndex: 'surgery' }, - { header: "包状态", width: 100, dataIndex: 'packageStatus' }, + { header: "包状态", width: 100, dataIndex: 'packageStatus',renderer:renderPackageStatusColor }, { header: "审核状态", width: 70, dataIndex: 'reviewStatus', renderer: renderReviewStatusColor, hidden: !sstsConfig.enableReviewOfForeignTousseApplicationFunction }, { header: recyclingStatusName, width: 70, dataIndex: 'recyclingStatus', renderer: renderRecyclingStatusColor }, { header: "装配状态", width: 70, dataIndex: 'packingState', renderer: renderPackingStateColor, sortable: false, hidden: packingStateHidden },