Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r40409 -r40410
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 40409)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 40410)
@@ -1420,6 +1420,30 @@
value: '通过管理权限进行修改',
triggerAction: 'all'
}]
+ }, {
+ layout: 'form',
+ columnWidth: .25,
+ labelWidth: fontSize == 12 ? 180 : 210,
+ hidden: sstsConfig.closeFormDefinition,
+ items: [{
+ xtype: 'combo',
+ fieldLabel: profile == 'gzszyy' ? '不良事件上报修改模式' : '自定义表单修改模式',
+ id: 'defineFormModificationMode',
+ name: 'defineFormModificationMode',
+ valueField: 'value',
+ displayField: 'value',
+ mode: 'local',
+ anchor: '100%',
+ editable: false,
+ store: new Ext.data.SimpleStore({
+ fields: ['value'],
+ data: [['通过管理权限进行修改'], ['仅登记人可以修改']]
+ }),
+ forceSelection: true,
+ allowBlank: true,
+ value: '通过管理权限进行修改',
+ triggerAction: 'all'
+ }]
}
]
}, {
@@ -4119,6 +4143,12 @@
deviceMaintenanceUpdateMode = Ext.getCmp("deviceMaintenanceUpdateMode").getValue();
}
+ //GZSZYY-118:自定义表单修改模式权限设置
+ var defineFormModificationMode = '';
+ if(!sstsConfig.closeFormDefinition){
+ defineFormModificationMode = Ext.getCmp("defineFormModificationMode").getValue();
+ }
+
//KSDQDYRMYY-13
var isEnableTousseOpRecipient = '否';
var isEnableTousseOpDestLocation = '否';
@@ -4380,6 +4410,7 @@
userNoLoginDateLimit :userNoLoginDateLimit ,
noOptionCleanMethodSolution:noOptionCleanMethodSolution,
deviceMaintenanceUpdateMode:deviceMaintenanceUpdateMode,
+ defineFormModificationMode:defineFormModificationMode,
borrowRemind: borrowRemind,
borrowRemindFrequency: borrowRemindFrequency,
kardexContainerHost: kardexContainerHost,
@@ -4709,6 +4740,11 @@
Ext.getCmp("deviceMaintenanceUpdateMode").setValue(supplyRoomConfig.deviceMaintenanceUpdateMode);
}
+ //GZSZYY-118:自定义表单修改模式权限设置
+ if(!sstsConfig.closeFormDefinition){
+ Ext.getCmp("defineFormModificationMode").setValue(supplyRoomConfig.defineFormModificationMode);
+ }
+
//ZSWY-233:借物单弹窗提醒
if(sstsConfig.enableCardinalityManagementOfBorrow){
Ext.getCmp('borrowRemind').setValue(supplyRoomConfig.borrowRemind );
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
===================================================================
diff -u -r36771 -r40410
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp (.../supplyRoomTypeView.jsp) (revision 36771)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp (.../supplyRoomTypeView.jsp) (revision 40410)
@@ -34,16 +34,8 @@