Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp =================================================================== diff -u -r28127 -r29256 --- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp (.../problemReport.jsp) (revision 28127) +++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp (.../problemReport.jsp) (revision 29256) @@ -8,7 +8,7 @@ <% request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName()); request.setAttribute("orgunit",AcegiHelper.getLoginUser().getCurrentOrgUnitName()); - request.setAttribute("orgUnitCoding",AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig()); + request.setAttribute("orgUnitCoding",AcegiHelper.getLoginUser().getCurrentOrgUnitCode()); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); request.setAttribute("today", dateFormat.format(new Date())); %> Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js =================================================================== diff -u -r28127 -r29256 --- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js (.../problemReportForm.js) (revision 28127) +++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js (.../problemReportForm.js) (revision 29256) @@ -39,8 +39,8 @@ frame : true, labelSeparator : ':', bodyStyle : 'padding:5px 5px 0px 5px', - width : document.body.clientWidth*0.7, - height : document.body.clientWidth*0.38, + width : 900, + height : 500, labelAlign : 'right', buttonAlign : 'center', autoScroll : true, @@ -269,7 +269,7 @@ id : 'problemWin', layout : 'fit', title : '问题反馈信息', - width : 700, + width : 900, modal : true, autoHeight : true, border : false, @@ -322,7 +322,6 @@ top.Ext.getCmp('type').setValue(result.data.type || ''); top.Ext.getCmp('solveBtn').show(); - if(status == "已完成"){ top.Ext.getCmp('title').addClass('fieldReadOnlyNoRemove'); top.Ext.getCmp('title').el.dom.readOnly = true; @@ -354,7 +353,7 @@ top.Ext.getCmp('reportTime').addClass('fieldReadOnlyNoRemove'); top.Ext.getCmp('reportTime').el.dom.readOnly = true; top.Ext.getCmp('type').disable(); - if(!SSTS_ProblemReport_Answer){ + if(!SSTS_ProblemReport_Answer || (!SSTS_ProblemReport_Create && result.data.orgUnitCoding == $Id('orgUnitCoding').value)){ top.Ext.getCmp('answerValue').enable(); top.Ext.getCmp('saveBtn').enable(); top.Ext.getCmp('answerAreaButton').enable(); Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportView.js =================================================================== diff -u -r28127 -r29256 --- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportView.js (.../problemReportView.js) (revision 28127) +++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportView.js (.../problemReportView.js) (revision 29256) @@ -80,7 +80,6 @@ fieldLabel : '开始日期', name : 'startTime', id : 'startTime', - width:100, xtype : 'datefieldWithMin', width : datefieldWithMinWidth, readOnly : true, @@ -194,7 +193,7 @@ frame : true, buttonAlign : 'center', region : 'north', - height : 100, + height : 80, items : { layout : 'column', width: 1300,