Index: ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js =================================================================== diff -u -r36244 -r36510 --- ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js (.../config.js) (revision 36244) +++ ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js (.../config.js) (revision 36510) @@ -148,6 +148,8 @@ isShowForeignToussencestorDefinitionForApply:true, //外来器械包拆包样式 splitForeianTousseNamestyle:1, + //手术预约单的表单字段必填项配置 + notAllowBlankFieldsOfOperationReservationForm:["operationRoom","operationTime","consoleName"], //外来器械默认申请科室配置 enableForeignTousseApplyDepartment:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js =================================================================== diff -u -r33614 -r36510 --- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 33614) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 36510) @@ -53,6 +53,11 @@ showResult('请正确填写表单各值'); return false; } + var operationName = top.Ext.getCmp("operationName").getValue() + if(operationName == ''){ + showResult('手术名称不能为空!'); + return false; + } var store = top.Ext.getCmp('operationReservationGrid').getStore(); if(store.getCount() <= 0){ showResult('请添加物品项!'); @@ -113,10 +118,18 @@ function editOperationReservation(id,committedStatus) { var operationRoomAllowBlank = true; + var operationTimeAllowBlank = true; + var consoleNameAllowBlank = true; if (sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object') { var allowBlankObj = returnFieldAllowBlankObj('notAllowBlankFieldsOnUseRecordPage'); operationRoomAllowBlank = allowBlankObj.operationRoom; } + if(sstsConfig.notAllowBlankFieldsOfOperationReservationForm && typeof sstsConfig.notAllowBlankFieldsOfOperationReservationForm == 'object') { + var allowBlankObj = returnFieldAllowBlankObj('notAllowBlankFieldsOfOperationReservationForm'); + operationRoomAllowBlank = allowBlankObj.operationRoom; + operationTimeAllowBlank = allowBlankObj.operationTime; + consoleNameAllowBlank = allowBlankObj.consoleName; + } var handleDepartStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/systemmanage/getCssdsByApplyDepartAndType.do', @@ -300,7 +313,7 @@ id : 'operationName', name : 'operationName', cls : 'fieldReadOnlyNoRemove', - allowBlank : false, + allowBlank : true, readOnly : true, anchor : '100%' }] @@ -330,7 +343,7 @@ maxLength : '60', id : 'applicant', name : 'applicant', - allowBlank : false, + allowBlank : true, readOnly : true, cls : 'fieldReadOnlyNoRemove', value : $Id('userName').value, @@ -444,7 +457,7 @@ format : 'Y-m-d H:i', altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', editable: false, - allowBlank : true, + allowBlank : operationTimeAllowBlank, anchor : '100%' }] },{ @@ -504,7 +517,7 @@ maxLength : '41', id : 'consoleName', name : 'consoleName', - allowBlank : true, + allowBlank : consoleNameAllowBlank, anchor : '100%' }] },{