Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r31079 -r31082
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 31079)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 31082)
@@ -870,6 +870,8 @@
{name : 'isPrint'},
{name : 'isReview'},
{name : 'replenishMaterils'},
+ {name : 'packedPhotographed'},
+ {name : 'partPacking'},
{name : 'haveIDCard'},
{name : 'uuid_vedioNames'},
{name : 'isTimeout'},
@@ -909,6 +911,16 @@
dataIndex: 'tousseName',
renderer: function(v,p,record,rowIndex, columnIndex, store,view){
p.style='word-wrap: break-word !important;';
+ if(record.get('tousseType') == '外来器械包' && sstsConfig.allowForeignToussePartSplitWhenPacking){
+ if(record.get('partPacking') && !record.get('isTimeout')){
+ p.css = 'tousseName_background';
+ }
+ }
+ if(record.get('tousseType') == '外来器械包' && sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse){
+ if(record.get('packedPhotographed') && !record.get('isTimeout')){
+ p.css = 'tousseName_background_1';
+ }
+ }
var tousseName = record.get('tousseName');
var showName = '' + tousseName + '';
if(record.get('taskType') == taskType_application || record.get('taskType') == taskType_returnGoods
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r29750 -r31082
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 29750)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 31082)
@@ -88,6 +88,14 @@
display:inline-block;
margin-right: 3px;
}
+/* BJ307YY-76:新增的颜色 */
+.tousseName_background {
+ background: #DDA0DD !important;
+}
+/* GDSZYY-83:新增的颜色 */
+.tousseName_background_1 {
+ background: #BFEFFF !important;
+}