Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r14343 -r14720 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 14343) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 14720) @@ -18,6 +18,17 @@ hiddenEndBarcode = false;//显示尾篮筐 } +//大小属性的下拉选项 +var packageSizeArray = [['超大包'],['大包'],['中包'],['小包']]; +if(sstsConfig.pageSizeArrayConfig && sstsConfig.pageSizeArrayConfig.length > 0){ + packageSizeArray = sstsConfig.pageSizeArrayConfig; +} +//默认的大小选项 +var defaultPackageSize = '大包'; +if(sstsConfig.defaultPackageSize){ + defaultPackageSize = sstsConfig.defaultPackageSize; +} + var isLastRow = false;//记录当前编辑的行是否是最后一行 //删除视频 function deleteVideo(id,uuid_vedioNames){ @@ -919,7 +930,7 @@ displayField : 'value', store : new Ext.data.SimpleStore( { fields : [ 'value'], - data : [['超大包'],['大包'],['中包'],['小包']] + data : packageSizeArray }), forceSelection : true, mode : 'local', @@ -1549,6 +1560,50 @@ anchor : '100%' }] },{ + columnWidth : .25, + layout : 'form', + items:[{ + xtype : 'combo', + fieldLabel : '是否有植入物', + id : 'includeImplantStr', + name : 'includeImplantStr', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore( { + fields : ['value'], + data : [['是'],['否']] + }), + editable : false, + forceSelection : true, + //allowBlank : false, + value : '否', + mode : 'local', + triggerAction : 'all', + anchor : '100%' + }] + },{ + columnWidth : .25, + layout : 'form', + items:[{ + xtype : 'combo', + fieldLabel : '是否多层盒装', + id : 'moreBoxPacked', + name : 'moreBoxPacked', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore( { + fields : [ 'value'], + data : [['是'],['否']] + }), + editable : false, + forceSelection : true, + //allowBlank : false, + value : '否', + mode : 'local', + triggerAction : 'all', + anchor : '100%' + }] + },{ columnWidth : .7, layout : 'form', id : 'videoPanel', @@ -1733,7 +1788,7 @@ if(id == 0){ taskGroupJsonStore.load(); packTypeStore.load(); - top.Ext.getCmp('packageSize').setValue('大包'); + top.Ext.getCmp('packageSize').setValue(defaultPackageSize); top.Ext.getCmp('isCleanedEntirely').setValue('是'); @@ -1761,7 +1816,7 @@ packTypeStore.load(); //大小及是否整包清洗之前未选择过时,才赋初始值 if(top.Ext.getCmp('packageSize') && top.Ext.getCmp('packageSize').getValue() == ''){ - top.Ext.getCmp('packageSize').setValue('大包'); + top.Ext.getCmp('packageSize').setValue(defaultPackageSize); } if(top.Ext.getCmp('isCleanedEntirely') && top.Ext.getCmp('isCleanedEntirely').getValue() == ''){ top.Ext.getCmp('isCleanedEntirely').setValue('是'); @@ -1820,6 +1875,9 @@ setIdCardPaperType2(); var tousseDefinition = action.result.data; top.Ext.getCmp("orginalName").setValue(tousseDefinition.name); + /*if(tousseDefinition){ + top.Ext.getCmp("includeImplantStr").setValue(''); + }*/ if(hasVideo){ var videoName = tousseDefinition.uuid_vedioNames; if(videoName!=null){ Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r14519 -r14720 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 14519) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 14720) @@ -99,6 +99,11 @@ public static final int INCLUDE_IMPLANT = 0;// 包含植入物 public static final int UNINCLUDE_IMPLANT = 1;// 不包含植入物 + + /** + * 是否包含植入物(值为是或否) + */ + private String includeImplantStr = Constants.STR_NO; public static final String PACKAGE_TYPE_INSIDE = "器械包"; public static final String PACKAGE_TYPE_INSIDE_AND_DISINFECTION = "器械包与消毒物品";//器械包(含敷料包和消毒物品) @@ -230,6 +235,11 @@ */ private String autoOutStockForPacking = STR_NO; + /** + * 是否多层盒装 + */ + private String moreBoxPacked; + @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { @@ -1023,6 +1033,31 @@ } @Transient + public String getIncludeImplantStr() { + if(includeImplant == INCLUDE_IMPLANT){ + return STR_YES; + } + return STR_NO; + } + + public void setIncludeImplantStr(String includeImplantStr) { + this.includeImplantStr = includeImplantStr; + if(Constants.STR_YES.equals(includeImplantStr)){ + setIncludeImplant(INCLUDE_IMPLANT); + }else{ + setIncludeImplant(UNINCLUDE_IMPLANT); + } + } + + public String getMoreBoxPacked() { + return moreBoxPacked; + } + + public void setMoreBoxPacked(String moreBoxPacked) { + this.moreBoxPacked = moreBoxPacked; + } + + @Transient public boolean isRestrictAmountGoods(){ if(this.intoBasketMaxAmount != null && this.intoBasketMaxAmount > 0){ return true; Index: ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js =================================================================== diff -u -r14249 -r14720 --- ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js (.../config.js) (revision 14249) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js (.../config.js) (revision 14720) @@ -55,5 +55,8 @@ //金额的小数位数 moneyDigitCount:4, //隐藏档案管理 - hideStaffArchive : false + hideStaffArchive : false, + //器械包定义的大小下拉框选项配置及默认大小 + pageSizeArrayConfig : [['标准包'],['超大包'],['超重包'],['超大超重包']], + defaultPackageSize : '标准包' } \ No newline at end of file