Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r28917 -r28954 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 28917) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 28954) @@ -1565,7 +1565,7 @@ * 《科室申领模版》菜单 */ var SSTS_departMentApplication = true; - + SSTS_departMentApplication = false; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js =================================================================== diff -u -r28948 -r28954 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js (.../departmentAppTemplateForm.js) (revision 28948) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js (.../departmentAppTemplateForm.js) (revision 28954) @@ -1,6 +1,7 @@ var id; var formObj; var sterilizerWin; +var windowH = document.body.offsetHeight + 200; function removeGridItem(gridName){ var configGrid = top.Ext.getCmp(gridName); @@ -14,7 +15,7 @@ var templateTypeStore = new Ext.data.SimpleStore( { fields : [ 'value' ], - data : [ [ "一次性物品模板" ], [ "治疗包模板" ],[ "散件器械模板" ] ] + data : [ [ "一次性物品模板" ], [ "治疗包模板" ],[ "散件器械模板" ] ,[ "通用模板" ]] }); @@ -209,12 +210,13 @@ dataIndex : 'id' },{ id : 'departName', - header : "科室名称", + header : "使用科室", width:240, dataIndex : 'departName' },{ id : 'deleteItem', header:'删除操作', + hidden:SSTS_departMentApplication_ManageAll, renderer: function(v,p,record){ var str = ""; return str; @@ -374,7 +376,6 @@ bodyStyle : 'padding:5px 5px 0px 5px', labelAlign:'right', labelWidth : 80, - autoHeight:true, autoScroll : true, items : [{ xtype : 'hidden', @@ -390,51 +391,71 @@ columnWidth : 1, items:[{ layout : 'form', - columnWidth : .25, - labelWidth : 70, + columnWidth : .3, + labelWidth : 100, + height:26, items : [{ - xtype : 'textfield', - fieldLabel : "模板名称", - allowBlank : false, - name : 'title', - id : 'title', - width : 280 - }] + xtype : 'textfield', + fieldLabel : "模板名称", + allowBlank : false, + name : 'title', + id : 'title', + width : 280 + }] },{ layout : 'form', - columnWidth : .2, - labelWidth : 50, + columnWidth : .3, + labelWidth : 100, + height:26, items : [{ - xtype : 'textfield', - fieldLabel : "时间", - allowBlank : false, - name : 'operationTime', - id : 'operationTime', - width : 150, - value:today, - renderer:myDateFormatByMinute, - readOnly:true, - cls:'fieldReadOnlyNoRemove' - }] + xtype : 'textfield', + fieldLabel : "时间", + allowBlank : false, + name : 'operationTime', + id : 'operationTime', + width : 150, + value:today, + renderer:myDateFormatByMinute, + readOnly:true, + cls:'fieldReadOnlyNoRemove' + }] },{ layout : 'form', - columnWidth : .15, - labelWidth : 50, + columnWidth : .3, + labelWidth : 100, + height:26, items : [{ - xtype : 'textfield', - fieldLabel : "操作人", - allowBlank : false, - name : 'operator', - id : 'operator', - width : 100, - value:userName, - readOnly:true, - cls:'fieldReadOnlyNoRemove' - }] + xtype : 'textfield', + fieldLabel : "操作人", + allowBlank : false, + name : 'operator', + id : 'operator', + width : 100, + value:userName, + readOnly:true, + cls:'fieldReadOnlyNoRemove' + }] + },{ + layout : 'form', + columnWidth : .3, + labelWidth : 100, + height:26, + items : [{ + xtype : 'textfield', + fieldLabel : "维护科室", + allowBlank : false, + name : 'maintenanceDepartName', + id : 'maintenanceDepartName', + width : 100, + value:departName, + readOnly:true, + cls:'fieldReadOnlyNoRemove' + }] }, { layout : 'form', - columnWidth : .25, - labelWidth : 60, + columnWidth : .3, + labelWidth : 100, + height:26, items : [{ xtype : 'combo', fieldLabel : '模板类型', @@ -444,6 +465,7 @@ valueField : 'value', displayField : 'value', store : templateTypeStore, + value:'通用模板', forceSelection : true, editable : false, allowBlank : false, @@ -453,7 +475,9 @@ }] }, { layout : 'form', - columnWidth : .15, + columnWidth : .3, + labelWidth : 100, + height:26, items : [{ xtype : 'numberfield', fieldLabel : '序号', @@ -538,6 +562,15 @@ top.Ext.getCmp('departName').setValue(""); top.Ext.getCmp('departName').setRawValue(""); } + }, + render:function(){ + var p = new departItem({ + id : departCode, + departName : departName, + isFind:false, + isDisabled:true + }); + departmentStore.add(p); } } },{ @@ -863,7 +896,7 @@ width : 1000, border : false, modal : true, - autoHeight : true, + height : top.screen.height < 864 ? windowH : 730, plain : true, items : [ formObj ] }); @@ -967,65 +1000,22 @@ function validateAndSubmit(){ var departmentIds = getApplicationDepartmentIds();//申请部门 - Ext.Ajax.request({ - url : WWWROOT + '/disinfectSystem/baseData/departmentAppTemplateAction!validate.do', - params : {validateId : top.Ext.getCmp('id').getValue(),valifateName:top.Ext.getCmp('title').getValue(),departmentIds:departmentIds}, - success : function(response, options) { - var result = Ext.decode(response.responseText); - if(result.stauts==1){ - var tousseIds = getApplicationTousseIds();//申请的器械包 - var diposableGoodsIds = getApplicationDiposableGoodsIds();//申请的一次性物品 - formObj.form.submit( { - url : WWWROOT + '/disinfectSystem/baseData/departmentAppTemplateAction!saveAppTemplate.do', - params : {departmentIds :departmentIds,tousseIds:tousseIds,diposableGoodsIds:diposableGoodsIds}, - method : 'POST', - waitMsg : '正在保存数据，请稍候', - waitTitle : '提交表单', - success : function(form, action) { - sterilizerWin.close(); - showResult('保存成功'); - grid.dwrReload(); - },failure : function(form, action) { - showResult(action.result.message); - top.Ext.getCmp('saveBtn').enable(); - top.Ext.getCmp('saveAndPrint').enable(); - } - }); - }else{//有旧模板 - /*if(result.departCoding != null && result.departCoding.length > 0){ - top.Ext.MessageBox.confirm("请确认",result.message + "是否确定要覆盖？",function(button, text) { - if ("yes" == button){ - var tousseIds = getApplicationTousseIds();//申请的器械包 - var diposableGoodsIds = getApplicationDiposableGoodsIds();//申请的一次性物品 - formObj.form.submit( { - url : WWWROOT + '/disinfectSystem/baseData/departmentAppTemplateAction!saveAppTemplate.do', - params : {departmentIds :departmentIds,tousseIds:tousseIds,diposableGoodsIds:diposableGoodsIds,replaceDepart:result.departCoding}, - method : 'POST', - waitMsg : '正在保存数据，请稍候', - waitTitle : '提交表单', - success : function(form, action) { - sterilizerWin.close(); - showResult('保存成功'); - grid.dwrReload(); - },failure : function(form, action) { - showResult(action.result.message); - top.Ext.getCmp('saveBtn').enable(); - top.Ext.getCmp('saveAndPrint').enable(); - } - }); - }else{ - top.Ext.getCmp('saveBtn').enable(); - } - }); - }else{*/ - showResult(result.message); - top.Ext.getCmp('saveBtn').enable(); -// } - } - }, - failure : function(response, options) { - var result = Ext.decode(response.responseText); - showResult(result.cause); + var tousseIds = getApplicationTousseIds();//申请的器械包 + var diposableGoodsIds = getApplicationDiposableGoodsIds();//申请的一次性物品 + formObj.form.submit( { + url : WWWROOT + '/disinfectSystem/baseData/departmentAppTemplateAction!saveAppTemplate.do', + params : {departmentIds :departmentIds,tousseIds:tousseIds,diposableGoodsIds:diposableGoodsIds}, + method : 'POST', + waitMsg : '正在保存数据，请稍候', + waitTitle : '提交表单', + success : function(form, action) { + sterilizerWin.close(); + showResult('保存成功'); + grid.dwrReload(); + },failure : function(form, action) { + showResult(action.result.message); + top.Ext.getCmp('saveBtn').enable(); + top.Ext.getCmp('saveAndPrint').enable(); } }); } Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.js =================================================================== diff -u -r21546 -r28954 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.js (.../departmentAppTemplateView.js) (revision 21546) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.js (.../departmentAppTemplateView.js) (revision 28954) @@ -123,6 +123,11 @@ width:240, dataIndex : 'operator' },{ + id : 'maintenanceDepartName', + header : "维护科室", + width:300, + dataIndex : 'maintenanceDepartName' + },{ id : 'operationTime', header : "时间", width:240, @@ -148,7 +153,9 @@ {name : 'title'}, {name : 'operator'}, {name : 'operationTime'}, - {name : 'sequence'} + {name : 'sequence'}, + {name : 'maintenanceDepartName'} + ]; var sign = true; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.jsp =================================================================== diff -u -r21546 -r28954 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.jsp (.../departmentAppTemplateView.jsp) (revision 21546) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.jsp (.../departmentAppTemplateView.jsp) (revision 28954) @@ -7,8 +7,8 @@ request.setAttribute("userName",userData.getUserFullName()); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); request.setAttribute("today", dateFormat.format(new Date())); -session.setAttribute("userName",userData.getUserFullName()); -//session.setAttribute("today",dateFormat.format(new Date())); +request.setAttribute("departName",userData.getCurrentOrgUnitName()); +request.setAttribute("departCode",userData.getCurrentOrgUnitCode()); %> @@ -54,6 +54,14 @@ SSTS_departMentApplication_Delete = false; +/** + * 《管理所有科室申领模板》权限 + */ + var SSTS_departMentApplication_ManageAll = true; + + SSTS_departMentApplication_ManageAll = false; + + var enableEditBtn = false; var enableSaveBtn = false; var enableSaveAndNewBtn = false; @@ -65,6 +73,8 @@ var today = '<%=(String)request.getAttribute("today")%>'; var userName = '<%=request.getAttribute("userName")%>'; +var departName = '<%=request.getAttribute("departName")%>'; +var departCode = '<%=request.getAttribute("departCode")%>';