选择用户

- <% - if(list.size()>0){ - for(PrintConfig pc : list){ - %> - <%=pc.getShift()%> - <% - } - } - %> +

+ +

+ + ${i.shift} + +

\ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r15440 -r15526 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 15440) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 15526) @@ -176,7 +176,7 @@ * 显示各个回收人员，及每个回收人员负责的部门 */ function showSelectUser(){ - return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectUser.jsp?allowNull=false&onlyOneOrg=true&resultType=code&tabType=orgUnit&sameLevel=yes&range=all", "选择回收员", "760", "400"); + return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectUser.jsp?allowNull=false&onlyOneOrg=true&resultType=code&tabType=orgUnit&sameLevel=yes&range=all", "选择回收员", "1000", "750"); } function sumTotal(store){ if(store.getCount()!=0){ Index: ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js =================================================================== diff -u -r12331 -r15526 --- ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js (.../printRecyclingConfigForm2.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js (.../printRecyclingConfigForm2.js) (revision 15526) @@ -1,6 +1,42 @@ var configWin; var formPanel; + +/** + * 获得班次下拉框 + */ +function getShiftCombo() { + //定义班次的model + Ext4.define('shiftModel', { + extend: 'Ext.data.Model', + fields: [ + {name: 'id', type: 'string'}, + {name: 'optionText', type: 'string'} + ] + }); + //定义班次的数据源 + var storeConfig = { + model: 'shiftModel', + url : WWWROOT + "/disinfectSystem/printRecyclingConfigAction!loadShiftType.do?listId=shiftType", + autoLoad : false + } + //定义班次下拉框的相关信息 + var comboConfig = { + valueField : 'optionText', + displayField : 'optionText', + fieldLabel : '班次类型', + id : 'shiftType', + name: 'shiftType' + }; + var comboBuilder = ext4CompUtil.getComboBuilder(); + var shiftTypeCombo = comboBuilder.createCombo({ + storeConfig:storeConfig, + comboConfig:comboConfig + }); + return shiftTypeCombo; +} + + function cancel() { configWin.close(); } @@ -58,7 +94,8 @@ Ext4.ComponentQuery.query("#configForm #departCodes")[0].setValue(result.data.departCodes); Ext4.ComponentQuery.query("#configForm #departNames")[0].setValue(result.data.departNames); - + Ext4.ComponentQuery.query("#configForm #shiftType")[0].setRawValue(result.data.shiftType); + Ext4.getCmp('printConfig2').setValue(result.data.printConfig2); initPrintConfig2Grid(); @@ -462,12 +499,13 @@ layout : 'form', items : [{ xtype : 'textfield', - fieldLabel : '班次', + fieldLabel : '班次名称', id : 'shift', name : 'shift', allowBlank : false, anchor : '98%' - },{ + }, + { xtype : 'combo', fieldLabel : '同科室的多张申请单合并打印', id : 'isAppMergePrint', @@ -484,6 +522,7 @@ triggerAction : 'all', anchor : '98%' }, + getShiftCombo(), { xtype : 'textarea', fieldLabel : '科室', Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r15493 -r15526 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 15493) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 15526) @@ -507,6 +507,7 @@ hidden :SSTS_BaseData_Manager, children:[ {hidden :SSTS_departMentApplication_Serch,text:"科室申领模版",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ShiftConfig,text:"班次类型配置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=shiftType&optionName=班次参数设置',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecyclePrint_Menu || (printRecyclingConfigFormVersion!=1),text:"打印发货计划设置",href:WWWROOT+'/disinfectsystem/printRecyclingConfig/printRecyclingConfigView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecyclePrint_Menu || (printRecyclingConfigFormVersion!=2),text:"打印发货计划设置",href:WWWROOT+'/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecyclePrint_Menu,text:"打印发货单设置",href:WWWROOT+'/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r15481 -r15526 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 15481) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 15526) @@ -985,8 +985,16 @@ var SSTS_GoodsBindingConfig = true; SSTS_GoodsBindingConfig = false; -var SSTS_BaseData_Manager = SSTS_ImportBaseData &&SSTS_Qualitymonitoring &&SSTS_QualityItem &&SSTS_SerialNumber && SSTS_SupplyRoomType&&SSTS_Expiration && SSTS_Sterilizer && SSTS_Sterilisation &&SSTS_Rinser && SSTS_CleanMethod&&SSTS_Supplier &&SSTS_TaskGroup && SSTS_DiposableGoodsType && SSTS_PackType&& SSTS_ProjectName && SSTS_Operation && SSTS_Container &&SSTS_Material; + +var SSTS_ShiftConfig = true; + +SSTS_ShiftConfig = false; + + +var SSTS_BaseData_Manager = SSTS_ImportBaseData &&SSTS_Qualitymonitoring &&SSTS_QualityItem &&SSTS_SerialNumber && SSTS_SupplyRoomType&&SSTS_Expiration && SSTS_Sterilizer && SSTS_Sterilisation &&SSTS_Rinser && SSTS_CleanMethod&&SSTS_Supplier &&SSTS_TaskGroup && SSTS_DiposableGoodsType && SSTS_PackType&& SSTS_ProjectName && SSTS_Operation && SSTS_Container &&SSTS_Material; + + \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printRecyclingApplicationConfig/PrintConfig.java =================================================================== diff -u -r12331 -r15526 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printRecyclingApplicationConfig/PrintConfig.java (.../PrintConfig.java) (revision 12331) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printRecyclingApplicationConfig/PrintConfig.java (.../PrintConfig.java) (revision 15526) @@ -47,6 +47,11 @@ private Integer orderNum; private String printConfig2; + + /** + * 班次类型 + */ + private String shiftType; @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -143,5 +148,12 @@ public void setPrintConfig2(String printConfig2) { this.printConfig2 = printConfig2; } - + + public String getShiftType() { + return shiftType; + } + + public void setShiftType(String shiftType) { + this.shiftType = shiftType; + } } Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r15481 -r15526 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 15481) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 15526) @@ -471,6 +471,8 @@ + + Index: ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.js =================================================================== diff -u -r12331 -r15526 --- ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.js (.../printRecyclingConfigView.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.js (.../printRecyclingConfigView.js) (revision 15526) @@ -34,8 +34,9 @@ var columns = [ {header : "标识号",dataIndex : 'id',hidden :true}, - {header : "班次",dataIndex : 'shift',width : 150, renderer : modifyRecord}, + {header : "班次名称",dataIndex : 'shift',width : 150, renderer : modifyRecord}, {header : "同科室的多张申请单合并打印",dataIndex : 'isAppMergePrint',width : 170}, + {header : "班次类型",dataIndex : 'shiftType',width : 100}, {id : 'departNames',header : "科室名称",dataIndex : 'departNames'}, {header : "排序操作",dataIndex : 'orderNum', renderer : moveUpDown, sortable: false, menuDisabled: true}, {header : "科室代码",dataIndex : 'departCodes',hidden : true} @@ -54,6 +55,7 @@ {name : 'disinfectGoodsPrintMode'}, {name : 'departNames'}, {name : 'departCodes'}, + {name : 'shiftType'}, {name : 'orderNum'} ]; Index: ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.jsp =================================================================== diff -u -r12331 -r15526 --- ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.jsp (.../printRecyclingConfigView.jsp) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.jsp (.../printRecyclingConfigView.jsp) (revision 15526) @@ -21,8 +21,9 @@ - - + + + Index: ssts-print/src/main/java/com/forgon/disinfectsystem/printRecyclingApplicationConfig/action/PrintConfigAction.java =================================================================== diff -u -r14631 -r15526 --- ssts-print/src/main/java/com/forgon/disinfectsystem/printRecyclingApplicationConfig/action/PrintConfigAction.java (.../PrintConfigAction.java) (revision 14631) +++ ssts-print/src/main/java/com/forgon/disinfectsystem/printRecyclingApplicationConfig/action/PrintConfigAction.java (.../PrintConfigAction.java) (revision 15526) @@ -1,21 +1,23 @@ package com.forgon.disinfectsystem.printRecyclingApplicationConfig.action; -import java.util.HashMap; -import java.util.Map; - -import net.sf.json.JSONObject; - -import org.apache.commons.lang.StringUtils; -import org.apache.struts2.convention.annotation.Action; -import org.apache.struts2.convention.annotation.Namespace; -import org.apache.struts2.convention.annotation.ParentPackage; - +import com.beust.jcommander.ParameterException; import com.forgon.disinfectsystem.entity.printRecyclingApplicationConfig.PrintConfig; import com.forgon.disinfectsystem.printRecyclingApplicationConfig.service.PrintConfigManager; +import com.forgon.systemsetting.model.HttpOption; +import com.forgon.systemsetting.service.HttpOptionManager; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; +import net.sf.json.JSONObject; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.Namespace; +import org.apache.struts2.convention.annotation.ParentPackage; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @ParentPackage(value = "default") @@ -25,7 +27,13 @@ private PrintConfig printConfig; private PrintConfigManager printConfigManager; - + + private HttpOptionManager httpOptionManager; + + public void setHttpOptionManager(HttpOptionManager httpOptionManager) { + this.httpOptionManager = httpOptionManager; + } + public PrintConfig getPrintConfig() { return printConfig; } @@ -109,4 +117,19 @@ printConfig = new PrintConfig(); } } + + /** + * 读取班次类型 + */ + public void loadShiftType(){ + String listId = StrutsParamUtils.getPraramValue("listId", ""); + List list = httpOptionManager.getHttpOptionListById(listId); + JSONObject jsonObject = new JSONObject(); + if (CollectionUtils.isEmpty(list)){ + StrutsResponseUtils.output(false); + throw new ParameterException("查找不到对应的班次类型"); + } + jsonObject.put("data", list); + StrutsResponseUtils.output(jsonObject); + } }