页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1556,12 +1556,9 @@
         }
         if(type){//新增报价单
           query.TeamType = 0
-          query.configld = item.ID
           query.TCID = item.TCID
           query.LineID = item.LineID
-          query.LineName = item.LineName
           query.ltID = item.ltID
-          query.LtName = item.LtName
           query.DayNum = item.DayNum
           query.OutDateTime = item.StartCityTime
           query.OutBranchId = item.OutBranchId

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -232,6 +232,7 @@
           "travel_get_GetMyTravelInfo_V4",
           msg,
           res => {
+            console.log("travel_get_GetMyTravelInfo_V4", res.data);
             this.loading = false;
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
@@ -266,15 +267,10 @@
                 this.postData.NightNum = tempData.NightNum;
               }
               this.postData.CustomerName = tempData.CustomerName;
-              if (tempData.OutBranchId != null) {
-                this.postData.OutBranchId = Number(tempData.OutBranchId)
+              if (tempData.OutBranchId && tempData.OutBranchId >= 0) {
+                this.postData.OutBranchId = tempData.OutBranchId;
               }
-              if (this.$route.query.OutBranchId != undefined && this.$route.query.OutBranchId != null && this.postData
-                .OutBranchId == -1) {
-                this.postData.OutBranchId = Number(this.$route.query.OutBranchId)
-              }
-              this.postData.OutDateTime = tempData.OutDateTime ? tempData.OutDateTime : this.$route.query
-                .OutDateTime ? this.$route.query.OutDateTime : null;
+
               this.postData.OfferPayType = tempData.OfferPayType;
               this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
               this.postData.TravelState = tempData.TravelState;
@@ -294,8 +290,33 @@
       },
     },
     created() {
-      this.postData.OfferId = this.$route.query.offerid > 0 ? this.$route.query.offerid : 0
+      this.postData.OfferId = this.$route.query.offerid > 0 ? this.$route.query.offerid : 0;
       this.getPostData();
+      //从团控列表跳转信息
+      if (this.$route.query.TeamType && this.$route.query.TeamType >= 0) {
+        this.postData.TeamType = Number(this.$route.query.TeamType);
+      }
+      if (this.$route.query.TCID && this.$route.query.TCID > 0) {
+        this.postData.TCID = this.$route.query.TCID
+      }
+      if (this.$route.query.LineID && this.$route.query.LineID > 0) {
+        this.postData.LineId = Number(this.$route.query.LineID);
+      }
+      if (this.$route.query.ltID && this.$route.query.ltID > 0) {
+        this.postData.LineteamId = Number(this.$route.query.ltID);
+      }
+      if (this.$route.query.DayNum && this.$route.query.DayNum > 0) {
+        this.postData.DayNum = this.$route.query.DayNum;
+      }
+      if (this.$route.query.OutDateTime && this.$route.query.OutDateTime != '') {
+        this.postData.OutDateTime = this.$route.query.OutDateTime;
+      }
+      if (this.$route.query.OutBranchId && this.$route.query.OutBranchId > 0) {
+        this.postData.OutBranchId = Number(this.$route.query.OutBranchId);
+      }
+      //团控列表跳转参数结束
+      console.log("this.post", this.postData);
+
     },
     components: {
       DirectNewQuotation: DirectNewQuotation

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -396,15 +396,15 @@
             </ul>
             <!-- 日期 -->
             <ul class="days">
-              <li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
+              <li class="liList" v-for="(dayobject,index) in days" :key="index+1000">
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
                   class="other-month">{{dayobject.day.getDate()}}</span>
-                  <!-- @click="clickedDay(dayobject)"-->
+                  <!---->
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
-                 >{{dayobject.day.getDate()}}</span>
-                 <!--@click="clickedDay(dayobject)"-->
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                 <!---->
                 <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
-                  >{{dayobject.day.getDate()}}</span>
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
               </li>
             </ul>
           </div>

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -395,15 +395,15 @@
             </ul>
             <!-- 日期 -->
             <ul class="days">
-              <li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
+              <li class="liList" v-for="(dayobject,index) in days" :key="index+1000">
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
                   class="other-month">{{dayobject.day.getDate()}}</span>
-                <!--@click="clickedDay(dayobject)"-->
+                <!---->
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.checked"
-                  class="checked1">{{dayobject.day.getDate()}}</span>
-                <!--@click="clickedDay(dayobject)"-->
+                  class="checked1" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                <!---->
                 <span
-                  v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue">{{dayobject.day.getDate()}}</span>
+                  v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
               </li>
             </ul>
           </div>

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -381,15 +381,15 @@
             </ul>
             <!-- 日期 -->
             <ul class="days">
-              <li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
+              <li class="liList" v-for="(dayobject,index) in days" :key="index+1000">
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
                   class="other-month">{{dayobject.day.getDate()}}</span>
-                <!--@click="clickedDay(dayobject)"-->
+                <!---->
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.checked"
-                  class="checked1">{{dayobject.day.getDate()}}</span>
-                <!--@click="clickedDay(dayobject)"-->
+                  class="checked1" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                <!---->
                 <span
-                  v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue">{{dayobject.day.getDate()}}</span>
+                  v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
               </li>
             </ul>
           </div>