Index: ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.js =================================================================== diff -u -r20542 -r20576 --- ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.js (.../expressInvoiceView.js) (revision 20542) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.js (.../expressInvoiceView.js) (revision 20576) @@ -13,6 +13,7 @@ var invoiceDepartGroups = ''; var appDepartCode = ''; var selTousseDefinitionId = null; +var tousseName = ''; //申请科室Store var appDepartJsonStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ @@ -91,7 +92,9 @@ var depart = records[0].data['depart']; openMode = INVOICE_FORM_OPEN_MODE_CLICKITEM; selTousseDefinitionId = records[0].data['tousseDefinitionId']; - addAndEditInvoicePlan(departCode,depart); + tousseName = records[0].data['tousseName']; + var departCodingSet = records[0].data['departCodingSet']; + addAndEditInvoicePlan(departCodingSet.join(';'),depart); } /** * 通过扫描条码打开发货计划单。条码可以是科室条码(不是科室编码),也可以是单号 @@ -254,11 +257,12 @@ }), reader : new Ext.data.JsonReader({ fields : [ - {name : 'tousseName'} - ,{name : 'tousseDefinitionId'} - ,{name : 'departAmount'} - ,{name : 'invoicePlanAmount'} - ,{name : 'appAmount'} + {name : 'tousseName'}, + {name : 'tousseDefinitionId'}, + {name : 'departAmount'}, + {name : 'departCodingSet'}, + {name : 'invoicePlanAmount'}, + {name : 'appAmount'} ] }) , sortInfo: {