Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js =================================================================== diff -u -r32037 -r34325 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js (.../invoiceSignFormVersion2.js) (revision 32037) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js (.../invoiceSignFormVersion2.js) (revision 34325) @@ -85,6 +85,7 @@ {name : 'tousseName'}, {name : 'tousseBarcode'}, {name : 'status'}, + {name : 'locationForDisplay'}, {name : 'depart'} ]); @@ -176,6 +177,7 @@ tousseName : goods.tousseName, tousseBarcode : goods.tousseBarcode, status : goods.status, + locationForDisplay : goods.locationForDisplay, depart : goods.depart }); invoiceSignAbnormalDetailGoodsStore.insert(0,newRecord); @@ -289,6 +291,7 @@ {name : 'showTousseName'}, {name : 'status'}, {name : 'depart'}, + {name : 'locationForDisplay'}, {name : 'batchNumber'} ] }) @@ -350,7 +353,7 @@ {header : "物品名称",dataIndex : 'tousseName',width : 90,menuDisabled: true}, {header : "条码",dataIndex : 'tousseBarcode',width : 70,menuDisabled: true}, {header : "包状态",dataIndex : 'status',width : 60, menuDisabled: true}, - {header : "收货科室",dataIndex : 'depart',width : 70, menuDisabled: true}, + {header : "收货科室",dataIndex : 'locationForDisplay',width : 70, menuDisabled: true}, {id : 'deleteItem',header:'删除',width : 35, align:'center', menuDisabled: true, renderer: function(v,p,record){ var str = "";