Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r33065 -r33653 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 33065) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 33653) @@ -459,7 +459,28 @@ columnWidth : 1, layout : 'form', labelWidth : 110, + hidden:!sstsConfig.enableWheterToChargeFieldOfDisposableGoods, items : [{ + xtype : 'combo', + fieldLabel : '是否收费', + valueField : 'value', + displayField : 'value', + store : yesNoStore, + value: STR_NO, + forceSelection : true, + allowBlank : true, + mode : 'local', + triggerAction : 'all', + value:'是', + name : "whetherToCharge", + id : "whetherToCharge", + anchor : '95%' + }] + },{ + columnWidth : 1, + layout : 'form', + labelWidth : 110, + items : [{ xtype : 'numberfield', fieldLabel : '最小库存', allowDecimals : false, Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js =================================================================== diff -u -r32926 -r33653 --- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js (.../config.js) (revision 32926) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js (.../config.js) (revision 33653) @@ -67,6 +67,8 @@ notAllowBlankFieldsOnUseRecordPage : ["doctorAccountDepart"], //启用使用记录(主刀医生核算科室)报表 enableUseRecordByChiefSurgeonDoctorsAccountingDepartment:true, + //启用一次性物品定义的是否收费字段 + enableWheterToChargeFieldOfDisposableGoods:true, //是否启用加急功能 enableUrgentFunction:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js =================================================================== diff -u -r33491 -r33653 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 33491) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 33653) @@ -91,6 +91,7 @@ if (showBatchValue == '否') { showBatch = false; } + var whetherToCharge = $Id('whetherToCharge').value; if (tousseType == "全部") { tousseType = ""; } @@ -181,6 +182,7 @@ patternOfReport: patternOfReport, goodsNameSearch: goodsSearch, showBatch: showBatch, + whetherToCharge:whetherToCharge, departGroup: departGroupValue, reportName: 'departmentMonthDetail' } @@ -710,6 +712,29 @@ }, { columnWidth: .25, layout: 'form', + labelWidth: 150, + hidden:!sstsConfig.enableWheterToChargeFieldOfDisposableGoods, + items: [{ + xtype: 'combo', + fieldLabel: '一次性物品是否收费', + id: 'whetherToCharge', + name: 'whetherToCharge', + valueField: 'value', + displayField: 'value', + store: new Ext.data.SimpleStore({ + fields: ['value'], + data: [['全部'],['是'], ['否']] + }), + forceSelection: true, + value: '全部', + editable: false, + mode: 'local', + triggerAction: 'all', + anchor: '95%' + }] + }, { + columnWidth: .25, + layout: 'form', labelWidth: 120, id: 'goodsTypeElement', items: [{