| 
					
				 | 
			
			
				@@ -44,7 +44,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-button size="mini" @click="auditPayRemain()" >尾款审核</el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <div class="operate-button-container" > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          <el-button size="mini" @click="editDelivery()"  v-hasPermi="['store:storeOrder:editDeliveryId']" >修改物流单号</el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-button size="mini" @click="editDelivery()"  v-hasPermi="['store:storeOrder:editDeliveryId']" >修改物流</el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <div class="operate-button-container" v-if="order.status >=1 && order.extendOrderId == null && order.deliveryId == null"  v-hasPermi="['store:storeOrder:createErpOrder']"  > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-button size="mini" @click="addErpOrder()" >创建ERP订单信息</el-button> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -372,10 +372,23 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </el-dialog> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <el-dialog :title="editDy.title" :visible.sync="editDy.open" width="600px" append-to-body> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-form ref="editDyForm" :model="editDyForm" :rules="editDyRules" label-width="100px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-form ref="editDyForm" :model="editDyForm" :rules="editDyRules" label-width="120px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <div  v-hasPermi="['store:storeOrder:updateErpOrder']"  style="margin-bottom: 20px;" > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-button size="mini" @click="updateErpOrder" >同步物流单号信息</el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-form-item label="物流公司" prop="deliverySn" > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+           <el-select style="width:220px" v-model="editDyForm.deliverySn" placeholder="请选择" clearable size="small"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-option key="SF"  label="顺丰" value="SF" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-option key="EMS"  label="邮政" value="EMS" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+             <el-option key="ZTO"  label="中通" value="ZTO" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+             <el-option key="JD"  label="京东" value="JD" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+             <el-option key="DBL"  label="德邦" value="DBL" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+           </el-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+         </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-form-item label="物流单号" prop="deliveryId"  > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-input v-model="editDyForm.deliveryId" placeholder="请输入物流单号" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-form> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <div slot="footer" class="dialog-footer"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-button type="primary" @click="submitEditDyForm">确 定</el-button> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -461,7 +474,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <script> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import {auditPayRemain,addTuiMoney,syncExpress,updateExpress,getEroOrder,refundOrderMoney, editTuiMoney,getExpress,finishOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,updateDeliveryId, createErpOrder} from "@/api/store/storeOrder"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import {auditPayRemain,addTuiMoney,syncExpress,updateExpress,getEroOrder,refundOrderMoney, editTuiMoney,getExpress,finishOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,updateDeliveryId, createErpOrder,updateErp} from "@/api/store/storeOrder"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { getTcmScheduleList } from "@/api/company/schedule"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   name: "order", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -491,6 +504,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         open:false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       editDyForm:{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        deliverySn:null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         deliveryId:null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       editForm:{ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -503,6 +517,9 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       editDyRules:{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        deliverySn: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { required: true, message: "物流公司不能为空", trigger: "blur" } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         deliveryId: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           { required: true, message: "物流单号不能为空", trigger: "blur" } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ], 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -571,6 +588,21 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           this.getOrder(this.order.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }).catch(function() {}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    updateErpOrder(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      var that=this; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.$confirm('确定同步物流单号信息吗', "警告", { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          confirmButtonText: "确定", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          cancelButtonText: "取消", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          type: "warning" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }).then(function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          var data={orderId:that.order.id} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          return updateErp(data); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }).then(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          this.msgSuccess("操作成功"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          this.getOrder(this.order.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          this.editDy.open = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }).catch(function() {}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     updateExpress(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       var that=this; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.$confirm('确定同步物流信息吗,同步后将自动发货', "警告", { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -750,6 +782,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.editDy.open = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.editDyForm.id = this.order.id; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.editDyForm.deliveryId = this.order.deliveryId; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.editDyForm.deliverySn = this.order.deliverySn; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getOrder(orderId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.orderId=orderId; 
			 |