Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js =================================================================== diff -u -r33049 -r33056 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 33049) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 33056) @@ -192,6 +192,7 @@ var departJsonStore = null; + var invoicePlanDepartStore = null; var appDepartJsonStore = null; if (limitDepart) { var departProperties = [{ name: 'id' }, @@ -212,7 +213,7 @@ var appDepartProperties = [{ name: 'id' }, { name: 'name' }] - appDepartJsonStore = new Ext.data.Store({ + invoicePlanDepartStore = new Ext.data.Store({ reader: new Ext.data.JsonReader({ fields: appDepartProperties }) @@ -222,6 +223,7 @@ id: orgUnitCoding, name: orgUnitName }); + invoicePlanDepartStore.add(appDepartRecord); appDepartJsonStore.add(appDepartRecord); } else { departJsonStore = new Ext.data.Store({ @@ -238,7 +240,21 @@ ] ) }); - //Ext4 申请科室Store + //申请科室Store + invoicePlanDepartStore = new Ext.data.Store({ + proxy: new Ext.data.HttpProxy({ + url: WWWROOT + '/systemmanage/orgUnit/searchApplyDepartmentByKeyWord.do?onlyOneself=false&showDisableOrgUnit=false', + method: 'POST' + }), + reader: new Ext.data.JsonReader({ + root: 'data' + }, [ + { name: 'id', mapping: 'departmentCode' }, + { name: 'name', mapping: 'departmentName' } + ] + ) + }); + //结算科室Store appDepartJsonStore = new Ext.data.Store({ proxy: new Ext.data.HttpProxy({ url: WWWROOT + '/systemmanage/orgUnit/searchApplyDepartmentByKeyWord.do?onlyOneself=false&showDisableOrgUnit=false', @@ -571,7 +587,7 @@ minChars: 0, queryParam: 'spell', allowBlank: true, - store: appDepartJsonStore, + store: invoicePlanDepartStore, mode: departMode, triggerAction: 'all', anchor: '95%', @@ -700,9 +716,9 @@ mode: 'local', triggerAction: 'all', anchor: '95%', - listeners:{ - render:function(){ - setTimeout(function(){ + listeners: { + render: function () { + setTimeout(function () { Ext.getCmp('goodsTypeElement').hide(); }, 10); } @@ -783,6 +799,7 @@ if (supplyRoomType == supplyRoomTypeFirstSupplyRoom || supplyRoomType == supplyRoomTypeSecondSupplyRoom || supplyRoomType == supplyRoomTypeExpensiveGoods) { departJsonStore.load(); + invoicePlanDepartStore.load(); appDepartJsonStore.load(); } else { Ext.getCmp('invoicePlanDepartCoding').setValue(orgUnitCoding);