Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r15575 -r15986 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 15575) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 15986) @@ -139,6 +139,10 @@ renderer : filterUnderScoreName, sortable : true },{ + header : '科室', + dataIndex : 'department', + width : 150 + },{ header : '配包员', dataIndex : 'packer', width : 70, Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r15984 -r15986 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 15984) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 15986) @@ -118,6 +118,7 @@ fields: [ {name: 'id',type: "int" }, {name: 'packTimeStr'}, + {name: 'orgUnitName'}, {name: 'packer'}, {name: 'tousseName'}, {name: 'amount'} @@ -2496,6 +2497,7 @@ height: document.body.clientHeight-25, viewConfig : {loadMask : {msg : '正在加载,请稍候...'}}, columns: [ + {header: '科室', dataIndex: 'orgUnitName',width: 200}, {header: '装配时间', dataIndex: 'packTimeStr',width: 150}, {header: '器械包', dataIndex: 'tousseName', width: 200,renderer:filterUnderScoreName}, {header: '数量', dataIndex: 'amount'}, Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js =================================================================== diff -u -r12331 -r15986 --- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js (.../historyPackingView.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js (.../historyPackingView.js) (revision 15986) @@ -93,6 +93,7 @@ }); var recordColumns = [ + {header : "科室",width : 200,dataIndex : 'orgUnitName'}, {header : "装配记录时间",width : 150,dataIndex : 'packTime',renderer:myDateFormatBySecond}, {header : "器械包",width : 250,dataIndex : 'tousseName',renderer:filterUnderScoreName}, {header : "数量",width : 80,dataIndex : 'amount'}, @@ -101,6 +102,7 @@ var recordReaderDetail = [ {name : 'id'}, + {name : 'orgUnitName'}, {name : 'packTime'}, {name : 'packer'}, {name : 'tousseName'},