Index: ssts-web/src/main/webapp/ext/grid/ForgonGrid.js
===================================================================
diff -u -r23700 -r33998
--- ssts-web/src/main/webapp/ext/grid/ForgonGrid.js	(.../ForgonGrid.js)	(revision 23700)
+++ ssts-web/src/main/webapp/ext/grid/ForgonGrid.js	(.../ForgonGrid.js)	(revision 33998)
@@ -17,11 +17,12 @@
     pageSize = getCookie(configCookieName);
     pageSize = pageSize ? pageSize : config.pageSize;
     pageSize = pageSize ? pageSize : 20;
+    var pageSizeDateStoreConfig = config.pageSizeDateStore || pageSizeDateStore;
     
     var pageSizeCombobox = new Ext.form.ComboBox({
             store: new Ext.data.SimpleStore({
                        fields: ['state'],
-                       data : pageSizeDateStore
+                       data : pageSizeDateStoreConfig
                    }),
             listeners:{
                  select:function(combo, record,index){
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
===================================================================
diff -u -r32863 -r33998
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js	(.../tousseView.js)	(revision 32863)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js	(.../tousseView.js)	(revision 33998)
@@ -327,6 +327,7 @@
 			plugins : filters,
 			autoExpandColumn : 'wbCode',
 			searchDisableIndexes : ['isUploadImage','isUploadVideo','costPrice'],
+			pageSizeDateStore:[['10'],['20'],['30'],['50'],['100'],['200'],['300'],['400'],['500'],['600'],['700'],['800'],['900'],['1000']],
 			//renderTo : 'gridDiv',
 			frame : false
 		}, readerDetail, TousseDefinitionTableManager.findTousseDefinitionTableList, dwrCallParams // 这个参数只是占位作用
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js
===================================================================
diff -u -r27306 -r33998
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js	(.../tousseBatchModify.js)	(revision 27306)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js	(.../tousseBatchModify.js)	(revision 33998)
@@ -420,6 +420,44 @@
 						anchor : '100%',
 						listeners : {}
                     }]
+                },{
+                    columnWidth: 1,
+                    layout: 'form',
+                    labelWidth: fontSize == 12 ? 90 : 120,
+                    labelAlign: "right",
+                    hidden: !sstsConfig.enableTousseDefinitionBelongDepart,
+                    items: [{
+                        //用于保存时：传递所属科室编码
+                        xtype: 'hidden',
+                        id: 'belongOrgUnitCodes',
+                        name: 'belongOrgUnitCodes'
+                    },{
+                        //传递所属科室属性
+                        xtype: 'hidden',
+                        id: 'hiddenTableDataStr',
+                        name: 'hiddenTableDataStr'
+                    },{
+						xtype: 'trigger',
+						fieldLabel: "所属科室",
+						allowBlank: true,
+						name: "belongDepartNames",
+						id: "belongDepartNames",
+						msgTarget: 'side',
+						readOnly: true,
+						style: "cursor: pointer;",
+						onTriggerClick: function () {
+							setDepartOrgUnit2('belongOrgUnitCodes', 'belongDepartNames', 'hiddenTableDataStr');
+						},
+						listeners: {
+							render: function (item) {
+								item.getEl().on('click', function (p) {
+									setDepartOrgUnit2('belongOrgUnitCodes', 'belongDepartNames', 'hiddenTableDataStr');
+								});
+							}
+						},
+						triggerClass: 'x-form-search-trigger',
+						anchor: '100%'
+                    }]
                 }]
             }]
         }],
@@ -446,7 +484,7 @@
         width: 700,
         border: false,
         modal: true,
-        height: 220,
+        height: 250,
         // height: top.screen.height > 800 ? 660 : 500,
         plain: true,
         items: [batchModifyFormObj]
@@ -481,6 +519,11 @@
 	var isPacking = top.Ext.getCmp('batchEdit_isPacking').getValue(); //是否装配
 	var isReview = top.Ext.getCmp('batchEdit_isReview').getValue(); //是否审核
 	var isConvertApplyGoods = top.Ext.getCmp('batchEdit_isConvertApplyGoods').getValue(); //转换申请物品
