Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r14379 -r14483 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 14379) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 14483) @@ -1718,6 +1718,7 @@ {header : "流水号",width : 100,dataIndex : 'serialNumber',renderer : renderCallModifyFunction}, {header : "申请科室",width : 120,dataIndex : 'depart'}, {header : "申请时间",width : 120,dataIndex : 'applicationTime',renderer : myDateFormatByMinute}, + {header : "回收时间",width : 120,dataIndex : 'recyclingTime',renderer : myDateFormatByMinute}, {header : "发货员",width : 70,dataIndex : 'sender'}, {header : "拼音码",width : 100,dataIndex : 'spelling',hidden:true}, {header : "五笔码",width : 100,dataIndex : 'wbCode',hidden:true}, @@ -1743,8 +1744,9 @@ {name : 'settleAccountsDepart'}, {name : 'isPrint'}, {name : 'spelling'}, - {name : 'wbCode'}, + {name : 'wbCode'}, {name : 'applicationTime'}, + {name : 'recyclingTime'}, {name : 'sender'}, {name : 'assistantSender'}, {name : 'sendTime'},