Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r35063 -r35064 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 35063) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 35064) @@ -254,15 +254,15 @@ // 查找某科室的人员的store var departUsersStore = new Ext.data.Store({ - proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/systemmanage/user/loadUserByDepartmentCode!loadUserByDepartmentCode.do', - method : 'POST' + proxy: new Ext.data.HttpProxy({ + url: WWWROOT + '/systemmanage/user/loadUserByDepartmentCode!loadUserByDepartmentCode.do', + method: 'POST' }), - reader : new Ext.data.JsonReader({ - totalProperty : 'totalCount', - root : 'data' + reader: new Ext.data.JsonReader({ + totalProperty: 'totalCount', + root: 'data' }, [ - {name : 'name',mapping : 'name'} + { name: 'name', mapping: 'name' } ]) }); @@ -279,6 +279,7 @@ { name: 'barcode' }, { name: 'tousseDefinitionName' }, { name: 'showTousseName' }, + { name: 'doctorName' }, { name: 'settleAccountDeptCodeUseRecord' }, { name: 'settleAccountDeptNameUseRecord' }, { name: 'packageType' }, @@ -383,6 +384,7 @@ batchNo: goodsInfo.batchNo, showTousseName: goodsInfo.showTousseName, packageType: '', + doctorName: '', settleAccountDeptCodeUseRecord: settleAccountDeptCodeUseRecord, settleAccountDeptNameUseRecord: settleAccountDeptNameUseRecord, validUntil: goodsInfo.validUntil, @@ -753,6 +755,7 @@ urgentLevel: goodsInfo.urgentLevel, hospitalNumber: goodsInfo.hospitalNumber, clinicNumber: goodsInfo.clinicNumber, + doctorName: '', settleAccountDeptCodeUseRecord: settleAccountDeptCodeUseRecord, settleAccountDeptNameUseRecord: settleAccountDeptNameUseRecord, patient: goodsInfo.patient @@ -779,6 +782,7 @@ amount: subTousse.amount, tousseDefinitionName: subTousse.showTousseName, showTousseName: subTousse.showTousseName, + doctorName: '', settleAccountDeptCodeUseRecord: settleAccountDeptCodeUseRecord, settleAccountDeptNameUseRecord: settleAccountDeptNameUseRecord, comboTousseInstanceId: subTousse.comboTousseInstanceId, @@ -808,6 +812,7 @@ showTousseName: goodsInfo.showTousseName, idCardUseAmount: goodsInfo.idCardUseAmount, packageType: '', + doctorName: '', settleAccountDeptCodeUseRecord: settleAccountDeptCodeUseRecord, settleAccountDeptNameUseRecord: settleAccountDeptNameUseRecord, validUntil: goodsInfo.validUntil, @@ -838,6 +843,7 @@ showTousseName: goodsInfo.showTousseName, idCardUseAmount: goodsInfo.idCardUseAmount, packageType: '', + doctorName: '', settleAccountDeptCodeUseRecord: settleAccountDeptCodeUseRecord, settleAccountDeptNameUseRecord: settleAccountDeptNameUseRecord, validUntil: goodsInfo.validUntil, @@ -1898,7 +1904,7 @@ var tousseInstanceId = item.data.id; if (item.data.doctorName == '') { newDoctorName = doctorName - useItemsStore.getAt(i).set('doctorName',doctorName) + useItemsStore.getAt(i).set('doctorName', doctorName) } doctorNameJsonArray.push({ tousseInstanceId: tousseInstanceId, @@ -2236,8 +2242,8 @@ triggerAction: 'all', typeAhead: false, anchor: '96%', - pageSize : 50, - listWidth:250, + pageSize: 50, + listWidth: 250, listeners: { select: function (combo, record, index) { var records = top.Ext.getCmp('tousseInstanceGrid').getSelectionModel().getSelections(); @@ -2250,7 +2256,7 @@ menuDisabled: true }, { - header: '结算科室', dataIndex: 'settleAccountDeptNameUseRecord', width: 100, hidden: (!sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction), + header: '结算科室', dataIndex: 'settleAccountDeptNameUseRecord', width: 100, hidden: (sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction), editor: new top.Ext.form.ComboBox({ xtype: 'combo', valueField: 'name',