Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
===================================================================
diff -u -r37135 -r37141
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 37135)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 37141)
@@ -171,6 +171,16 @@
SSTS_QualityRecord_Create = false;
+//SZSDSRMYY-124:手术间权限
+var SSTS_UseRecord_OperationRoomAllowBlank = true;
+
+ SSTS_UseRecord_OperationRoomAllowBlank = false;
+
+if(!sstsConfig.enableUseRecordMustFilledInTheOperationRoomFunction){
+ SSTS_UseRecord_OperationRoomAllowBlank = true;
+}
+
+
//合并转换权限(用于控制扫条码的复选框及合并转换按钮)
var SSTS_UseRecord_MergeConvert = true;
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r36992 -r37141
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 36992)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 37141)
@@ -178,6 +178,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
===================================================================
diff -u -r37066 -r37141
--- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 37066)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 37141)
@@ -304,6 +304,8 @@
signModuleVersion:2,
//配置外来器械申请单统计报表的扩展列
extendedColumnConfigOfForeignTousseApplicationReport:["recyclingTime"],
+//启用使用记录必须填写手术间功能
+enableUseRecordMustFilledInTheOperationRoomFunction:true,
//是否启用快速回收一键入筐功能
recycleAllTousseIntoBasketInExpressRecycle:true
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r37135 -r37141
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 37135)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 37141)
@@ -118,6 +118,9 @@
doctorAccountDepartAllowBlank = allowBlankObj.doctorAccountDepart;
//备注
remarkAllowBlank = allowBlankObj.remark;
+}else {
+ //SZSDSRMYY-124:登记使用记录必须填写手术间
+ operationRoomAllowBlank = SSTS_UseRecord_OperationRoomAllowBlank
}
//ZJYY-80:使用记录字段别名设置