Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js =================================================================== diff -u -r26942 -r38327 --- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js (.../deviceMaintenanceCostomInsView.js) (revision 26942) +++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js (.../deviceMaintenanceCostomInsView.js) (revision 38327) @@ -47,16 +47,69 @@ } +//DGSDBZXYY-218:新增审核功能 +function reviewFormInstance(grid){ + var records = grid.getSelectionModel().getSelections(); + + if (records.length == 0) { + showResult("请至少勾选一条记录后再进行操作。"); + return false; + } + var ids = null; + for ( var i = 0, len = records.length; i < len; i++) { + if (ids == null) { + ids = records[i].data['id']; + } else { + ids = ids + ';' + records[i].data['id']; + } + } + Ext.MessageBox.confirm("请确认","是否审核已勾选的记录?",function(button, text) { + if ("yes" == button){ + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/formInstanceAction!reviewFormInstance.do', + params : {ids : ids}, + success : function(response, options) { + var result = Ext.decode(response.responseText); + var success = result.success; + if(success){ + showResult('审核成功!'); + grid.dwrReload(); + }else { + showResult(result.message); + } + }, + failure : function(response, options) { + var result = Ext.decode(response.responseText); + showResult(result.message); + } + }); + } + }); +} + +function rendererStatus(v, p, record) { + var bgColor = ""; + var color = '#000'; + if (v == '已审核') { + bgColor = "green";//绿色 + color = '#fff'; + } + return "

" + v + "

"; +} + Ext.onReady(function() { Ext.QuickTips.init(); // 记录cookie(3步) var columns = [ {header : "设备维护名称",width : 250,dataIndex : 'formDefinition.formName', renderer : modifyRecord}, {header : "项目名称",width : 120,dataIndex : 'projectName'}, + {header : "审核状态",width : 120,dataIndex : 'status', renderer: rendererStatus,hidden:!sstsConfig.enableDeviceMaintenanceReview}, {header : "维护时间",width : 150,dataIndex : 'maintenanceTime',renderer : myDateFormatBySecond}, {header : "登记时间",width : 150,dataIndex : 'createDate',renderer : myDateFormatByMinute}, {header : "登记人",width : 120,dataIndex : 'createUserName'}, + {header : "审核时间",width : 150,dataIndex : 'reviewTime',hidden:!sstsConfig.enableDeviceMaintenanceReview}, + {header : "审核人",width : 120,dataIndex : 'reviewer',hidden:!sstsConfig.enableDeviceMaintenanceReview}, {id : 'remark',header : "备注",width : 120,dataIndex : 'remark'} ]; @@ -76,6 +129,9 @@ {name : 'maintenanceTime'}, {name : 'createDate'}, {name : 'createUserName'}, + {name : 'status'}, + {name : 'reviewer'}, + {name : 'reviewTime'}, {name : 'remark'} ]; @@ -91,6 +147,13 @@ handler : function() { deleteFormInstance(grid); } + }, '-', { + text : '审核', + iconCls : 'icon_set', + hidden:SSTS_CustomForm_Review, + handler : function() { + reviewFormInstance(grid); + } }]; var dwrCallParams = null; Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js =================================================================== diff -u -r30384 -r38327 --- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js (.../deviceMaintenanceCostomInsForm.js) (revision 30384) +++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js (.../deviceMaintenanceCostomInsForm.js) (revision 38327) @@ -492,6 +492,10 @@ name : 'formDefinitionItemIds', id : 'formDefinitionItemIds' },{ + xtype : 'hidden', + name : 'status', + id : 'status' + },{ layout : 'form', columnWidth : .5, labelWidth : 80, @@ -582,7 +586,36 @@ layout : 'form', columnWidth : .5, labelWidth : 80, + hidden:!sstsConfig.enableDeviceMaintenanceReview, items : [{ + xtype : 'textfield', + fieldLabel : '审核时间', + id : 'reviewTime', + name : 'reviewTime', + readOnly : true, + allowBlank : true, + anchor : '97%', + cls : 'fieldReadOnlyNoRemove' + }] + }, { + layout : 'form', + columnWidth : .5, + labelWidth : 90, + hidden:!sstsConfig.enableDeviceMaintenanceReview, + items : [{ + xtype : 'textfield', + name : 'reviewer', + id : 'reviewer', + fieldLabel : "审核人", + anchor : '95%', + readOnly : true, + cls : 'fieldReadOnlyNoRemove' + }] + },{ + layout : 'form', + columnWidth : .5, + labelWidth : 80, + items : [{ xtype : 'datefieldWithMin', fieldLabel : '维护时间', id : 'maintenanceTime', @@ -610,16 +643,27 @@ }] }], buttons : [{ + id : 'saveAndReview', + text : '保存并审核', + hidden:!sstsConfig.enableDeviceMaintenanceReview, + handler : function(){ + top.Ext.MessageBox.confirm("请确认","是否保存并审核当前信息?",function(button, text) { + if ("yes" == button){ + saveFormInstance(this,false,'已审核'); + } + }); + } + },{ id : 'saveBtn', text : '保存', handler : function(){ - saveFormInstance(this,false); + saveFormInstance(this,false,'未审核'); } },{ id : 'saveAndCreateBtn', text : '保存并新建', handler : function(){ - saveFormInstance(this,true); + saveFormInstance(this,true,'未审核'); } }, { text : '取消', @@ -700,14 +744,25 @@ if(top.Ext.getCmp('itemsFieldSet')){ top.Ext.getCmp('itemsFieldSet').doLayout(); } + if(sstsConfig.enableDeviceMaintenanceReview){ + top.Ext.getCmp("reviewer").setValue(result.data.reviewer); + if(result.data.reviewTime){ + top.Ext.getCmp("reviewTime").setValue(Ext.util.Format.date(new Date(result.data.reviewTime.time), 'Y-m-d H:i')); + } + if(result.data.status == '已审核'){ + top.Ext.getCmp("saveAndReview").hide(); + top.Ext.getCmp("saveBtn").hide(); + top.Ext.getCmp("saveAndCreateBtn").hide(); + } + } }, failure : function(response, options) { showResult('系统加载出错,请稍候再试'); } }); } - function saveFormInstance(thiz,saveAndCreate) { + function saveFormInstance(thiz,saveAndCreate,status) { //是否选择设备维护名称 var name = top.Ext.getCmp("formName").getValue() ; if(isUndefinedOrNullOrEmpty(name)){ @@ -747,6 +802,8 @@ showResult("请选择表单名称!"); return false; } + + top.Ext.getCmp('status').setValue(status); submitForm2(saveAndCreate); } Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r38058 -r38327 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 38058) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 38327) @@ -481,6 +481,7 @@ + Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.jsp =================================================================== diff -u -r31458 -r38327 --- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.jsp (.../deviceMaintenanceCostomInsView.jsp) (revision 31458) +++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.jsp (.../deviceMaintenanceCostomInsView.jsp) (revision 38327) @@ -35,13 +35,12 @@ var enableEditBtn = false; var enableSaveBtn = false; var enableSaveAndNewBtn = false; - -enableEditBtn = true; - - -enableSaveBtn = true; - +var SSTS_CustomForm_Review = true; + + SSTS_CustomForm_Review = false; + + //告警类型 var warningItemType = "${param.warningItemType }"