Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r30643 -r30681 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 30643) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 30681) @@ -3270,9 +3270,6 @@ //buttons : [] }); - - - foreignTousseApplyWindow = new top.Ext4.window.Window({ id : 'foreignTousseApplicationWin', title : '外来器械单信息', @@ -3283,7 +3280,7 @@ resizable :false, modal : true, border : false, - plain : true, + plain : false, layout : 'fit', items : [ foreignTousseForm ] }); @@ -3350,26 +3347,24 @@ }); foreignTousseApplyWindow.show(); + if (id) {// 编辑 foreignTousseForm.form.load( { url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!loadForeignTousseApplication.do', method : 'GET', waitMsg : '正在加载数据,请稍候', success : function(form, action) { - if(top.Ext4.getCmp("applicant").getValue() != curUserName && SSTS_ForeignTousseApplication_Update){ + if(!ismodify && top.Ext4.getCmp("applicant").getValue() != curUserName && SSTS_ForeignTousseApplication_Update){ showResult("该申请单只能由申请人修改!"); top.Ext4.getCmp('commitBtn').hide(); top.Ext4.getCmp('commitPrintBtn').hide(); - } - //点击修改按钮并且已经在回收页面打开过,不准修改,隐藏提交按钮 - if(!ismodify && action.result.data.readed == 1 && !sstsConfig.enableModifyForeignTousseApplicationAfterViewedInRecyclingModule){ + }else if(!ismodify && action.result.data.readed == 1 && !sstsConfig.enableModifyForeignTousseApplicationAfterViewedInRecyclingModule){ + //点击修改按钮并且已经在回收页面打开过,不准修改,隐藏提交按钮 showResult("该申请单已经被回收人员查阅,不允许自行修改!"); top.Ext4.getCmp('commitBtn').hide(); top.Ext4.getCmp('commitPrintBtn').hide(); - } - - if(action.result.data.packageStatus !== '待接收'){ + }else if(!ismodify && action.result.data.packageStatus !== '待接收'){ showResult("该申请单已回收,不允许自行修改!"); top.Ext4.getCmp('commitBtn').hide(); top.Ext4.getCmp('commitPrintBtn').hide(); Index: ssts-web/src/main/webapp/ext/fontSize12/styles/common.css =================================================================== diff -u -r30387 -r30681 --- ssts-web/src/main/webapp/ext/fontSize12/styles/common.css (.../common.css) (revision 30387) +++ ssts-web/src/main/webapp/ext/fontSize12/styles/common.css (.../common.css) (revision 30681) @@ -431,4 +431,12 @@ .ext-ie .x-menu { width: auto !important; +} + +#foreignTousseApplicationWin { + z-index: 7500 !important; +} + +.x4-css-shadow { + z-index: 7500 !important; } \ No newline at end of file