Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r27043 -r29024 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 27043) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 29024) @@ -724,6 +724,22 @@ name : 'departCoding', id : 'departCoding' },{ + xtype : 'hidden', + name : 'makerCode', + id : 'makerCode' + },{ + xtype : 'hidden', + name : 'assistantCode', + id : 'assistantCode' + },{ + xtype : 'hidden', + name : 'sterilizationUserCode', + id : 'sterilizationUserCode' + },{ + xtype : 'hidden', + name : 'applicantCode', + id : 'applicantCode' + },{ id:'barcode', columnWidth : .5, layout : 'form', @@ -875,22 +891,28 @@ labelWidth : 70, hidden : sstsConfig.hideCssdForeignProxyDisinfectionApplicant == true, items : [{ - xtype : 'combo', - fieldLabel : sstsConfig.foreignProxyDisinfectionApplicantLabelName ? sstsConfig.foreignProxyDisinfectionApplicantLabelName : '申请人', - id : 'applicant', - name : 'applicant', - queryParam : 'spell', - minChars : 0, - valueField : 'fullName', - displayField : 'fullName', - store : departUsersStore, - forceSelection : true, - lazyInit : true, - triggerAction : 'all', - hideTrigger : false, - typeAhead : false, - allowBlank : sstsConfig.hideCssdForeignProxyDisinfectionApplicant || sstsConfig.foreignProxyDisinfectionViewApplicantAllowBlank, - anchor : '97%' + xtype : 'combo', + fieldLabel : sstsConfig.foreignProxyDisinfectionApplicantLabelName ? sstsConfig.foreignProxyDisinfectionApplicantLabelName : '申请人', + id : 'applicant', + name : 'applicant', + queryParam : 'spell', + minChars : 0, + valueField : 'fullName', + displayField : 'fullName', + store : departUsersStore, + forceSelection : true, + lazyInit : true, + triggerAction : 'all', + hideTrigger : false, + typeAhead : false, + allowBlank : sstsConfig.hideCssdForeignProxyDisinfectionApplicant || sstsConfig.foreignProxyDisinfectionViewApplicantAllowBlank, + anchor : '97%', + listeners:{ + select:function(combo, record, index){ + var code = record.json.name || ''; + top.Ext.getCmp("applicantCode").setValue(code); + } + } }] }/*,{ columnWidth : .5, @@ -932,45 +954,57 @@ labelWidth : 70, hidden : sstsConfig.hideCssdForeignProxyDisinfectionMaker == true, items : [{ - xtype : 'combo', - fieldLabel : '制作者', - id : 'maker', - name : 'maker', - queryParam : 'spell', - minChars : 0, - valueField : 'fullName', - displayField : 'fullName', - store : departUsersStore, - forceSelection : true, - lazyInit : true, - triggerAction : 'all', - hideTrigger : false, - typeAhead : false, - allowBlank : true, - anchor : '97%' + xtype : 'combo', + fieldLabel : '制作者', + id : 'maker', + name : 'maker', + queryParam : 'spell', + minChars : 0, + valueField : 'fullName', + displayField : 'fullName', + store : departUsersStore, + forceSelection : true, + lazyInit : true, + triggerAction : 'all', + hideTrigger : false, + typeAhead : false, + allowBlank : true, + anchor : '97%', + listeners:{ + select:function(combo, record, index){ + var code = record.json.name || ''; + top.Ext.getCmp("makerCode").setValue(code); + } + } }] },{ columnWidth : .5, layout : 'form', labelWidth : 70, hidden : sstsConfig.hiddenForeignProxyPartElement, items : [{ - xtype : 'combo', - fieldLabel : '核对者', - id : 'assistant', - name : 'assistant', - queryParam : 'spell', - minChars : 0, - valueField : 'fullName', - displayField : 'fullName', - store : departUsersStore, - forceSelection : true, - lazyInit : true, - triggerAction : 'all', - hideTrigger : false, - typeAhead : false, - allowBlank : true, - anchor : '97%' + xtype : 'combo', + fieldLabel : '核对者', + id : 'assistant', + name : 'assistant', + queryParam : 'spell', + minChars : 0, + valueField : 'fullName', + displayField : 'fullName', + store : departUsersStore, + forceSelection : true, + lazyInit : true, + triggerAction : 'all', + hideTrigger : false, + typeAhead : false, + allowBlank : true, + anchor : '97%', + listeners:{ + select:function(combo, record, index){ + var code = record.json.name || ''; + top.Ext.getCmp("assistantCode").setValue(code); + } + } }] },/*{ columnWidth : .5, @@ -1317,7 +1351,6 @@ top.Ext.getCmp('saveBtn').enable(); return false; } - //获取grid数据 getEditerGridData(); @@ -1588,7 +1621,11 @@ top.Ext.getCmp('scheduleTimeStr').setValue(formatDateYear(action.result.data.scheduleTime)); top.Ext.getCmp('maker').setValue(action.result.data.maker); top.Ext.getCmp('applicant').setValue(action.result.data.applicant); + top.Ext.getCmp('applicantCode').setValue(action.result.data.applicantCode); top.Ext.getCmp('assistant').setValue(action.result.data.assistant); + top.Ext.getCmp('makerCode').setValue(action.result.data.makerCode); + top.Ext.getCmp('assistantCode').setValue(action.result.data.assistantCode); + top.Ext.getCmp('sterilizationUserCode').setValue(action.result.data.sterilizationUserCode); if(action.result.data.hasPacked == '否'){ gridEditable = true; } @@ -1598,6 +1635,7 @@ top.Ext.getCmp('printBtn').disable(); if(isUndefinedOrNullOrEmpty(action.result.data.sterilizationUser)){ top.Ext.getCmp('sterilizationUser').setValue($Id('userName').value); + top.Ext.getCmp('sterilizationUserCode').setValue($Id('userCode').value); } } }, @@ -1622,6 +1660,7 @@ // top.Ext.getCmp('maker').setValue($Id('userName').value); // } top.Ext.getCmp('sterilizationUser').setValue($Id('userName').value); + top.Ext.getCmp('sterilizationUserCode').setValue($Id('userCode').value); // top.Ext.getCmp('applicationTimeStr').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i')); // top.Ext.getCmp('arrivedTimeStr').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i')); setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'applicationTimeStr'); //(设置申请时间,取服务器时间 cjr) Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp =================================================================== diff -u -r28601 -r29024 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp (.../foreignProxyDisinfectionView.jsp) (revision 28601) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp (.../foreignProxyDisinfectionView.jsp) (revision 29024) @@ -25,7 +25,8 @@ %> <% LoginUserData userData = AcegiHelper.getLoginUser(); - request.setAttribute("userName",userData.getUserFullName()); + request.setAttribute("userName",userData.getUserFullName()); + request.setAttribute("userCode",userData.getUserName()); request.setAttribute("currentOrgUnitName", userData.getCurrentOrgUnitName()); request.setAttribute("isSupplyRoomUser",supplyRoomConfigManager.isSupplyRoomUser(userData)); %> @@ -75,6 +76,7 @@ var hospitalName = '<%=request.getAttribute("hospitalName")%>'; var curUserName = '${userName}'; +var curUserCode = '${userCode}'; var currentOrgUnitName = '${currentOrgUnitName}'; var isSupplyRoomUser = ${isSupplyRoomUser}; @@ -127,6 +129,7 @@
+