Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r23651 -r23657 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 23651) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 23657) @@ -964,6 +964,7 @@ recyclingRecordJSON.put("reUser", recyclingRecord.getRecyclingUser()); recyclingRecordJSON.put("reType", recyclingRecord.getRecyclingApplicationType()); recyclingRecordJSON.put("reTime", ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + recyclingRecordJSON.put("reDept", recyclingRecord.getDepart()); } //清洗记录 Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js =================================================================== diff -u -r23656 -r23657 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 23656) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 23657) @@ -228,8 +228,8 @@ columnWidth : .5, cls:'edit-part2-labelwidth', items : [{ - id : 'sadsa', - name : 'sadsa', + id : 'reDept', + name : 'reDept', xtype : 'textfield', fieldLabel : '科室', anchor : '100%', @@ -1559,6 +1559,8 @@ top.Ext.getCmp('reUser').setValue(recyclingRecordInfo.reUser); //回收记录_回收人 top.Ext.getCmp('reType').setValue(recyclingRecordInfo.reType); //回收记录_回收类型 top.Ext.getCmp('reTime').setValue(recyclingRecordInfo.reTime); //回收记录_回收时间 + top.Ext.getCmp('reDept').setValue(recyclingRecordInfo.reDept); //回收记录_回收科室 + ///上一个包实例的使用记录 var lastUserecord = result.lastUseRecord; top.Ext.getCmp('lastUseRecordOperator').setValue(lastUserecord?lastUserecord.operator:''); //上一个包实例使用记录登记人