Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js =================================================================== diff -u -r29910 -r30055 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 29910) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 30055) @@ -179,6 +179,7 @@ var departJsonStore = null; + var appDepartJsonStore = null; if(limitDepart){ var departProperties = [{name : 'id'}, {name : 'name'}, @@ -195,6 +196,20 @@ orgUnitName : orgUnitName }); departJsonStore.add(departRecord); + + var appDepartProperties = [{name : 'id'}, + {name : 'name'}] + appDepartJsonStore = new Ext.data.Store({ + reader : new Ext.data.JsonReader({ + fields : appDepartProperties + }) + }); + var appDepartRecord = Ext.data.Record.create(appDepartProperties); + var appDepartRecord = new DepartRecord({ + id : orgUnitCoding, + name : orgUnitName + }); + appDepartJsonStore.add(appDepartRecord); }else{ departJsonStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ @@ -210,6 +225,20 @@ ] ) }); + //Ext4 申请科室Store + appDepartJsonStore = 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'} + ] + ) + }); } var tousseTypeStore = new Ext.data.SimpleStore( { fields : ['value'], @@ -493,9 +522,9 @@ queryParam : 'spell', fieldLabel : '申请科室', minChars : 0, - valueField : 'orgUnitName', + valueField : 'name', displayField : 'name', - store : departJsonStore, + store : appDepartJsonStore, forceSelection : true, lazyInit : true, mode : departMode, @@ -646,6 +675,7 @@ if(supplyRoomType == supplyRoomTypeFirstSupplyRoom || supplyRoomType == supplyRoomTypeSecondSupplyRoom || supplyRoomType == supplyRoomTypeExpensiveGoods){ departJsonStore.load(); + appDepartJsonStore.load(); }else{ Ext.getCmp('invoicePlanDepartCoding').setValue(orgUnitCoding); var departSearch = Ext.getCmp('invoicePlanDepartSearch');