Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r15159 -r15256 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15159) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15256) @@ -1164,7 +1164,7 @@ maxLength : '16', id : 'applicant', name : 'applicant', - allowBlank : false, + allowBlank : sstsConfig.hiddenForeignProxyPartElement, readOnly : true, anchor : '100%' }] Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r15116 -r15256 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 15116) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 15256) @@ -40,6 +40,7 @@ } request.setAttribute("toussePriceFluctuation",toussePriceFluctuation); request.setAttribute("userName",userData.getUserFullName()); + request.setAttribute("isSupplyRoomUser",supplyRoomConfigManager.isSupplyRoomUser2(userData)); boolean isBeApplication = userData.isBeApplication(); request.setAttribute("isBeApplication",isBeApplication); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); @@ -134,6 +135,7 @@ var unPrint = '<%=InvoicePlan.PRINT_STATUS_UNPRINT%>'; var isCssdUser = '<%=request.getAttribute("isCssdUser")%>'; +var isSupplyRoomUser = ${isSupplyRoomUser}; //因为申请单有version2版本,全部申请单和科室申领引用同一个js,因此要加入这个listType来区分面前页面是科室申领还是全部申请单 var listType = '<%=request.getAttribute("listType")%>'; var sortFieldStr = 'committedStatus ASC, po.orderByFiled ASC, po.applicationTime'; Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js =================================================================== diff -u -r14320 -r15256 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js (.../foreignProxyDisinfectionForm.js) (revision 14320) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js (.../foreignProxyDisinfectionForm.js) (revision 15256) @@ -393,6 +393,33 @@ } }]); + function getApplicantCfg(){ + var cid = 'applicant'; + if(isSupplyRoomUser){ + cid = 'applicant'; + }else{ + cid = 'maker'; + } + var cfg = { + columnWidth : .5, + layout : 'form', + labelWidth : 70, + items : [{ + xtype : 'textfield', + fieldLabel : '申请人', + maxLength : '16', + anchor : '100%', + id : cid, + name : cid, + allowBlank : false, + value : $Id('userName').value, + readOnly : true, + fieldCls : 'fieldReadOnlyNoRemoveAndTop' + }] + } + return cfg + + } var form = new top.Ext.FormPanel( { id : 'proxyDisinfectionForm', frame : true, @@ -543,27 +570,11 @@ } } ] - },{ + },getApplicantCfg(),{ columnWidth : .5, layout : 'form', labelWidth : 70, items : [{ - xtype : 'textfield', - fieldLabel : '申请人', - maxLength : '16', - anchor : '100%', - id : 'applicant', - name : 'applicant', - allowBlank : false, - value : $Id('userName').value, - readOnly : true, - fieldCls : 'fieldReadOnlyNoRemoveAndTop' - }] - },{ - columnWidth : .5, - layout : 'form', - labelWidth : 70, - items : [{ xtype : 'datefieldWithMin', fieldLabel : '申请时间', id : 'applicationTimeStr',