Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.js =================================================================== diff -u -r38203 -r38457 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.js (.../sterilizationTransitionView.js) (revision 38203) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.js (.../sterilizationTransitionView.js) (revision 38457) @@ -164,13 +164,20 @@ name : 'printStatus', mapping : 'printStatus' },{ name : 'totalAmount', mapping : 'totalAmount' + },{ + name : 'urgentLevel', mapping : 'urgentLevel' }]; var columns = [{ header: '流水号', dataIndex: 'serialNumber', width: 100, filterable: true, filter: {type: 'string'}, renderer : function(value, metaData, record, rowIndex, colIndex, store, view) { var id = record.data.id; - return "" + value + ""; + if(sstsConfig.enableUrgentFunction && record.data.urgentLevel && record.data.urgentLevel !== ''){ + var colorCode = record.data.urgentLevel.colorCode; + return "
" + value + "
"; + }else { + return "" + value + ""; + } } },{ header: '交接时间', dataIndex: 'transitionTime', width: 150, filterable: true, filter: {type: 'date'}, Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js =================================================================== diff -u -r38203 -r38457 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js (.../sterilizationTransitionForm.js) (revision 38203) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js (.../sterilizationTransitionForm.js) (revision 38457) @@ -29,7 +29,7 @@ {name: 'reviewerCode'}, //审核人条码 {name: 'reviewer'}, //审核人 {name: 'operationTime'}, //装配时间 - {name: 'isUrgentTousse'}, //是否加急 + {name: 'urgentLevel'}, //加急级别 {name: 'amount'} //数量 ]}); @@ -127,7 +127,18 @@ },{ header: '装配时间',dataIndex: 'operationTime', width: 120,menuDisabled: true,sortable: false },{ - header: '加急',dataIndex: 'isUrgentTousse', width: 70,menuDisabled: true,sortable: false + header: '加急级别', width: 70,menuDisabled: true,sortable: false, + renderer : function(value, metaData, record) { + if(record.data.leaf){ + if(record.data.urgentLevel){ + return '
'+ record.data.urgentLevel.name +'
'; + }else { + return ''; + } + }else { + return ''; + } + } },{ header: '数量',dataIndex: 'amount', width: 70,menuDisabled: true,sortable: false },{ @@ -402,7 +413,7 @@ reviewerCode: (leaf ? tousseInstance.reviewerCode : ''), reviewer: (leaf ? tousseInstance.reviewer : ''), operationTime: (leaf ? tousseInstance.operationTime : ''), - isUrgentTousse: (leaf ? tousseInstance.isUrgentTousse : ''), + urgentLevel: (leaf ? tousseInstance.urgentLevel : {}), amount: (leaf ? '' : 1), leaf: leaf, expanded: !leaf @@ -432,7 +443,7 @@ reviewerCode: node.get('reviewerCode'), reviewer: node.get('reviewer'), operationTime: node.get('operationTime'), - isUrgentTousse: node.get('isUrgentTousse') + urgentLevel: node.get('urgentLevel') }; items.push(item); });