Index: ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.js =================================================================== diff -u -r38048 -r38083 --- ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.js (.../forminstanceView.js) (revision 38048) +++ ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.js (.../forminstanceView.js) (revision 38083) @@ -52,7 +52,8 @@ // 记录cookie(3步) var columns = [ - { header: "名称", width: 250, dataIndex: 'formDefinition.formName', renderer: modifyRecord }, + { header: "名称", width: 250, dataIndex: 'formDefinition.formName', renderer: modifyRecord, hidden: SSTS_EquipmentInspection_Update }, + { header: "名称", width: 250, dataIndex: 'formDefinition.formName', hidden: !SSTS_EquipmentInspection_Update }, { header: "设备名称", width: 250, dataIndex: 'equipmentName' }, { header: "登记时间", width: 160, dataIndex: 'createDate', renderer: myDateFormatByMinute }, { header: "登记人", width: 120, dataIndex: 'createUserName' }, @@ -104,12 +105,14 @@ var tbar = [{ text: '添加', iconCls: 'btn_ext_application_add', + hidden: SSTS_EquipmentInspection_Add, handler: function () { addFormInstanceWin(""); } }, '-', { text: '删除', iconCls: 'btn_ext_application_del', + hidden: SSTS_EquipmentInspection_Delete, handler: function () { deleteFormInstance(grid); } Index: ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.jsp =================================================================== diff -u -r38048 -r38083 --- ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.jsp (.../forminstanceView.jsp) (revision 38048) +++ ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.jsp (.../forminstanceView.jsp) (revision 38083) @@ -34,13 +34,18 @@ var enableEditBtn = false; var enableSaveBtn = false; var enableSaveAndNewBtn = false; -var SSTS_CustomForm_Review = true; - - SSTS_CustomForm_Review = false; +var SSTS_EquipmentInspection_Add = true; + + SSTS_EquipmentInspection_Add = false; -if(!sstsConfig.enableReviewOfFormDefinitionFunction){ - SSTS_CustomForm_Review = true; -} +var SSTS_EquipmentInspection_Update = true; + + SSTS_EquipmentInspection_Update = false; + +var SSTS_EquipmentInspection_Delete = true; + + SSTS_EquipmentInspection_Delete = false; + @@ -55,7 +60,7 @@
- +
Index: ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/formdefinitionForm.js =================================================================== diff -u -r38048 -r38083 --- ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/formdefinitionForm.js (.../formdefinitionForm.js) (revision 38048) +++ ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/formdefinitionForm.js (.../formdefinitionForm.js) (revision 38083) @@ -995,7 +995,7 @@ } optionsStr += record.get("name"); } - if(defaultValueCount > 1){ + if(defaultValueCount > 1 && type == '单选'){ showResult('单选只能有一个默认值!'); return }