Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js =================================================================== diff -u -r28895 -r32924 --- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js (.../config.js) (revision 28895) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js (.../config.js) (revision 32924) @@ -61,6 +61,10 @@ notShowZeroStorage:true, //是否启用回收申请单不发货科室配置 enableRecyclingApplicationNotInvoice:true, + //启用使用记录申请单的扩展名 + enableUseRecordFormExtensionFields:["主刀医生核算科室"], + //使用记录表单的必填项配置 + notAllowBlankFieldsOnUseRecordPage : ["doctorAccountDepart"], enableUrgentFunction:true Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r32873 -r32924 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 32873) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 32924) @@ -66,6 +66,8 @@ var visitIdAllowBlank = true; //特殊感染类型 var specialInfectionAllowBlank = true; + //主刀医生核算科室 + var doctorAccountDepartAllowBlank = true; //备注 var remarkAllowBlank = true; @@ -139,6 +141,9 @@ if(fieldName == 'specialInfection'){ specialInfectionAllowBlank = false; } + if(fieldName == 'doctorAccountDepart'){ + doctorAccountDepartAllowBlank = false; + } if(fieldName == 'remark'){ remarkAllowBlank = false; } @@ -1230,6 +1235,12 @@ showResult('特殊感染类型不能为空'); return result; } + if(!doctorAccountDepartAllowBlank && top.Ext.getCmp('doctorAccountDepart').getValue() == ''){ + btObj.enable(); + top.Ext.getCmp('doctorAccountDepart').focus(); + showResult('主刀医生核算科室不能为空'); + return result; + } if(!remarkAllowBlank && top.Ext.getCmp('remark').getValue() == ''){ btObj.enable(); top.Ext.getCmp('remark').focus(); @@ -2206,7 +2217,6 @@ if(top.screen.height > 800){ windowHeight = 720; } - formObj = new top.Ext.FormPanel({ id : 'useRecordForm', frame : true, @@ -2910,6 +2920,37 @@ }), anchor : '96%' }] + }, { + layout : 'form', + columnWidth : 0.33, + labelWidth:120, + hidden : !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains('主刀医生核算科室')), + items : [{ + xtype : 'hidden', + id : 'doctorAccountDepartCode', + name : 'doctorAccountDepartCode' + },{ + xtype : 'combo', + id : 'doctorAccountDepart', + name : 'doctorAccountDepart', + queryParam : 'spell', + fieldLabel : '主刀医生核算科室', + minChars : 0, + valueField : 'id', + displayField : 'name', + store : departJsonStore, + forceSelection : true, + lazyInit : true, + triggerAction : 'all', + typeAhead : false, + anchor : '96%', + allowBlank : doctorAccountDepartAllowBlank, + listeners : { + select : function(combo, record, index) { + top.Ext.getCmp('doctorAccountDepartCode').setValue(record.data.id); + } + } + }] },{ layout : 'form', labelWidth :70, @@ -3236,6 +3277,8 @@ } } top.Ext.getCmp('tempBarcode').focus(true); + top.Ext.getCmp('doctorAccountDepart').setValue(action.result.data.doctorAccountDepart); + top.Ext.getCmp('doctorAccountDepartCode').setValue(action.result.data.doctorAccountDepartCode); // 保存原始数据,只需要保存需要修改的属性 setOriginalFormParams(form, [ 'id', 'washHandNurse','circuitNurse', 'operationRoom','treatmentNum',