| 
					
				 | 
			
			
				@@ -316,7 +316,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </el-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-form-item label="状态" prop="status" v-if="order.status >=1"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-           <el-select style="width:220px" filterable v-model="editForm.status" placeholder="请选择状态" clearable size="small"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+           <el-select style="width:220px" v-model="editForm.status" placeholder="请选择状态" clearable size="small"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <el-option key="2"  label="待收货" value="2" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </el-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-form-item> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -451,6 +451,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       editForm:{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         orderType:null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        status:null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         mark:"", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -665,7 +666,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.edit.open=true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.editForm.mark=this.order.mark 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.editForm.orderType=this.order.orderType.toString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.editForm.status = this.order.status; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.editForm.status = this.order.status.toString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.editForm.id=this.order.id; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //推送管易按钮 
			 |