Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js =================================================================== diff -u -r38829 -r39352 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 38829) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 39352) @@ -209,36 +209,36 @@ } //DGSDBZXYY-241:包状态背景颜色 -function renderPackageStatusColor(v, p, record){ +function renderPackageStatusColor(v, p, record) { var packageStatus = record.data['packageStatus']; var color = ""; var fontSizeColor = ""; - if(packageStatus == '已终止'){ + if (packageStatus == '已终止') { color = "red"; - }else if(packageStatus == '待接收'){ + } else if (packageStatus == '待接收') { color = '#ffff00';//黄色 - }else if(packageStatus == '已归还'){ + } else if (packageStatus == '已归还') { color = '#7030a0';//绿色 fontSizeColor = '#fff'; - }else if(packageStatus == '待归还'){ + } else if (packageStatus == '待归还') { color = '#ffa500';//橙色 - }else if(packageStatus.split(';').length > 1){ - if(packageStatus.indexOf('待接收') >= 0){ + } else if (packageStatus.split(';').length > 1) { + if (packageStatus.indexOf('待接收') >= 0) { color = '#ffff00';//黄色 - }else if(packageStatus.indexOf('已接收') >= 0){ + } else if (packageStatus.indexOf('已接收') >= 0) { color = '#ffffff';//白色 - }else if(packageStatus.indexOf('已使用') >= 0){ + } else if (packageStatus.indexOf('已使用') >= 0) { color = '#ffffff';//白色 - }else if(packageStatus.indexOf('待二次回收') >= 0){ + } else if (packageStatus.indexOf('待二次回收') >= 0) { color = '#ffffff';//白色 - }else if(packageStatus.indexOf('待归还') >= 0){ + } else if (packageStatus.indexOf('待归还') >= 0) { color = '#ffa500';//橙色 - }else if(packageStatus.indexOf('已归还') >= 0){ + } else if (packageStatus.indexOf('已归还') >= 0) { color = '#7030a0';//绿色 fontSizeColor = '#fff'; } } - return "

" + v + "

"; + return "

" + v + "

"; } /** @@ -271,7 +271,7 @@ returnMan = top.Ext4.getCmp('returnMan1').getValue() || ''; } //DGSDBZXYY-239:新增字段“是否齐全” - if(top.Ext4.getCmp('completeness')){ + if (top.Ext4.getCmp('completeness')) { completeness = top.Ext4.getCmp('completeness').getValue() || ''; } if (sstsConfig.enableReturneeOfForeignTousseSupplier) { @@ -398,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',renderer:renderPackageStatusColor }, + { 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 }, @@ -768,7 +768,7 @@ format: 'Y-m-d H:i', theHours: 0, theMinutes: 0, - value:new Date(today + ' 00:00') + value: new Date(today + ' 00:00') }, { text: '申请结束时间:' }, { @@ -781,7 +781,7 @@ format: 'Y-m-d H:i', theHours: 23, theMinutes: 59, - value:new Date(today + ' 23:59') + value: new Date(today + ' 23:59') }, { text: '回收状态:' }, { @@ -819,7 +819,7 @@ handler: function () { var applicationStartTime = Ext.getCmp("applicationStartTime").getRawValue(); var applicationEndTime = Ext.getCmp("applicationEndTime").getRawValue(); - if (isUndefinedOrNullOrEmpty(applicationStartTime) || isUndefinedOrNullOrEmpty(applicationEndTime)){ + if (isUndefinedOrNullOrEmpty(applicationStartTime) || isUndefinedOrNullOrEmpty(applicationEndTime)) { Ext.Msg.alert('警告', '时间不能为空!'); return; } @@ -829,7 +829,7 @@ Ext.Msg.alert('警告', '开始时间不能大于结束时间!'); return; } - + document.getElementById('parm_s_applicationStartTime').value = applicationStartTime + ':00'; document.getElementById('parm_s_applicationEndTime').value = applicationEndTime + ':59'; document.getElementById('parm_s_queryRecyclingStatus').value = Ext.getCmp('queryRecyclingStatus').getValue();