Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r40673 -r40692
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 40673)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 40692)
@@ -2000,7 +2000,7 @@
 	function getGridColumns(headerName, treeId) {
 		if (headerName == '物品名称') {
 			var obj = {
-				header: '物品名称',
+				header: (sstsConfig.enableGroupPendingAssemblyTasksByBasket && treeId == 'waitPackingTreeGrid') ? '篮筐/物品名称':'物品名称',
 				minWidth: 200,
 				sortable: true,
 				xtype: 'treecolumn',
@@ -2040,6 +2040,9 @@
 					} else {
 						resultName = showName;
 					}
+					if(sstsConfig.enableGroupPendingAssemblyTasksByBasket && !record.get('leaf') && treeId == 'waitPackingTreeGrid'){
+						resultName = record.raw.text
+					}
 					if (record.get('tousseType') == '外来器械包' && sstsConfig.showCameraPhoto) {
 						if (sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking) {
 							if (record.get('partPacking') && !record.get('isTimeout')) {
@@ -2329,6 +2332,7 @@
 				align: 'center',
 				sortable: true,
 				dataIndex: 'basketName',
+				hidden: (sstsConfig.enableGroupPendingAssemblyTasksByBasket && treeId == 'waitPackingTreeGrid'),
 				renderer: function (value, metaData, record, rowIdx, colIdx, store) {
 					var html = value;
 					var classifiedItemAmountInfo = record.get('classifiedItemAmountInfo') || '';
@@ -4149,6 +4153,9 @@
 		],
 		listeners: {
 			load: function (thiz, records, options) {
+				if(records.length == 0){
+					return
+				}
 				var len = records.length;
 				var materialTotalAmount = 0;
 				var diposableGoodsTotalAmount = 0;
@@ -4333,6 +4340,9 @@
 	//ZSWY-242:查询区域按钮兼容不同分辨率
 
 	var tbarMaxWidth = parseInt($('#mainPackingView').width()*0.42);
+	if(sstsConfig.enableGroupPendingAssemblyTasksByBasket){
+		tbarMaxWidth = tbarMaxWidth * 0.8;
+	}
 
 	var waitPackingTbar = [new Ext4.form.field.Checkbox({
 		boxLabel: '全选',
@@ -4627,6 +4637,7 @@
 			emptyText: '搜索物品或科室',
 			triggerCls: 'x-form-clear-trigger',
 			trigger2Cls: 'x-form-search-trigger',
+			height:23,
 			listeners: {
 				render: function (c) {
 					c.getEl().on('keypress', function (e) {
@@ -4654,6 +4665,7 @@
 			emptyText: '搜索物品或科室',
 			triggerCls: 'x-form-clear-trigger',
 			trigger2Cls: 'x-form-search-trigger',
+			height:22,
 			listeners: {
 				render: function (c) {
 					c.getEl().on('keypress', function (e) {
@@ -4786,10 +4798,11 @@
 	}]
 
 	var basketPackingTbarWidth = 420;
+	var tbarMaxWidthByBasket = parseInt($('#mainPackingView').width()*0.42);
 
 	var basketPackingTbar2 = [];
 
-	if(basketPackingTbarWidth + 252 > tbarMaxWidth){
+	if(basketPackingTbarWidth + 252 > tbarMaxWidthByBasket){
 		basketPackingTbar2.push({
 			text: '打印分组类型:'
 		},
@@ -4914,9 +4927,10 @@
 				if(Ext4.getCmp('tousseOrDepart')){
 					tousseOrDepart = Ext4.getCmp('tousseOrDepart').getValue();
 				}
+				var settleAccountsDepartCoding = treeStore.proxy.extraParams.settleAccountsDepartCoding || '';
 				Ext4.Ajax.request({
 					url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskPageJson.do',
-					params: { taskGroup: taskGroup, pageSize: waitPackingPageSize, tousseOrDepart: tousseOrDepart },
+					params: { taskGroup: taskGroup, pageSize: waitPackingPageSize, tousseOrDepart: tousseOrDepart, settleAccountsDepartCoding: settleAccountsDepartCoding },
 					success: function (response, options) {
 						var result = Ext4.decode(response.responseText);
 						if (result.success) {
@@ -8346,6 +8360,10 @@
 							}
 						}
 					}
+					if(sstsConfig.enableGroupPendingAssemblyTasksByBasket){
+						var basketBarcode = record.data.basketBarcode || record.raw.containerBarcode;
+						scanBasketBarcodes(basketBarcode, 1);
+					}
 				}, 200);
 			},
 			load: {
@@ -8687,6 +8705,60 @@
 		selModel: new Ext4.selection.CheckboxModel()
 	});
 
+	var leftTreeStore = new Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			method: 'POST',
+			url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskDepartJson.do?taskGroup='+taskGroup,
+			reader: {
+				type: 'json',
+				root: 'departs'
+			}
+		},
+		autoLoad: true,
+		fields: [
+			{ name: 'settleAccountsDepartCoding' },
+			{ name: 'name' }
+		],
+		listeners:{
+			load:function(thiz,records,options){
+				if(leftTreeStore.getCount() > 1){
+					leftTreeStore.insert(0 , {
+						name:'全部',
+						settleAccountsDepartCoding:''
+					});
+				}
+			}
+		}
+	});
+
+	var leftTreeGrid = new Ext4.grid.GridPanel({
+		hideHeaders: true,
+		title:'结算科室筛选',
+		columns: [{ 
+			header: "科室筛选", 
+			width:'99%',
+			menuDisabled: true, 
+			sortable:false,
+			dataIndex: 'name'
+		}],
+		frame: false,
+		autoScroll: false,
+		height: (document.body.clientHeight - 22) / 2,
+		store: leftTreeStore,
+		viewConfig: {
+			autoFill: true
+		},
+		listeners:{
+			 itemclick:function(thiz, record, item, index, e, eOpts){
+				var settleAccountsDepartCoding = record.data['settleAccountsDepartCoding'];
+				waitPackingTaskStore.proxy.extraParams.settleAccountsDepartCoding = settleAccountsDepartCoding;
+				Ext4.getCmp('pageNow').setValue(1);
+				waitPackingTaskStore.load();
+             }
+		}
+	})
+
 	var mainTabCls = /*(Ext4.isIE8 || Ext4.isIE6) ? 'mainTabCls' :*/ '';
 	var tabs2 = Ext4.widget('tabpanel', {
 		activeTab: 0,
@@ -8711,7 +8783,19 @@
 				margin: '0 0 0 0',
 				width: '42%',
 				height: document.body.clientHeight,
-				items: [basketColumnTreeGrid, waitPackColumnTreeGrid]
+				items: [basketColumnTreeGrid, {
+					layout: 'hbox',
+					items:[{
+						width: '20%',
+						hidden:!sstsConfig.enableGroupPendingAssemblyTasksByBasket,
+						height: (document.body.clientHeight - 22) / 2,
+						items:leftTreeGrid
+					},{
+						width: sstsConfig.enableGroupPendingAssemblyTasksByBasket ? '80%' : '100%',
+						height: (document.body.clientHeight - 22) / 2,
+						items:waitPackColumnTreeGrid
+					}]
+				}]
 			}, formPanel, materialGrid
 			]
 		}, {
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/config.js
===================================================================
diff -u -r40661 -r40692
--- ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/config.js	(.../config.js)	(revision 40661)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdskqyy/config.js	(.../config.js)	(revision 40692)
@@ -167,6 +167,8 @@
   enbaleLoadAutomaticallyIntoBasketsAfterAssembly:true,
   //是否允许部分回收
   enablePartRecycle:true,
+  //按篮筐汇总显示待装配任务
+  enableGroupPendingAssemblyTasksByBasket:true,
   //回收界面回收人是否默认是否为上一次回收的回收人,默认为false	
   recyclePageRecyclingUserDefaultLastRecyclingUser:false,
   //启用【器械包种类定义】功能