Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r21477 -r21496 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 21477) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 21496) @@ -473,6 +473,7 @@ {name : 'damageRemark'}, {name : 'urgentLevel'}, {name : 'idCardBarcode'}, + {name : 'customSplitBasketAmount'}, {name : 'serialNumber'} ]}); @@ -502,6 +503,29 @@ align:'center', sortable: true, dataIndex: 'amount', + renderer: function(v,p,record,rowIndex, columnIndex, store,view){ + if(!sstsConfig.waitPackingTaskGrid_show_foreignTousse_customSplitBasketAmount){ + return v; + } + if('basketTreeGrid' == treeId){ + return v; + } + if(record.get('leaf')){ + if(record.data.customSplitBasketAmount > 0){ + return v+'('+record.data.customSplitBasketAmount+')'; + }else{ + return v; + } + }else{ + if(record.data.customSplitBasketAmount > 0 && record.data.children.length <= 1){ + return v+'('+record.data.customSplitBasketAmount+')'; + }else{ + return v; + } + } + + return v; + }, editor: { xtype: 'numberfield', allowBlank: true,