Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r37308 -r37325
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 37308)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 37325)
@@ -1246,6 +1246,12 @@
* @param {是否载入全部数量} isLoadAll
*/
function scanFixedBarcode(fixedBarcode, isLoadAll) {
+ //DGSETYY-72:没有"灭菌时允许增删操作"权限
+ var currentStatus = top.Ext.getCmp('currentStatus').getValue();
+ if(!SSTS_Sterilization_AllowOperation && currentStatus == '灭菌中'){
+ showMultipleResult("灭菌进行中,不能随意添加物品!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
+ return;
+ }
var rootNode = sterilizationColumnTree.getRootNode();
var leftFixedLenght = parseInt(getLeftFixedBarcodeAmount(fixedBarcode) || 0);
var rightFixedLenght = parseInt(getRigthFixedBarcodeAmount(fixedBarcode) || 0);
@@ -1879,6 +1885,12 @@
* @param {灭菌记录id} sterilizationRecordId
*/
function loadTousseInstance(barcodeStr, sterilizationRecordId, isTimeout, setCode, barcodeType) {
+ //DGSETYY-72:没有"灭菌时允许增删操作"权限
+ var currentStatus = top.Ext.getCmp('currentStatus').getValue();
+ if(!SSTS_Sterilization_AllowOperation && currentStatus == '灭菌中'){
+ showMultipleResult("灭菌进行中,不能随意添加物品!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
+ return;
+ }
if (!setCode) {
if (barcodeStr == '' || barcodeStr.length <= 0) {
showMultipleResult("请输入条码!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
@@ -3423,6 +3435,10 @@
sterilizationColumnTreeColumnArray.push({
header: '删除', width: 50, dataIndex: 'type',
renderer: function (v, p, record) {
+ //DGSETYY-72:没有"灭菌时允许增删操作"权限
+ if(!SSTS_Sterilization_AllowOperation && currentStatus == '灭菌中'){
+ return '';
+ }
//只有“没有入篮筐的器械包节点”或者“篮筐节点”,并且灭菌记录的状态不为“已灭菌”和“灭菌失败” 或者 灭菌记录状态为灭菌中的子节点
if ((record.isParentNode == true
&& currentStatus != statusEnd
@@ -3650,6 +3666,10 @@
pendingSterilizationColumnTreeColumnArray.push({
header: '载入', width: 35, dataIndex: 'type', hidden: hideSterilizationLoadBtn,
renderer: function (v, p, record) {
+ //DGSETYY-72:没有"灭菌时允许增删操作"权限
+ if(!SSTS_Sterilization_AllowOperation && currentStatus == '灭菌中'){
+ return '';
+ }
var str = "";
if (record.type == 'BASKET' || record.type == 'TOUSSE' || record.type == '器械包') {
if (currentStatus != statusEnd && currentStatus != statusFailure) {
@@ -3682,6 +3702,10 @@
width: 40,
dataIndex: 'type',
renderer: function (v, p, record) {
+ //DGSETYY-72:没有"灭菌时允许增删操作"权限
+ if(!SSTS_Sterilization_AllowOperation && currentStatus == '灭菌中'){
+ return '';
+ }
var str = "
";
if (record.type == 'TOUSSE_IN') {
if (currentStatus != statusEnd && currentStatus != statusFailure) {
@@ -3821,6 +3845,13 @@
anchor: '95%'
})
}
+ //DGSETYY-72:没有"灭菌时允许增删操作"权限
+ if(!SSTS_Sterilization_AllowOperation && currentStatus == '灭菌中'){
+ isHideBtnBatchAddTousse = true;
+ tbarForAddInBatch = false;
+ }else {
+ isHideBtnBatchAddTousse = sstsConfig.hasOwnProperty('isHideBtnBatchAddTousse') && sstsConfig.isHideBtnBatchAddTousse;
+ }
var buttonItems = [];
if (listDisplayOfItemsToBeSterilized == 3 && tbarForGoodsSearch) {
buttonItems.push({
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
===================================================================
diff -u -r37019 -r37325
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 37019)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 37325)
@@ -31,6 +31,7 @@