Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r13664 -r14428
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 13664)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 14428)
@@ -22,6 +22,7 @@
{name: 'serialNumber'},
{name: 'applicant'},
{name: 'settleAccountsDepart'},
+ {name: 'remark'},
{name: 'sender'},
{name: 'senderTime'},
{name: 'printTime'},
@@ -44,9 +45,9 @@
var applicationID = record.data['id'];
if(applicationID != null && applicationID != ""){
if(record.data['diposable'] == '否'){
- return ""+record.data['tousseName']+"";
+ return ""+record.data['tousseName']+"";
}else{
- return ""+record.data['tousseName']+"";
+ return ""+record.data['tousseName']+"";
}
}else{
return ""+record.data['tousseName']+"";
@@ -373,7 +374,8 @@
{header : "申请单流水号",width : 130,dataIndex : 'serialNumber',hidden:true},
{header : "申请人",width : 130,dataIndex : 'applicant',hidden:true},
{header : "结算科室",width : 130,dataIndex : 'settleAccountsDepart',hidden:true},
- {header : "打印时间",width : 110,dataIndex : 'printTime'}
+ {header : "打印时间",width : 110,dataIndex : 'printTime'},
+ {header : "备注",width : 110,dataIndex : 'remark'}
]);