Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r23772 -r23799
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 23772)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 23799)
@@ -2,6 +2,7 @@
 var foreignTousseForm;
 var foreignTousseApplyWindow;
 var applyDepartJsonStore;
+var handleDepartStore;
 var settleDepartJsonStore;
 var supplierType = '外来器械租用商';
 var supplierContacJsonStore;
@@ -299,7 +300,15 @@
     var patientArea =  top.Ext4.getCmp('patientArea').getValue();
     var doctor =  top.Ext4.getCmp('doctor').getValue();
     var surgery =  top.Ext4.getCmp('surgery').getValue();
-    var operationTime = new Date(top.Ext4.getCmp('operationTime').getValue()).Format("yyyy-MM-dd hh:mm");
+    //simon-edit
+    var operationTimeStr=top.Ext4.getCmp('operationTime').getValue();
+    var operationTime;
+    if(operationTimeStr==null){
+    	operationTime='';
+    }else{
+    	operationTime = new Date(operationTimeStr).Format("yyyy-MM-dd hh:mm");
+    }
+    
     var supplierContactName = top.Ext4.getCmp('supplierContactName').getValue();
     var supplierPhoneNumber = top.Ext4.getCmp('supplierPhoneNumber').getValue();
     
@@ -1428,6 +1437,8 @@
 	    folderSort: true
 	});
 	
+	
+	
 	settleDepartJsonStore = new Ext4.data.JsonStore({
 		autoLoad: true,
 		proxy : {
@@ -1463,7 +1474,24 @@
 		  ]
 	});
 	
-
+	//simon-add:处理科室数据源
+	 handleDepartStore = new Ext4.data.JsonStore({
+		autoLoad: true,
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getfTHandleDepartAndTaskGroupJsonArray.do',
+			reader : {
+				type : 'json',
+				root : 'data'
+			}
+		},
+		fields : [
+		    {name : 'handleDepartCoding',mapping : 'departCode'},
+		    {name : 'handleDepart',mapping : 'departName'},
+		    {name : 'taskGroup',mapping : 'taskGroup'}
+		]
+	});
+	
 	//处理方式的store
 	var processTypeJsonStore = new Ext4.data.Store({
 		fields : [ 'typeName' ],
@@ -1512,6 +1540,8 @@
 						{xtype : 'hidden',name : 'id',id : 'id'},
 						{xtype : 'hidden',fieldLabel : '科室编号 ',name : 'departCoding',id : 'departCoding'},
 						{xtype : 'hidden',fieldLabel : '结算科室编号',name : 'settleAccountsDepartCoding',id : 'settleAccountsDepartCoding'},
+						//simon-add
+						{xtype : 'hidden',fieldLabel : '处理科室编号',name : 'handleDepartCoding',id : 'handleDepartCoding'},
 						{xtype : 'hidden',name : 'foreignTousseInfo',id : 'foreignTousseInfo'},
 						{xtype : 'hidden',name : 'barcodeStr',id : 'barcodeStr'},
 						{
@@ -1548,7 +1578,7 @@
 					]
 				},{
 					xtype : 'container',
-					width : 730,
+					width : 800,
 					layout : 'hbox',
 					flex : 1,
 					items : [{
@@ -1631,7 +1661,40 @@
 								thiz.selectText();
 							}
 						}
-					},{
+					},
+					{
+						xtype : 'combo',
+						fieldLabel : '处理科室',
+						id : 'handleDepart',
+						name : 'handleDepart',
+						minChars : 0,
+						valueField : 'handleDepart',
+						displayField : 'handleDepart',
+						store : handleDepartStore,
+						forceSelection : false,
+						lazyInit : true,
+						triggerAction : 'all',
+						hideTrigger : false,
+						typeAhead : false,
+						allowBlank : false,
+						flex : 1,
+						listeners:{
+							select:function(combo, records, index){
+//								resetComboData({val : record[0].get('departName'),property : 'departName'}, handleDepartStore, {'departCode' : 'departCode'});
+//								var handleDepart=record[0].get('departName');
+								var record = transformRecords(records);
+								var handleDepart=record.data.handleDepart;
+								var handleDepartCoding=record.data.handleDepartCoding;
+								console.log(handleDepart+".."+handleDepartCoding);
+								top.Ext4.getCmp("handleDepart").setValue(handleDepart);
+								top.Ext4.getCmp("handleDepartCoding").setValue(handleDepartCoding);
+							},
+							focus : function(thiz){
+								thiz.selectText();
+							}
+						}						
+					},
+					{
 							xtype : 'combo',
 							fieldLabel : '处理方式',
 							id : 'processType',