Index: ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/config.js =================================================================== diff -u -r33153 -r34492 --- ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/config.js (.../config.js) (revision 33153) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/config.js (.../config.js) (revision 34492) @@ -149,5 +149,9 @@ //是否显示设备接口菜单 disableDeviceInterface:true, //是否显示辅助发货按钮 - showAuxiliaryInvoiceBtn:true + showAuxiliaryInvoiceBtn:true, + //启用器械包定义的积分系数字段 + enableIntegralOfTousseDefinition:true, + //启用消毒供应中心员工绩效评分表按照包定义的积分系数字段评分 + enableScoreByIntegralFieldOfTousseDefinitionInStaffStatisticalWorkloadReport:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js =================================================================== diff -u -r34154 -r34492 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js (.../tousseBatchModify.js) (revision 34154) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js (.../tousseBatchModify.js) (revision 34492) @@ -419,6 +419,21 @@ anchor : '100%', listeners : {} }] + }, { + columnWidth: colWidth, + layout: 'form', + labelWidth: fontSize == 12 ? 90 : 120, + hidden: !sstsConfig.enableIntegralOfTousseDefinition, + labelAlign: "right", + items: [{ + xtype: 'numberfield', + fieldLabel: "积分系数", + allowBlank: true, + allowNegative: true, + name: 'integral', + id: 'integral', + anchor: '100%' + }] },{ columnWidth: 1, layout: 'form', @@ -562,6 +577,7 @@ var isConvertApplyGoods = top.Ext.getCmp('batchEdit_isConvertApplyGoods').getValue(); //转换申请物品 var belongOrgUnitCodes = top.Ext.getCmp('belongOrgUnitCodes').getValue(); //所属科室 var belongDepartNames = top.Ext.getCmp('belongDepartNames').getValue(); //所属科室名称 + var integral = top.Ext.getCmp('integral').getValue(); if(belongDepartNames.length > 500){ belongDepartNames = belongDepartNames.substring(0, 500) + '......'; } @@ -616,8 +632,11 @@ if (!isUndefinedOrNullOrEmpty(instrumentSetTypeName)) { message += "所属种类:(" + instrumentSetTypeName + ");"; } + if (!isUndefinedOrNullOrEmpty(integral) && sstsConfig.enableIntegralOfTousseDefinition) { + message += "积分系数:(" + integral + ");"; + } //创建对象 - var needBatchModify = new NeedBatchModify(tousseDefinitionIDs, price, borrowPrice, packageSize, isDisable,packageType,taskGroup,barcodePaperType,sterilingMethod,tousseGroupName,tousseGroupID,isRecycling,isPacking,isReview,isConvertApplyGoods,belongOrgUnitCodes,instrumentSetTypeIds); + var needBatchModify = new NeedBatchModify(tousseDefinitionIDs, price, borrowPrice, packageSize, isDisable,packageType,taskGroup,barcodePaperType,sterilingMethod,tousseGroupName,tousseGroupID,isRecycling,isPacking,isReview,isConvertApplyGoods,belongOrgUnitCodes,instrumentSetTypeIds,integral); top.Ext.MessageBox.confirm("请确认", message,function (button, text) { if ("yes" == button) { submintNeedBatchModify(needBatchModify); @@ -711,7 +730,7 @@ flushProgress(); } -function NeedBatchModify(tousseDefinitionIds, price, borrowPrice, packageSize, isDisable,packageType,taskGroup,barcodePaperType,sterilingMethod,tousseGroupName,tousseGroupID,isRecycling,isPacking,isReview,isConvertApplyGoods,belongOrgUnitCodes,instrumentSetTypeIds) { +function NeedBatchModify(tousseDefinitionIds, price, borrowPrice, packageSize, isDisable,packageType,taskGroup,barcodePaperType,sterilingMethod,tousseGroupName,tousseGroupID,isRecycling,isPacking,isReview,isConvertApplyGoods,belongOrgUnitCodes,instrumentSetTypeIds,integral) { this.tousseDefinitionIds = tousseDefinitionIds; this.price = price; this.borrowPrice = borrowPrice; @@ -729,6 +748,7 @@ this.isConvertApplyGoods = isConvertApplyGoods; this.belongOrgUnitCodes = belongOrgUnitCodes; this.instrumentSetTypeIds = instrumentSetTypeIds; + this.integral = integral; } Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r34312 -r34492 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 34312) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 34492) @@ -2449,7 +2449,7 @@ layout: 'form', labelWidth: fontSize == 12 ? 90 : 100, labelAlign: "right", - hidden: !sstsConfig.enableToussePointsStatistics, + hidden: !sstsConfig.enableIntegralOfTousseDefinition, items: [{ xtype: 'numberfield', fieldLabel: "积分系数",