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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1040,11 +1040,7 @@
 
       //新获取列表数据
       getControlList () {
-        if (this.flagWangYue) {
-          this.queryCommonData.flightCKed = []
-          this.queryCommonData.flightCKed.push(0)
-          this.queryMsg.FlightState = 0
-        }
+   
         var msg = JSON.parse(JSON.stringify(this.queryMsg))
         if (msg.TeamMinNum == '') {
           msg.TeamMinNum = -1
@@ -1652,17 +1648,12 @@
       this.queryMsg.IsShowUnion = 1
       let userInfo = this.getLocalStorage()
       this.CurrentUserInfo = userInfo
-      this.flagWangYue = this.$route.query.flag
+ 
       this.$route.query.tcmun = this.$route.query.tcmun
       if (this.$route.query.tcmun) {
         this.queryMsg.TCNUM = this.$route.query.tcmun
       }
-      if (this.flagWangYue) {
-        this.queryMsg.CreateBy = this.CurrentUserInfo.EmployeeId
-        this.queryCommonData.checkTCStateAll = true
-        this.flightStatus[1].Checked = false
-        this.checkAllTeam()
-      }
+ 
       if (this.CurrentUserInfo.IsParentCompany == undefined) {
         this.queryCommonData.IsParentCompany = 2
       } else {

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -1039,11 +1039,7 @@
 
       //新获取列表数据
       getControlList () {
-        if (this.flagWangYue) {
-          this.queryCommonData.flightCKed = []
-          this.queryCommonData.flightCKed.push(0)
-          this.queryMsg.FlightState = 0
-        }
+ 
         var msg = JSON.parse(JSON.stringify(this.queryMsg))
         if (msg.TeamMinNum == '') {
           msg.TeamMinNum = -1
@@ -1642,17 +1638,12 @@
       this.queryMsg.IsShowUnion = 1
       let userInfo = this.getLocalStorage()
       this.CurrentUserInfo = userInfo
-      this.flagWangYue = this.$route.query.flag
+      
       this.$route.query.tcmun = this.$route.query.tcmun
       if (this.$route.query.tcmun) {
         this.queryMsg.TCNUM = this.$route.query.tcmun
       }
-      if (this.flagWangYue) {
-        this.queryMsg.CreateBy = this.CurrentUserInfo.EmployeeId
-        this.queryCommonData.checkTCStateAll = true
-        this.flightStatus[1].Checked = false
-        this.checkAllTeam()
-      }
+ 
       if (this.CurrentUserInfo.IsParentCompany == undefined) {
         this.queryCommonData.IsParentCompany = 2
       } else {