+    var belongOrgUnitCodes = top.Ext.getCmp('belongOrgUnitCodes').getValue(); //所属科室
+    var belongDepartNames = top.Ext.getCmp('belongDepartNames').getValue(); //所属科室名称
+    if(belongDepartNames.length > 500){
+        belongDepartNames = belongDepartNames.substring(0, 500) + '......';
+    }
 	
     if (!isUndefinedOrNullOrEmpty(price)) {
         message += "价格:(" + price + ");";
@@ -522,8 +565,11 @@
 	if (!isUndefinedOrNullOrEmpty(isConvertApplyGoods)) {
 	    message += "转换申请物品:(" + isConvertApplyGoods + ");";
 	}
+    if (!isUndefinedOrNullOrEmpty(belongDepartNames)) {
+	    message += "所属科室:(" + belongDepartNames + ");";
+	}
     //创建对象
-    var needBatchModify = new NeedBatchModify(tousseDefinitionIDs, price, borrowPrice, packageSize, isDisable,packageType,taskGroup,barcodePaperType,sterilingMethod,tousseGroupName,tousseGroupID,isRecycling,isPacking,isReview,isConvertApplyGoods);
+    var needBatchModify = new NeedBatchModify(tousseDefinitionIDs, price, borrowPrice, packageSize, isDisable,packageType,taskGroup,barcodePaperType,sterilingMethod,tousseGroupName,tousseGroupID,isRecycling,isPacking,isReview,isConvertApplyGoods,belongOrgUnitCodes);
     top.Ext.MessageBox.confirm("请确认", message,
         function (button, text) {
             if ("yes" == button) {
@@ -533,6 +579,43 @@
             }
         });
 }
+//进度条
+function flushProgress(message){
+    var myMask;
+    if(message){
+        if(myMask){
+            myMask.hide();
+        }
+        myMask = new top.Ext.LoadMask(top.Ext.getBody(), {
+            msg: message + '...'
+        });
+        myMask.show();
+    }
+    var progress = setTimeout(function(){
+        Ext4.Ajax.request({
+            url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionController/flushProgress.mhtml',
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            success: function (response, options) {
+                var result = Ext.decode(response.responseText);
+                var success = result.success;
+                if(!success){
+                    flushProgress(result.process);
+                }else {
+                    clearTimeout(progress);
+                    myMask.hide();
+                }
+            },
+            failure: function (response, options) {
+                myMask.hide();
+                var result = Ext.decode(response.responseText);
+                showResult(result.message);
+            }
+        });
+    }, 1000);
+}
 
 /**
  * 保存批量修改的器械包定义
@@ -546,11 +629,9 @@
     Ext4.Ajax.request({
         url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionController/saveTousseDefinitionBatchModify.mhtml',
         method: 'POST',
-        // async:false,
         headers: {
             'Content-Type': 'application/json'
         },
-        // params : JSON.stringify(needBatchModify),
         jsonData: needBatchModify,
         success: function (response, options) {
             var result = Ext.decode(response.responseText);
@@ -569,12 +650,17 @@
         failure: function (response, options) {
             myMask.hide();
             var result = Ext.decode(response.responseText);
-            showResult(result.message);
+            if(result.message){
+                showResult(result.message);
+            }else {
+                showResult("无法加载数据...");
+            }
         }
     });
+    flushProgress();
 }
 
-function NeedBatchModify(tousseDefinitionIds, price, borrowPrice, packageSize, isDisable,packageType,taskGroup,barcodePaperType,sterilingMethod,tousseGroupName,tousseGroupID,isRecycling,isPacking,isReview,isConvertApplyGoods) {
+function NeedBatchModify(tousseDefinitionIds, price, borrowPrice, packageSize, isDisable,packageType,taskGroup,barcodePaperType,sterilingMethod,tousseGroupName,tousseGroupID,isRecycling,isPacking,isReview,isConvertApplyGoods,belongOrgUnitCodes) {
     this.tousseDefinitionIds = tousseDefinitionIds;
     this.price = price;
     this.borrowPrice = borrowPrice;
@@ -590,6 +676,7 @@
 	this.isPacking = isPacking;
 	this.isReview = isReview;
 	this.isConvertApplyGoods = isConvertApplyGoods;
+    this.belongOrgUnitCodes = belongOrgUnitCodes;
 }