Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js =================================================================== diff -u -r37246 -r40460 --- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 37246) +++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 40460) @@ -453,6 +453,9 @@ doctorAccountDepartAllowBlank = allowBlankObj.doctorAccountDepart; //备注 remarkAllowBlank = allowBlankObj.remark; + }else { + //SZSDSRMYY-208:登记使用记录必须填写手术间 + operationRoomAllowBlank = SSTS_UseRecord_OperationRoomAllowBlank } //ZJYY-80:使用记录字段别名设置 @@ -751,7 +754,6 @@ }, { header: "包装类型", dataIndex: 'packageType', width: 90, menuDisabled: true }, { header: "物品类型", dataIndex: 'goodsType', hidden: true }, - // {header : "批次",dataIndex : 'batchNo',width : 100,menuDisabled : true}, { header: "有效期", dataIndex: 'validUntil', menuDisabled: true, width: 110 }, { hidden: true, header: "图片", dataIndex: 'tousseDefinitionName', menuDisabled: true, width: 35, renderer: function (v, p, record) { Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecord.jsp =================================================================== diff -u -r37216 -r40460 --- ssts-web/src/main/webapp/buttjoint/useRecord/useRecord.jsp (.../useRecord.jsp) (revision 37216) +++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecord.jsp (.../useRecord.jsp) (revision 40460) @@ -93,6 +93,14 @@ var OPERATION_STATUS_IN_OPERATION = '<%=UseRecord.OPERATION_STATUS_IN_OPERATION %>'; //手术状态:手术结束 var OPERATION_STATUS_END_OPERATION = '<%=UseRecord.OPERATION_STATUS_END_OPERATION %>'; + //SZSDSRMYY-124:手术间权限 +var SSTS_UseRecord_OperationRoomAllowBlank = true; + + SSTS_UseRecord_OperationRoomAllowBlank = false; + +if(!sstsConfig.enableUseRecordMustFilledInTheOperationRoomFunction){ + SSTS_UseRecord_OperationRoomAllowBlank = true; +}