Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js
===================================================================
diff -u -r37561 -r41627
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js	(.../storageRecordView.js)	(revision 37561)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js	(.../storageRecordView.js)	(revision 41627)
@@ -82,6 +82,9 @@
 	var columns = [
 		{ header: externalCodeName, dataIndex: 'externalCode', width: 140, menuDisabled: true,hidden:externalCodeHidden },
 		{header : "物资编码",width : 130,dataIndex : 'inventorySerialNumber',hidden: !sstsConfig.disposableGoodsInventorySerialNumber},
+		{header : "CHAS 标记物品",width : 130,dataIndex : 'chasItemControlTag',hidden: !sstsConfig.enableChasSystemTagPush},
+		{header : "CHAS 标记科室",width : 130,dataIndex : 'chasOrgControlTag',hidden: !sstsConfig.enableChasSystemTagPush},
+		{header : "CHAS 推送结果",width : 130,dataIndex : 'chasPushResult',hidden: !sstsConfig.enableChasSystemTagPush},
 		{ header: "物品名称", dataIndex: 'displayName', width: 320, menuDisabled: true },
 		{ header: "批次", dataIndex: 'batchNumber', width: 80, menuDisabled: true },
 		{ header: "单号", dataIndex: 'serialNumber', width: 80, menuDisabled: true },
@@ -113,6 +116,11 @@
 			{ name: 'externalCode' },
 			{ name: 'inventorySerialNumber' },
 			{ name: 'serialNumber', type: 'int' },
+			{ name: 'chasItemControlTag' },
+			{ name: 'chasOrgControlTag' },
+			{ name: 'chasPushResult' },
+			{ name: 'recordId' },
+			{ name: 'disposableGoodsID' },
 			{ name: 'time' },
 			{ name: 'type' },
 			{ name: 'subType' },
@@ -139,6 +147,47 @@
 		viewConfig: {
 			autoFill: true
 		},
+		tbar:[{
+			text : 'CHAS 推送',
+			handler : function() {
+				var selectedRecords = departGroupGrid.getSelectionModel().getSelection();
+				var selectedCount = departGroupGrid.getSelectionModel().getCount();
+				if (selectedCount < 1) {
+					showResult("请选择需要推送的信息！");
+				} else {
+					var arr = [];
+					for(var i=0;i<selectedRecords.length;i++){
+						arr.push({
+							recordId:selectedRecords[i].data.recordId || '',
+							disposableGoodsId:selectedRecords[i].data.disposableGoodsID || '',
+							batchNumber:selectedRecords[i].data.batchNumber || '',
+							type:selectedRecords[i].data.type || '',
+						})
+					}
+					top.Ext4.MessageBox.confirm('提示框', '是否推送选择的信息？', function(btn) {
+						if (btn == 'yes') {
+							Ext4.Ajax.request({
+								url: WWWROOT + '/disinfectSystem/diposablegoods/disposableGoodsController/pushChasDisposableGoodsInfo.mhtml',
+								method: 'POST',
+								headers: {
+									'Content-Type': 'application/json'
+								},
+								jsonData: JSON.stringify(arr),
+								success: function (response, options) {
+									var result = Ext.decode(response.responseText);
+									if(result.success){
+										listStore.loadPage(1);
+									}else {
+										showResult(result.message);
+									}
+								}
+							});
+						}
+					});
+				}
+			}
+		}],
+		selModel: new Ext4.selection.CheckboxModel(),
 		listeners: {
 			sortchange: function (ct, column, direction, eOpts) {
 				var arr = {};
@@ -153,6 +202,11 @@
 		}
 	});
 
