Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js =================================================================== diff -u -r13545 -r13997 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js (.../appropriationView.js) (revision 13545) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js (.../appropriationView.js) (revision 13997) @@ -368,13 +368,14 @@ return false; } } + // var cost = top.Ext.getCmp('cost').getValue(); - var expDate = top.Ext.getCmp('expDate').getValue(); - var supplierName = top.Ext.getCmp('supplierName').getValue(); - var sterileBatchNumber = top.Ext.getCmp('sterileBatchNumber').getValue(); - var manufacturer = top.Ext.getCmp('manufacturer').getValue(); - var producingArea = top.Ext.getCmp('producingArea').getValue(); - var certification = top.Ext.getCmp('certification').getValue(); + var expDate = top.Ext.getCmp('ExpensiveExpDate').getValue(); + var supplierName = top.Ext.getCmp('ExpensiveSupplierName').getValue(); + var sterileBatchNumber = top.Ext.getCmp('ExpensiveSterileBatchNumber').getValue(); + var manufacturer = top.Ext.getCmp('ExpensiveManufacturer').getValue(); + var producingArea = top.Ext.getCmp('ExpensiveProducingArea').getValue(); + //var certification = top.Ext.getCmp('certification').getValue(); //添加操作 var godownEntryItem = new GodownEntryItemRecord({ disposableGoodsID: batch.disposableGoodsID, @@ -842,12 +843,40 @@ } }],listeners: { render : function() { - var tbarExpensiveGoods = new top.Ext.Toolbar ({ + var tbarExpensiveGoods = new top.Ext.Toolbar ({ items : [{ xtype : 'hidden', id : 'tempBarcodeHidden', name : 'tempBarcodeHidden' },{ + xtype : 'hidden', + id : 'ExpensiveDisposableGoodsStockID', + name : 'ExpensiveDisposableGoodsStockID' + },{ + xtype : 'hidden', + id : 'ExpensiveCost', + name : 'ExpensiveCost' + },{ + xtype : 'hidden', + id : 'ExpensiveSupplierName', + name : 'ExpensiveSupplierName' + },{ + xtype : 'hidden', + id : 'ExpensiveExpDate', + name : 'ExpensiveExpDate' + },{ + xtype : 'hidden', + id : 'ExpensiveSterileBatchNumber', + name : 'ExpensiveSterileBatchNumber' + },{ + xtype : 'hidden', + id : 'ExpensiveManufacturer', + name : 'ExpensiveManufacturer' + },{ + xtype : 'hidden', + id : 'ExpensiveProducingArea', + name : 'ExpensiveProducingArea' + },{ text : '扫描条码:' }, { xtype : 'textfield', @@ -910,8 +939,8 @@ text : '添加', iconCls : 'btn_ext_add', id:'scanBarcodeAddBtn', - handler : function() { - var disposableGoodsStockID = top.Ext.getCmp('disposableGoodsStockID').getValue(); + handler : function() { + var disposableGoodsStockID = top.Ext.getCmp('ExpensiveDisposableGoodsStockID').getValue(); var name = top.Ext.getCmp('name2').getValue(); var amount = top.Ext.getCmp('amount2').getValue(); var batchNumber = top.Ext.getCmp('batchNumber2').getValue(); @@ -1192,14 +1221,14 @@ top.Ext.getCmp('batchNumber2').setValue(goodsInfo.batchNumber); top.Ext.getCmp('price2').setValue(goodsInfo.cost); - //隐藏元素(隐藏域):库存id,批次id - top.Ext.getCmp('disposableGoodsStockID').setValue(goodsInfo.disposableGoodsStockID); - top.Ext.getCmp('cost').setValue(goodsInfo.cost); - top.Ext.getCmp('supplierName').setValue(goodsInfo.supplierName); - top.Ext.getCmp('expDate').setValue(goodsInfo.expDate); - top.Ext.getCmp('sterileBatchNumber').setValue(goodsInfo.sterileBatchNumber); - top.Ext.getCmp('manufacturer').setValue(goodsInfo.manufacturer); - top.Ext.getCmp('producingArea').setValue(goodsInfo.producingArea); + //隐藏元素(隐藏域):库存id,批次id + top.Ext.getCmp('ExpensiveDisposableGoodsStockID').setValue(goodsInfo.disposableGoodsStockID); + top.Ext.getCmp('ExpensiveCost').setValue(goodsInfo.cost); + top.Ext.getCmp('ExpensiveSupplierName').setValue(goodsInfo.supplierName); + top.Ext.getCmp('ExpensiveExpDate').setValue(goodsInfo.expDate); + top.Ext.getCmp('ExpensiveSterileBatchNumber').setValue(goodsInfo.sterileBatchNumber); + top.Ext.getCmp('ExpensiveManufacturer').setValue(goodsInfo.manufacturer); + top.Ext.getCmp('ExpensiveProducingArea').setValue(goodsInfo.producingArea); currentBarcodeBatchStock.disposableGoodsID = goodsInfo.disposableGoodsID; currentBarcodeBatchStock.disposableGoodsStockID = goodsInfo.disposableGoodsStockID;