Index: ssts-web/src/main/webapp/disinfectsystem/invoice/batchInvoice.js =================================================================== diff -u -r35321 -r35331 --- ssts-web/src/main/webapp/disinfectsystem/invoice/batchInvoice.js (.../batchInvoice.js) (revision 35321) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/batchInvoice.js (.../batchInvoice.js) (revision 35331) @@ -166,7 +166,7 @@ } total += parseFloat(price * newAmount); } - record['costTotal'] = parseFloat(total).toFixed(1); + record['costTotal'] = parseFloat(total).toFixed(2); } if (disposableGoodsIdsMap['disposableGoods_' + disposableGoodsId]) { if (sendAmount !== '') { @@ -186,7 +186,7 @@ } var costTotal = disposableGoodsIdsMap['costTotal'] || ''; if (costTotal !== '') { - costTotal = parseFloat(costTotal).toFixed(1) + costTotal = parseFloat(costTotal).toFixed(2) } var record = { invoiceDepartId: '', @@ -238,10 +238,12 @@ sendAmount = items.data['disposableGoods_' + disposableGoodsIdArr[j]]; } if (type == 0) { - invoiceItems.push({ - disposableGoodsId: parseInt(disposableGoodsId), - amount: sendAmount - }) + if (sendAmount !== '' && sendAmount !== 0) { + invoiceItems.push({ + disposableGoodsId: parseInt(disposableGoodsId), + amount: sendAmount + }) + } } else { if (sendAmount !== '' && sendAmount !== 0) { goodsItems.push({ @@ -450,7 +452,7 @@ title: '批量发货列表', store: listStore, columns: columns, - height:height-140, + height: height - 140, plugins: [ Ext4.create('Ext.grid.plugin.CellEditing', { clicksToEdit: 2, @@ -473,7 +475,7 @@ var price = record.data['price/unit_' + disposableGoodsId].split('/')[0] rowAmount += parseFloat((parseInt(amount) * parseFloat(price))); } - record.set('costTotal', parseFloat(rowAmount).toFixed(1)); + record.set('costTotal', parseFloat(rowAmount).toFixed(2)); } var disposableGoodsId = field.split('_')[1]; if (disposableGoodsId) { @@ -494,7 +496,7 @@ } } listStore.getAt(listStore.getCount() - 1).set('disposableGoods_' + disposableGoodsId, colAmount); - listStore.getAt(listStore.getCount() - 1).set('costTotal', parseFloat(sumTotal).toFixed(1)); + listStore.getAt(listStore.getCount() - 1).set('costTotal', parseFloat(sumTotal).toFixed(2)); } } } @@ -537,7 +539,7 @@ new Ext4.form.Panel({ renderTo: "gridDiv", frame: true, - title:'一次性物品自定义批量发货', + title: '一次性物品自定义批量发货', labelSeparator: ':', height: document.body.offsetHeight, border: 0, @@ -689,7 +691,10 @@ handler: function () { var wareHouseId = Ext4.getCmp('wareHouseId').getValue(); var invoiceItems = getListData(0); - + if (invoiceItems.length == 0) { + showResult('请填写物品数量!'); + return; + } var params = { wareHouseId: wareHouseId, amountAndIdArray: JSON.stringify(invoiceItems) @@ -733,6 +738,13 @@ icon: Ext4.Msg.INFO }); } + } else { + Ext4.Msg.show({ + title: '提示', + msg: '当前所选仓库库存充足!', + buttons: Ext4.Msg.CANCEL, + icon: Ext4.Msg.INFO + }); } } else { showResult(result.msg);