Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js
===================================================================
diff -u -r34492 -r37437
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js	(.../tousseBatchModify.js)	(revision 34492)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js	(.../tousseBatchModify.js)	(revision 37437)
@@ -76,6 +76,21 @@
 		}
 	});
 	
+    //NYSY-63：批量修改新增字段“资产归属”
+    var assetsBelongStore = new Ext.data.Store({
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do?showDisableOrgUnit=false',
+			method: 'POST'
+		}),
+		reader: new Ext.data.JsonReader({
+			root: 'data'
+		}, [
+			{ name: 'id', mapping: 'id' },
+			{ name: 'name', mapping: 'name' },
+			{ name: 'orgUnitName', mapping: 'orgUnitName' }
+		]
+		)
+	});
     
     var tousseDefinitionIDs = ids;
     var batchModifyFormObj
@@ -420,6 +435,37 @@
 						listeners : {}
                     }]
                 }, {
+					xtype: 'hidden',
+					id: 'batchEdit_assetsBelongCode',
+					name: 'assetsBelongCode'
+				}, {
+					columnWidth: colWidth,
+                    layout: 'form',
+                    labelWidth: fontSize == 12 ? 90 : 120,
+                    labelAlign: "right",
+					items: [{
+						xtype: 'combo',
+						fieldLabel: '资产归属',
+						id: 'batchEdit_assetsBelong',
+						name: 'assetsBelong',
+						store: assetsBelongStore,
+						queryParam: 'spell',
+						minChars: 0,
+						valueField: 'id',
+						displayField: 'name',
+						forceSelection: true,
+						lazyInit: true,
+						triggerAction: 'all',
+						typeAhead: false,
+						allowBlank: true,
+						anchor: '100%',
+						listeners: {
+							select: function (combo, record, index) {
+								top.Ext.getCmp('batchEdit_assetsBelongCode').setValue(record.data.id);
+							}
+						}
+					}]
+				}, {
                     columnWidth: colWidth,
                     layout: 'form',
                     labelWidth: fontSize == 12 ? 90 : 120,
@@ -527,7 +573,7 @@
             }
         }]
     });
-    var height = 220;
+    var height = 240;
     if(sstsConfig.enableTousseDefinitionBelongDepart){
         height += 30;
     }
@@ -559,7 +605,6 @@
         return false;
     }
     var message = "是否确定批量修改" + tousseDefinitionIDs.length + "个器械包的属性:<br/><br/>";
-    var needBatchModify = {};
     var price = top.Ext.getCmp('batchEdit_price').getValue(); //价格
     var borrowPrice = top.Ext.getCmp('batchEdit_borrowPrice').getValue(); //借出价格
     var packageSize = top.Ext.getCmp('batchEdit_packageSize').getValue(); //包大小
@@ -586,57 +631,86 @@
     if(instrumentSetTypeName.length > 500){
         instrumentSetTypeName = instrumentSetTypeName.substring(0, 500) + '......';
     }
+
+    var needBatchModify = {
+        tousseDefinitionIds:tousseDefinitionIDs
+    }
+
     if (!isUndefinedOrNullOrEmpty(price)) {
         message += "价格:(" + price + ");";
+        needBatchModify.price = price;
     }
     if (!isUndefinedOrNullOrEmpty(borrowPrice)) {
         message += "借出价格:(" + borrowPrice + ");";
+        needBatchModify.borrowPrice = borrowPrice;
     }
     if (!isUndefinedOrNullOrEmpty(packageSize)) {
         message += "包大小:(" + packageSize + ");";
+        needBatchModify.packageSize = packageSize;
     }
     if (!isUndefinedOrNullOrEmpty(isDisable)) {
         message += "是否停用:(" + isDisable + ");";
+        needBatchModify.isDisable = isDisable;
     }
     if (!isUndefinedOrNullOrEmpty(packageType)) {
         message += "默认包装类型:(" + packageType + ");";
+        needBatchModify.packageType = packageType;
     }
 	
 	if (!isUndefinedOrNullOrEmpty(taskGroup)) {
 	    message += "任务组:(" + taskGroup + ");";
+        needBatchModify.taskGroup = taskGroup;
 	}
 	if (!isUndefinedOrNullOrEmpty(barcodePaperType)) {
 	    message += "标签纸类型:(" + barcodePaperType + ");";
+        needBatchModify.barcodePaperType = barcodePaperType;
 	}
 	if (!isUndefinedOrNullOrEmpty(sterilingMethod)) {
 	    message += "默认灭菌程序:(" + sterilingMethod + ");";
+        needBatchModify.sterilingMethod = sterilingMethod;
 	}
 	if (!isUndefinedOrNullOrEmpty(tousseGroupName)) {
 	    message += "器械包分组:(" + tousseGroupName + ");";
+        needBatchModify.tousseGroupName = tousseGroupName;
+        needBatchModify.tousseGroupID = tousseGroupID;
 	}
 	if (!isUndefinedOrNullOrEmpty(isRecycling)) {
 	    message += "是否回收:(" + isRecycling + ");";
+        needBatchModify.isRecycling = isRecycling;
 	}
 	if (!isUndefinedOrNullOrEmpty(isPacking)) {
 	    message += "是否装配:(" + isPacking + ");";
+        needBatchModify.isPacking = isPacking;
 	}
 	if (!isUndefinedOrNullOrEmpty(isReview)) {
 	    message += "是否审核:(" + isReview + ");";
+        needBatchModify.isReview = isReview;
 	}
 	if (!isUndefinedOrNullOrEmpty(isConvertApplyGoods)) {
 	    message += "转换申请物品:(" + isConvertApplyGoods + ");";
+        needBatchModify.isConvertApplyGoods = isConvertApplyGoods;
 	}
     if (!isUndefinedOrNullOrEmpty(belongDepartNames)) {
 	    message += "所属科室:(" + belongDepartNames + ");";
+        needBatchModify.belongOrgUnitCodes = belongOrgUnitCodes;
 	}
     if (!isUndefinedOrNullOrEmpty(instrumentSetTypeName)) {
 	    message += "所属种类:(" + instrumentSetTypeName + ");";
+        needBatchModify.instrumentSetTypeIds = instrumentSetTypeIds;
 	}
     if (!isUndefinedOrNullOrEmpty(integral) && sstsConfig.enableIntegralOfTousseDefinition) {
 	    message += "积分系数:(" + integral + ");";
+        needBatchModify.integral = integral;
 	}
-    //创建对象
-    var needBatchModify = new NeedBatchModify(tousseDefinitionIDs, price, borrowPrice, packageSize, isDisable,packageType,taskGroup,barcodePaperType,sterilingMethod,tousseGroupName,tousseGroupID,isRecycling,isPacking,isReview,isConvertApplyGoods,belongOrgUnitCodes,instrumentSetTypeIds,integral);
+
+    //NYSY-63：批量修改新增字段“资产归属”
+    var assetsBelong = top.Ext.getCmp('batchEdit_assetsBelong').getRawValue();
+    var assetsBelongCode = top.Ext.getCmp('batchEdit_assetsBelongCode').getValue();
+    if (!isUndefinedOrNullOrEmpty(assetsBelong)) {
+        message += "资产归属:(" + assetsBelong + ");";
+        needBatchModify.assetsBelongCode = assetsBelongCode;
+    }
+
     top.Ext.MessageBox.confirm("请确认", message,function (button, text) {
         if ("yes" == button) {
             submintNeedBatchModify(needBatchModify);