+	if(!sstsConfig.enableChasSystemTagPush){
+		var toolbar = departGroupGrid.down('toolbar'); 
+		toolbar.hide();
+	}
+
 	//物品类型
 	var GoodsTypeData = [];
 	Ext4.Ajax.request({
@@ -281,7 +335,7 @@
 		border: 0,
 		frame: true,
 		bodyStyle: 'padding:0px auto;margin:0px',
-		height: 100,
+		height: sstsConfig.enableChasSystemTagPush ? 140 : 100,
 		id: 'form',
 		items: [{
 			layout: 'column',
@@ -449,8 +503,96 @@
 					value: '明细查询',
 					mode: 'local',
 					triggerAction: 'all',
+					anchor: '95%',
+					listeners:{
+						select:function(combo, record, index){
+							if(record[0].data.value == '明细查询'){
+								Ext4.getCmp('chasItemControlTagBox').show();
+								Ext4.getCmp('chasOrgControlTagBox').show();
+								Ext4.getCmp('chasPushResultBox').show();
+							}else {
+								Ext4.getCmp('chasItemControlTagBox').hide();
+								Ext4.getCmp('chasOrgControlTagBox').hide();
+								Ext4.getCmp('chasPushResultBox').hide();
+							}
+						}
+					}
+				}]
+			}, {
+				layout: 'form',
+				columnWidth: 0.25,
+				hidden:!sstsConfig.enableChasSystemTagPush,
+				id:'chasItemControlTagBox',
+				items: [{
+					xtype: 'combo',
+					labelWidth:120,
+					fieldLabel: 'CHAS 标记物品',
+					labelAlign: 'right',
+					id: 'chasItemControlTag',
+					name: 'chasItemControlTag',
+					valueField: 'value',
+					displayField: 'value',
+					store: new Ext4.data.SimpleStore({
+						fields: ['value'],
+						data: [['全部'], ['是'], ['否']]
+					}),
+					forceSelection: true,
+					editable: false,
+					value: '全部',
+					mode: 'local',
+					triggerAction: 'all',
 					anchor: '95%'
 				}]
+			}, {
+				layout: 'form',
+				columnWidth: 0.25,
+				hidden:!sstsConfig.enableChasSystemTagPush,
+				id:'chasOrgControlTagBox',
+				items: [{
+					xtype: 'combo',
+					fieldLabel: 'CHAS 标记科室',
+					labelWidth:120,
+					labelAlign: 'right',
+					id: 'chasOrgControlTag',
+					name: 'chasOrgControlTag',
+					valueField: 'value',
+					displayField: 'value',
+					store: new Ext4.data.SimpleStore({
+						fields: ['value'],
+						data: [['全部'], ['是'], ['否']]
+					}),
+					forceSelection: true,
+					editable: false,
+					value: '全部',
+					mode: 'local',
+					triggerAction: 'all',
+					anchor: '95%'
+				}]
+			}, {
+				layout: 'form',
+				columnWidth: 0.25,
+				hidden:!sstsConfig.enableChasSystemTagPush,
+				id:'chasPushResultBox',
+				items: [{
+					xtype: 'combo',
+					fieldLabel: 'CHAS 推送结果',
+					labelWidth:120,
+					labelAlign: 'right',
+					id: 'chasPushResult',
+					name: 'chasPushResult',
+					valueField: 'value',
+					displayField: 'value',
+					store: new Ext4.data.SimpleStore({
+						fields: ['value'],
+						data: [['　'], ['成功'], ['失败']]
+					}),
+					forceSelection: true,
+					editable: false,
+					value: '　',
+					mode: 'local',
+					triggerAction: 'all',
+					anchor: '95%'
+				}]
 			}]
 		}],
 		buttons: [{
@@ -502,6 +644,29 @@
 					params.invoiceDepartmentId = invoiceDepartmentId;
 				}
 
+				if(sstsConfig.enableChasSystemTagPush){
+					var chasItemControlTag = Ext4.getCmp('chasItemControlTag').getValue();
+					var chasOrgControlTag = Ext4.getCmp('chasOrgControlTag').getValue();
+					var chasPushResult = Ext4.getCmp('chasPushResult').getValue();
+					if(chasPushResult == '　'){
+						chasPushResult = '';
+					}
+					if(chasItemControlTag == '全部'){
+						chasItemControlTag = '';
+					}
+					if(chasOrgControlTag == '全部'){
+						chasOrgControlTag = '';
+					}
+					if(searchModel == '明细查询'){
+						params.chasItemControlTag = chasItemControlTag;
+						params.chasOrgControlTag = chasOrgControlTag;
+						params.chasPushResult = chasPushResult;
+					}else {
+						params.chasItemControlTag = '';
+						params.chasOrgControlTag = '';
+						params.chasPushResult = '';
+					}
+				}
 				search(listStore, params);
 			}
 		}, {
@@ -561,6 +726,27 @@
 					exportUrl += "&invoiceDepartmentId=" + invoiceDepartmentId;
 				}
 
+				if(sstsConfig.enableChasSystemTagPush){
+					var chasItemControlTag = Ext4.getCmp('chasItemControlTag').getValue();
+					var chasOrgControlTag = Ext4.getCmp('chasOrgControlTag').getValue();
+					var chasPushResult = Ext4.getCmp('chasPushResult').getValue();
+					if(chasPushResult == '　'){
+						chasPushResult = '';
+					}
+					if(chasItemControlTag == '全部'){
+						chasItemControlTag = '';
+					}
+					if(chasOrgControlTag == '全部'){
+						chasOrgControlTag = '';
+					}
+					if(searchModel == '明细查询'){
+						exportUrl += "&chasItemControlTag=" + chasItemControlTag;
+						exportUrl += "&chasOrgControlTag=" + chasOrgControlTag;
+						exportUrl += "&chasPushResult=" + chasPushResult;
+					}
+
+				}
+
 				location.href = exportUrl;
 			}
 		}]