Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r37457 -r37766
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 37457)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 37766)
@@ -18,6 +18,7 @@
 	$Id('parm_s_operatingRoom').value = $Id('query_operatingRoom').value;
 	$Id('parm_s_operationTime_start').value = $Id('query_operationTime_start').value;
 	$Id('parm_s_operationTime_end').value = $Id('query_operationTime_end').value;
+	$Id('parm_s_takeOutStatus').value = $Id('query_takeOutStatus').value;
 }
 //明细grid删除按钮
 function renderDeleteButton(v, p, record, rowIndex) {
@@ -1467,6 +1468,21 @@
 	editRecord(data['id'], data['committedStatus'], data['deliverStatus']);
 }
 
+//BJDXZLYY-52：取出状态
+function renderTakeOutStatusColor(v, p, record){
+	var status = record.data['takeOutStatus'];
+	var color = "";
+	var bgColor = "";
+	if (status == '已取出') {
+		bgColor = "green";
+		color = '#ffffff';
+	} else if (status == '已终止') {
+		bgColor = "red";
+		color = '#ffffff';
+	}
+	return '<p style="background-color:'+ bgColor +';color:'+ color +'">'+ v +'</p>';
+}
+
 Ext.onReady(function () {
 	Ext.QuickTips.init();
 	Ext4.tip.QuickTipManager.init();
@@ -1555,7 +1571,7 @@
 					anchor: '95%',
 					fieldLabel: '发货状态',
 					mode: 'local',
-					readOnly: true,
+					editable: false,
 					value: '全部',
 					triggerAction: 'all',
 					forceSelection: true,
@@ -1617,6 +1633,59 @@
 					format: 'Y-m-d',
 					anchor: '95%'
 				}]
+			}, {
+				columnWidth: .33,
+				layout: 'form',
+				labelWidth: 85,
+				labelAlign: "right",
+				hidden:!sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer,
+				items: [{
+					xtype: 'multiSelect',
+					id: 'query_takeOutStatus',
+					name: 'query_takeOutStatus',
+					valueField: 'value',
+					displayField: 'value',
+					anchor: '95%',
+					fieldLabel: '取出状态',
+					mode: 'local',
+					editable: false,
+					value: '全部',
+					triggerAction: 'all',
+					forceSelection: false,
+					store: new Ext.data.SimpleStore({
+						fields: ['value'],
+						data: [['全部'], ['空白'], ['待取出'], ['部分取出'], ['已取出'], ['已终止']]
+					}),
+					listeners:{
+						select: function (combo, record, index) {
+							//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
+							if (record.get('value') == '全部') {
+								if (record.get('checked')) {
+									combo.selectAll();
+								} else {
+									combo.deselectAll();
+								}
+							}
+
+							//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
+							var selectAll = true;
+							combo.store.each(function (record) {
+								if (record.get('value') != '全部' && !record.get(this.checkField)) {
+									selectAll = false;
+									return;
+								}
+							}, combo);
+
+							var all = combo.store.getAt(0);
+							if (selectAll) {
+								all.set(combo.checkField, true);
+							} else {
+								all.set(combo.checkField, false);
+							}
+							combo.setValue(combo.getCheckedValue());
+						}
+					}
+				}]
 			}]
 		}],
 		buttons: [
@@ -1640,6 +1709,8 @@
 					$Id('query_operatingRoom').value = "";
 					$Id('query_operationTime_start').value = "";
 					$Id('query_operationTime_end').value = "";
+					$Id('query_takeOutStatus').value = "全部";
+					Ext.getCmp('query_takeOutStatus').setValue('全部');
 				}
 			}
 		]
@@ -1662,6 +1733,7 @@
 		{ header: "手术时间", width: 120, dataIndex: 'operationTime', renderer: myDateFormatByMinute },
 		//{header : "手术编号",width : 120,dataIndex : 'scheduleId'},
 		{ header: "发货状态", width: 65, dataIndex: 'deliverStatus', renderer: renderColor },
+		{ header: "取出状态", width: 65, dataIndex: 'takeOutStatus',hidden:!sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer, renderer: renderTakeOutStatusColor },
 		{ id: 'remark', header: "备注", dataIndex: 'remark' }
 	];
 
@@ -1682,6 +1754,7 @@
 		{ name: 'consoleName' },
 		{ name: 'patientAge' },
 		{ name: 'deliverStatus' },
+		{ name: 'takeOutStatus' },
 		{ name: 'committedStatus' },
 		{ name: 'remark' }
 	];