Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/VisaFinancialDocuments.vue

@@ -423,12 +423,6 @@ export default {
     },
   }, mounted() {
     this.userId = this.getLocalStorage().EmployeeId;
-    // let obj = this.$route.query.item ? JSON.parse(this.$route.query.item) : ''
-    // this.item = obj
-    // this.orderId = this.msg.OrderID = obj.orderId ? obj.orderId : obj.OrderId
-    // this.tcnum = obj.tcnum ? obj.tcnum : obj.TCNUM
-    // this.tcid = obj.tcid ? obj.tcid : obj.TCID
-    // this.outBranchId = obj.outBranchId ? obj.outBranchId : obj.OutBranchId;
 
      this.tcid= this.$route.query.TCID;
      this.OutBranchId=this.$route.query.OutBranchId;

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -1095,11 +1095,12 @@ export default {
   },
 
   mounted() {
+    
     this.initCity();
     this.getNeedType();
     this.initTicketType();
     this.initAirline();
-    this.getList();
+    this.getList(); 
   }
 };
 </script>