Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js
===================================================================
diff -u -r37437 -r38133
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js	(.../tousseBatchModify.js)	(revision 37437)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js	(.../tousseBatchModify.js)	(revision 38133)
@@ -555,6 +555,43 @@
 						triggerClass: 'x-form-search-trigger',
 						anchor: '100%'
                     }]
+                },{
+                    columnWidth: 1,
+                    layout: 'form',
+                    labelWidth: fontSize == 12 ? 90 : 120,
+                    labelAlign: "right",
+                    hidden: !sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction,
+                    items: [{
+						xtype: 'hidden',
+						id: 'optionalSterilizationIds',
+						name: 'optionalSterilizationIds'
+					}, {
+						xtype: 'trigger',
+						fieldLabel: "可选灭菌程序",
+						allowBlank: true,
+						name: "optionalSterilization",
+						id: "optionalSterilization",
+						msgTarget: 'side',
+						readOnly: true,
+						style: "cursor: pointer;",
+						disabled:SSTS_TousseDefinitionSterilisation_Manager,
+						onTriggerClick: function () {
+							if(!SSTS_TousseDefinitionSterilisation_Manager){
+								optionalSterilizationWin();
+							}
+						},
+						listeners: {
+							render: function (item) {
+								item.getEl().on('click', function (p) {
+									if(!SSTS_TousseDefinitionSterilisation_Manager){
+										optionalSterilizationWin();
+									}
+								});
+							}
+						},
+						triggerClass: 'x-form-search-trigger',
+						anchor: '100%'
+					}]
                 }]
             }]
         }],
@@ -575,11 +612,14 @@
     });
     var height = 240;
     if(sstsConfig.enableTousseDefinitionBelongDepart){
-        height += 30;
+        height += 25;
     }
     if(sstsConfig.enableInstrumentSetTypeSetting){
-        height += 30;
+        height += 25;
     }
+    if(sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction){
+        height += 25;
+    }
     batchModifyWin = new top.Ext.Window({
         id: 'batchModifyWin',
         layout: 'fit',
@@ -632,6 +672,12 @@
         instrumentSetTypeName = instrumentSetTypeName.substring(0, 500) + '......';
     }
 
+    var optionalSterilizationIds = top.Ext.getCmp('optionalSterilizationIds').getValue(); //可选灭菌程序
+    var optionalSterilization = top.Ext.getCmp('optionalSterilization').getValue(); //可选灭菌程序名称
+    if(optionalSterilization.length > 500){
+        optionalSterilization = optionalSterilization.substring(0, 500) + '......';
+    }
+
     var needBatchModify = {
         tousseDefinitionIds:tousseDefinitionIDs
     }
@@ -711,6 +757,12 @@
         needBatchModify.assetsBelongCode = assetsBelongCode;
     }
 
+     //DGSETYY-97：批量修改新增字段“可选灭菌程序”
+    if (!isUndefinedOrNullOrEmpty(optionalSterilizationIds) && sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction) {
+	    message += "可选灭菌程序:(" + optionalSterilization + ");";
+        needBatchModify.optionalSterilizationIds = optionalSterilizationIds;
+	}
+
     top.Ext.MessageBox.confirm("请确认", message,function (button, text) {
         if ("yes" == button) {
             submintNeedBatchModify(needBatchModify);
@@ -801,32 +853,9 @@
             }
         }
     });
-    flushProgress();
+   flushProgress();
 }
 
-function NeedBatchModify(tousseDefinitionIds, price, borrowPrice, packageSize, isDisable,packageType,taskGroup,barcodePaperType,sterilingMethod,tousseGroupName,tousseGroupID,isRecycling,isPacking,isReview,isConvertApplyGoods,belongOrgUnitCodes,instrumentSetTypeIds,integral) {
-    this.tousseDefinitionIds = tousseDefinitionIds;
-    this.price = price;
-    this.borrowPrice = borrowPrice;
-    this.packageSize = packageSize;
-    this.isDisable = isDisable;
-    this.packageType = packageType;	
-	this.taskGroup = taskGroup;
-	this.barcodePaperType = barcodePaperType;
-	this.sterilingMethod = sterilingMethod; 
-	this.tousseGroupName = tousseGroupName; 
-	this.tousseGroupID = tousseGroupID;
-	this.isRecycling = isRecycling;
-	this.isPacking = isPacking;
-	this.isReview = isReview;
-	this.isConvertApplyGoods = isConvertApplyGoods;
-    this.belongOrgUnitCodes = belongOrgUnitCodes;
-    this.instrumentSetTypeIds = instrumentSetTypeIds;
-    this.integral = integral;
-}
-
-
-
 /****************器械包单元格修改********************* */
 
 function cellEditTousseDefinition(id, fieldName, columnData) {