Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r34685 -r34688 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 34685) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 34688) @@ -294,7 +294,7 @@ var result = Ext.decode(response.responseText); if (result.length > 0) { top.Ext.getCmp('consumptiveMaterialVolumes').setValue(result.join('|')); - }else { + } else { top.Ext.getCmp('consumptiveMaterialVolumes').setValue(''); } } @@ -4278,7 +4278,7 @@ store: sterilizationPurposeStore, cm: new Ext.grid.ColumnModel([ { header: "名称", width: 100, menuDisabled: true, dataIndex: 'disposableGoodsName' }, - { header: "规格", width: 60, menuDisabled: true, dataIndex: 'cspecificationount' }, + { header: "规格", width: 60, menuDisabled: true, dataIndex: 'specification' }, { header: "批次条码", width: 60, menuDisabled: true, dataIndex: 'batchBarcode' }, { header: "已添加数量", width: 60, menuDisabled: true, dataIndex: 'useAmount' }, { @@ -5790,7 +5790,12 @@ for (var k = 0; k < sterilizationPurposeStore.getCount(); k++) { var item = sterilizationPurposeStore.getAt(k); var disposableGoodsName = item.data.disposableGoodsName; - newArr.push(disposableGoodsName); + var specification = item.data.disposableGoodsName || ''; + var name = disposableGoodsName; + if (specification !== '') { + name += '[' + specification + ']'; + } + newArr.push(name); } var res = getInclude4(newArr, consumptiveMaterialVolumesArr); if (!res) {