Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereGoodsApplicationView.js =================================================================== diff -u -r20727 -r30167 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereGoodsApplicationView.js (.../interfereGoodsApplicationView.js) (revision 20727) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereGoodsApplicationView.js (.../interfereGoodsApplicationView.js) (revision 30167) @@ -171,7 +171,8 @@ var settleAccountsDepart = record.data.settleAccountsDepart; var handleDepart = record.data.handleDepart; var id = record.data.id; - return "" + v + ""; + var type = record.data.type; + return "" + v + ""; } var columns = [ Index: ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js =================================================================== diff -u -r30162 -r30167 --- ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js (.../splitRecyclingApplicationView.js) (revision 30162) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js (.../splitRecyclingApplicationView.js) (revision 30167) @@ -126,7 +126,7 @@ barcodeField.setValue(); } -function splitInvoicePlan(invoicePlanId, serialNum, depart, settleAccountsDepart, handleDepart) { +function splitInvoicePlan(invoicePlanId, serialNum, depart, settleAccountsDepart, handleDepart, type) { var selectModel = new top.Ext.grid.CheckboxSelectionModel(); @@ -381,32 +381,32 @@ width: 100, hidden: true }, { - header: "物品名称", - dataIndex: 'tousseName', - width: 100, - menuDisabled: true - }, { - id: 'amount', - header: "申请数量", - dataIndex: 'amount', - width: 40, - align: 'center', - menuDisabled: true, - editor: new top.Ext.form.NumberField({ - allowBlank: false, - listeners: { - focus: function (thiz) { - thiz.selectText(); - } + header: "物品名称", + dataIndex: 'tousseName', + width: 100, + menuDisabled: true + }, { + id: 'amount', + header: (type== '回收申请单')?"回收数量":"申请数量", + dataIndex: (type== '回收申请单')?"recyclingAmount":'amount', + width: 40, + align: 'center', + menuDisabled: true, + editor: new top.Ext.form.NumberField({ + allowBlank: false, + listeners: { + focus: function (thiz) { + thiz.selectText(); } - }) - }, { - header: "可拆分数量", - hidden: true, - dataIndex: 'maxSplitAmount', - width: 60, - menuDisabled: true - }]); + } + }) + }, { + header: "可拆分数量", + hidden: true, + dataIndex: 'maxSplitAmount', + width: 60, + menuDisabled: true + }]); var rightMaterialCm = new top.Ext.grid.ColumnModel([selectModel, { header: "id", @@ -438,6 +438,7 @@ { name: 'id', mapping: 'id' }, { name: 'tousseName', mapping: 'tousseName' }, { name: 'amount', mapping: 'amount' }, + { name: 'recyclingAmount', mapping: 'recyclingAmount' }, { name: 'maxSplitAmount', mapping: 'maxSplitAmount' } ]) });