Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r36031 -r36142 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 36031) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 36142) @@ -892,6 +892,10 @@ costPriceHidden = true; } } + var isSterileData = [['是'], ['否']]; + if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){ + isSterileData = [['是'], ['否'], ['可选']]; + } var colWidth = 0.33; formObj = new top.Ext.FormPanel({ id: 'tousseDefinitionForm', @@ -1017,6 +1021,9 @@ top.Ext.getCmp('isSterile').disable(); //禁用“是否灭菌”下拉框，并默认赋值为“是” top.Ext.getCmp('isSterile').setValue('是'); + top.Ext.getCmp('sterilizationPriceBox').hide(); + top.Ext.getCmp('secondDisinfectionPriceBox').hide(); + top.Ext.getCmp('isRecycling').enable(); //启用“是否回收”下拉框，并默认赋值为“是” top.Ext.getCmp('isInvoice').enable(); //启用“是否发货”下拉框，并默认赋值为“是” top.Ext.getCmp('autoOutStockForPacking').enable(); //启用“自动扣包内材料”下拉框 @@ -1046,6 +1053,9 @@ top.Ext.getCmp('isSterile').enable(); //启用“是否灭菌”下拉框，并默认赋值为“否” top.Ext.getCmp('isSterile').setValue('否'); + top.Ext.getCmp('sterilizationPriceBox').hide(); + top.Ext.getCmp('secondDisinfectionPriceBox').hide(); + top.Ext.getCmp('sterilingMethod').setValue('无'); //默认灭菌程序设为“无” top.Ext.getCmp('isInvoice').disable(); //禁用“是否发货”下拉框，并默认赋值为“是” @@ -1316,6 +1326,36 @@ }, { columnWidth: colWidth, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", + id:'sterilizationPriceBox', + items: [{ + xtype: 'numberfield', + fieldLabel: "灭菌价格", + allowBlank: true, + allowNegative: false, + name: 'sterilizationPrice', + id: 'sterilizationPrice', + anchor: '100%' + }] + }, { + columnWidth: colWidth, + layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", + id:'secondDisinfectionPriceBox', + items: [{ + xtype: 'numberfield', + fieldLabel: "二次消毒价格", + allowBlank: true, + allowNegative: false, + name: 'secondDisinfectionPrice', + id: 'secondDisinfectionPrice', + anchor: '100%' + }] + }, { + columnWidth: colWidth, + layout: 'form', hidden: !sstsConfig.enableDiscountPrice, items: [{ xtype: 'numberfield', @@ -1774,14 +1814,24 @@ displayField: 'value', store: new Ext.data.SimpleStore({ fields: ['value'], - data: [['是'], ['否']] + data: isSterileData }), editable: false, forceSelection: true, mode: 'local', triggerAction: 'all', - anchor: '100%' - + anchor: '100%', + listeners:{ + select: function (combo, record, index) { + if (combo.getRawValue() == '可选') { + top.Ext.getCmp('sterilizationPriceBox').show(); + top.Ext.getCmp('secondDisinfectionPriceBox').show(); + } else { + top.Ext.getCmp('sterilizationPriceBox').hide(); + top.Ext.getCmp('secondDisinfectionPriceBox').hide(); + } + } + } }] }, { columnWidth: colWidth, @@ -3199,6 +3249,15 @@ if (tousseDefinition.printBOMwhenPrintLabel == '') { top.Ext.getCmp('printBOMwhenPrintLabel').setValue('否'); } + if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){ + if(tousseDefinition.isSterile !== '可选'){ + top.Ext.getCmp('sterilizationPriceBox').hide(); + top.Ext.getCmp('secondDisinfectionPriceBox').hide(); + } + }else { + top.Ext.getCmp('sterilizationPriceBox').hide(); + top.Ext.getCmp('secondDisinfectionPriceBox').hide(); + } } }); } else { @@ -3207,6 +3266,8 @@ top.Ext.getCmp('isApplyEntireTousse').setValue('是'); top.Ext.getCmp('isSterile').disable(); //禁用“是否灭菌”下拉框，并默认赋值为“是” top.Ext.getCmp('isSterile').setValue('是'); + top.Ext.getCmp('sterilizationPriceBox').hide(); + top.Ext.getCmp('secondDisinfectionPriceBox').hide(); } } Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js =================================================================== diff -u -r35348 -r36142 --- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js (.../config.js) (revision 35348) +++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js (.../config.js) (revision 36142) @@ -206,6 +206,8 @@ enableSurgicalInstrumentsManagement: true, //启用数据实时看板功能 enableRealTimeDashboardsForDataFunction:true, + //启用消毒物品灵活计算价格的功能 + enableFlexiblePriceCalculationOfDisinfectionGoodsFunction:true, //启用明细核算月报的扩展查询项 enableExtendedQueryItemsOfDetailedAccountingMonthlyReport:["urgentLevel"] } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r36132 -r36142 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36132) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36142) @@ -1309,6 +1309,7 @@ width: 150, align: 'center', sortable: true, + dataIndex: 'expectUseTimeStr', hidden: !(sstsConfig.enableUrgentFunction && sstsConfig.enableExtendedInformationOfUrgentFunction && sstsConfig.recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode), renderer: function (value, metaData, record, rowIdx, colIdx, store) { if (record.data.urgentAdditionalInfo && record.data.urgentAdditionalInfo !== '') { @@ -1325,6 +1326,7 @@ width: 90, align: 'center', sortable: true, + dataIndex: 'urgentContactFullName', hidden: !(sstsConfig.enableUrgentFunction && sstsConfig.enableExtendedInformationOfUrgentFunction && sstsConfig.recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode), renderer: function (value, metaData, record, rowIdx, colIdx, store) { if (record.data.urgentAdditionalInfo && record.data.urgentAdditionalInfo !== '') { @@ -2490,6 +2492,48 @@ allowBlank: true, labelAlign: 'right' }, { + columnWidth: .5, + xtype : 'combo', + hidden: !sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction, + fieldLabel : '消毒物品灭菌', + id: 'sterilizedThisTime', + name: 'sterilizedThisTime', + componentCls: 'formItemMgn', + labelAlign: 'right', + editable : false, + forceSelection : true, + valueField: 'value', + displayField: 'text', + mode : 'local', + triggerAction : 'all', + allowBlank: true, + store : new Ext4.data.SimpleStore({ + data:[['本次灭菌',true],['本次不灭菌',false]], + fields: ['text','value'] + }), + value:false + }, { + columnWidth: .5, + xtype : 'combo', + hidden: !sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction, + fieldLabel : '是否二次消毒', + id: 'secondaryDisinfection', + name: 'secondaryDisinfection', + componentCls: 'formItemMgn', + labelAlign: 'right', + editable : false, + forceSelection : true, + valueField: 'value', + displayField: 'text', + mode : 'local', + triggerAction : 'all', + allowBlank: true, + store : new Ext4.data.SimpleStore({ + data:[['是',true],['否',false]], + fields: ['text','value'] + }), + value:false + }, { xtype: 'hidden', id: 'errorDamageRemarkId', name: 'errorDamageRemarkId' @@ -4662,6 +4706,8 @@ return false; } var tousseWeight = Ext4.getCmp('tousseWeight').getValue(); + var sterilizedThisTime = Ext4.getCmp('sterilizedThisTime').getValue(); + var secondaryDisinfection = Ext4.getCmp('secondaryDisinfection').getValue(); //是否消毒物品 var validatepass = true; DWREngine.setAsync(false); @@ -4754,6 +4800,8 @@ urgentAmount: urgentAmount, tousseWeight: tousseWeight, remark: remark, + sterilizedThisTime:sterilizedThisTime, + secondaryDisinfection:secondaryDisinfection, errorDamageRemarkInfo: errorDamageRemarkInfo, taskIdToAmountMapInfo: taskIdToAmountMapInfo, noUserFormSterilizationInfo: noUserFormSterilizationInfo,