Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r28555 -r28565 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 28555) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 28565) @@ -138,27 +138,6 @@ justify-content: center; } -.x4-grid-cell-inner .x4-tree-elbow-img { - position: absolute; - left: 0; -} - -.x4-grid-cell-inner .x4-tree-checkbox { - position: absolute; - left: 18px; - top: 7px; -} - -.x4-grid-cell-inner .x4-tree-icon { - position: absolute; - left: 35px; -} - -.x4-grid-cell-inner span { - display: block; - margin-left: 55px; -} - body { overflow: hidden; } Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r28555 -r28565 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28555) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28565) @@ -857,12 +857,12 @@ var columns = [ { header: '物品名称', - width : 200, + minWidth:200, sortable: true, xtype : 'treecolumn', dataIndex: 'tousseName', renderer: function(v,p,record,rowIndex, columnIndex, store,view){ - p.style='word-wrap: break-word !important;white-space:normal;position: relative;'; + p.style='word-wrap: break-word !important;'; var tousseName = record.get('tousseName'); var showName = tousseName; if(record.get('taskType') == taskType_application || record.get('taskType') == taskType_returnGoods @@ -992,7 +992,7 @@ sortable: true, dataIndex: 'basketName', renderer:function (value, metaData, record, rowIdx, colIdx, store){ - metaData.style='word-wrap: break-word !important;white-space:normal;display:flex;display: -ms-flex;'; + metaData.style='word-wrap: break-word !important;'; metaData.tdAttr = 'data-qtip="' + Ext4.String.htmlEncode(value) + '"'; //在tips中展示列的全部内容. return value; } @@ -4420,11 +4420,13 @@ }); var waitPackColumnTreeGrid = Ext4.create('columnTreeGrid', { id : 'waitPackingTreeGrid', - flex : 1, border : false, viewConfig : { - loadMask : {msg : '正在加载,请稍候...'} + loadMask : {msg : '正在加载,请稍候...'}, + forceFit :false, + autoFill:false }, + width:1200, columns:buildColumnTreeColumns('waitPackingTreeGrid'), height: (document.body.clientHeight - 30)/2, listeners:{