Index: ssts-web/src/main/webapp/disinfectsystem/thirdPartyTousse/thirdPartyTousseView.js =================================================================== diff -u -r39013 -r39270 --- ssts-web/src/main/webapp/disinfectsystem/thirdPartyTousse/thirdPartyTousseView.js (.../thirdPartyTousseView.js) (revision 39013) +++ ssts-web/src/main/webapp/disinfectsystem/thirdPartyTousse/thirdPartyTousseView.js (.../thirdPartyTousseView.js) (revision 39270) @@ -29,6 +29,10 @@ top.Ext4.getCmp('receiverId').setValue(data.receiverId); top.Ext4.getCmp('receiver').setValue(data.receiver); top.Ext4.getCmp('receiveTime').setValue(data.receiveTime); + top.Ext4.getCmp('shipperId').setValue(data.shipperId); + top.Ext4.getCmp('shipper').setValue(data.shipper); + top.Ext4.getCmp('verifierId').setValue(data.verifierId); + top.Ext4.getCmp('verifier').setValue(data.verifier); top.Ext4.getCmp('wareHouseId').setValue(data.wareHouseId); top.Ext4.getCmp('wareHouseName').setValue(data.wareHouseName); top.Ext4.getCmp('remark').setValue(data.remark); @@ -82,6 +86,7 @@ var columns = [ { header: "流水号", dataIndex: 'serialNumber', width: 150, renderer: modifyRecord }, { header: "接收时间", dataIndex: 'receiveTime', width: 150 }, + { header: "申请科室", dataIndex: 'orgUnitNames', width: 150 }, { header: "接收员", dataIndex: 'receiver', width: 150 }, { header: "送货员", dataIndex: 'sender', width: 150 }, { header: "数量(包)", dataIndex: 'tousseAmount', width: 150 }, @@ -107,7 +112,7 @@ }]; listStore = new Ext4.data.JsonStore({ - pageSize:20, + pageSize: 20, proxy: { type: 'ajax', url: WWWROOT + '/disinfectSystem/baseData/thirdPartyTousseReceiveRecordController/loadThirdPartyTousseReceiveRecord.mhtml', @@ -123,6 +128,7 @@ { name: 'receiveTime' }, { name: 'receiver' }, { name: 'receiverId' }, + { name: 'orgUnitNames' }, { name: 'sender' }, { name: 'tousseAmount' }, { name: 'remark' },