Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r30253 -r30266 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 30253) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 30266) @@ -784,6 +784,8 @@ // 没有值,设置默认值为1 Ext.getCmp('materialAmount').setValue(1); } + Ext.getCmp('handleDepart').setValue(result.data.handleDepart); + Ext.getCmp('handleDepartCoding').setValue(result.data.handleDepartCoding); } }, failure : function(response, options) { @@ -4049,11 +4051,47 @@ disabled : true, value : userName }] + }, { + layout : 'form', + columnWidth : .5, + labelWidth : (recycleQM && top.screen.width > 1280) ? 182 : labelWidthLeft, + height:setH, + items : [{ + xtype : 'textfield', + fieldLabel : "录入科室", + name : "orgUnit", + id : "orgUnit", + disabled:true, + anchor : '95%', + value:currentOrgUnitName + }] },{ + xtype:'hidden', + id:'orgUnitCoding', + name:'orgUnitCoding', + value:currentOrgUnitCoding + },{ + xtype:'hidden', + id:'handleDepartCoding', + name:'handleDepartCoding' + },{ layout : 'form', columnWidth : .5, labelWidth : (recycleQM && top.screen.width > 1280) ? 182 : labelWidthLeft, height:setH, + items:[{ + xtype : 'textfield', + fieldLabel : "处理科室", + name : "handleDepart", + id : "handleDepart", + disabled:true, + anchor : '95%' + }] + },{ + layout : 'form', + columnWidth : .5, + labelWidth : (recycleQM && top.screen.width > 1280) ? 182 : labelWidthLeft, + height:setH, items : [{ xtype : 'textfield', name : 'responsiblePersonBarcode', Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp =================================================================== diff -u -r29513 -r30266 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp (.../qualitymonitoringInstanceView.jsp) (revision 29513) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp (.../qualitymonitoringInstanceView.jsp) (revision 30266) @@ -80,7 +80,9 @@ var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>'; //扫描篮筐允许的篮筐状态集合 var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>'; - +//当前用户所在的当前科室 +var currentOrgUnitCoding = '<%=AcegiHelper.getCurrentOrgUnitCode()%>'; +var currentOrgUnitName = '<%=AcegiHelper.getCurrentOrgUnitName()%>';