| 
					
				 | 
			
			
				@@ -456,7 +456,10 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const fId = row.fId || this.ids 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       getWarehouse(fId).then(response => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.form = response.data['tWarehouse']; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.contactList = response.data['tWarehouseArea']; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        var contactList1 = response.data['tWarehouseArea']; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(contactList1!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          this.contactList=contactList1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.open = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.title = "修改仓库"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.form.fCharg = this.form.fCharg == '1' ? '是' : '否' 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -471,6 +474,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (valid) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           if (this.form.fId != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.form.fCharg = this.form.fCharg == '是' ? '1' : '0' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             let formDate= new FormData() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             formDate.append('tWarehouse',JSON.stringify(this.form)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             formDate.append('tWarehouseArea',JSON.stringify(this.contactList)); 
			 |