Index: ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js =================================================================== diff -u -r30171 -r30172 --- ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js (.../splitRecyclingApplicationView.js) (revision 30171) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js (.../splitRecyclingApplicationView.js) (revision 30172) @@ -16,31 +16,31 @@ for (var j = 0; j < records.length; j++) { var tousseItemId = records[j].data['id']; var left_tousseName = records[j].data['tousseName']; - var amount = records[j].data['amount']; + var canSplitAmount = records[j].data['canSplitAmount']; var maxSplitAmount = records[j].data['maxSplitAmount']; - if (amount > maxSplitAmount) { + if (canSplitAmount > maxSplitAmount) { showResult("申请数量不能大于" + maxSplitAmount + "!"); return false; } - if (amount == 0) { + if (canSplitAmount == 0) { continue; } var isExist = false; for (var n = 0; n < rightStore.getCount(); n++) { var record = rightStore.getAt(n); var right_id = record.get('id'); - var right_amount = record.get('amount'); + var right_amount = record.get('amount') || 0; if (right_id == tousseItemId) { isExist = true; - var num = Number(amount) + Number(right_amount); + var num = Number(canSplitAmount) + Number(right_amount); record.set('amount', num); } } if (!isExist) { var record = new addSplitMaterial({ id: tousseItemId, tousseName: left_tousseName, - amount: amount + amount: canSplitAmount }); rightStore.addSorted(record); } @@ -55,7 +55,7 @@ leftStore.remove(rows[i]); } else { var num = Number(maxSplitAmount) - Number(amount); - rows[i].set('amount', num); + rows[i].set('canSplitAmount', num); rows[i].set('maxSplitAmount', num); } } @@ -81,15 +81,15 @@ if (left_id == tousseItemId) { isExist = true; var num = Number(right_amount) + Number(amount); - record.set('amount', num); + record.set('canSplitAmount', num); record.set('maxSplitAmount', num); } } if (!isExist) { var record = new addSplitMaterial({ id: tousseItemId, tousseName: right_tousseName, - amount: right_amount, + canSplitAmount: right_amount, maxSplitAmount: right_amount }); leftStore.add(record); @@ -386,7 +386,6 @@ width: 100, menuDisabled: true }, { - id: 'amount', header: (type== '回收申请单')?"回收数量":"申请数量", dataIndex: 'canSplitAmount', width: 40,