11

src/components/Hotel/roomReservationsDetails.vue

@@ -38,6 +38,7 @@
     top: 0;
     z-index: 10;
   }
+
 </style>
 
 <template>
@@ -67,7 +68,7 @@
               &nbsp;&nbsp;{{$t('leader.leader_Guide')}}: {{GuideName}} </th>
             <th class="fz14" style="border:none;">
               <el-tooltip class="item" effect="dark" :content="$t('objFill.piliangscsps')" placement="top-start"
-                style="float:left;margin-left:20px;">
+                style="float:left;margin-left:20px;display:none;">
                 <el-popover placement="bottom" popper-class="piliangPop" width="500" trigger="click"
                   v-model="isShowPiliangPop">
                   <table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0">
@@ -102,7 +103,7 @@
                 </el-popover>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" :content="$t('ground.plxgai')" placement="top-start"
-                style="float:left;margin-left:20px;">
+                style="float:left;margin-left:20px;display:none;">
                 <el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click"
                   v-model="IsShowMoreUpdate">
                   <table class="dmcSetTable roomReserSet roomResetTable" border="0" cellspacing="0" cellpadding="0">
@@ -328,25 +329,30 @@
                     :disabled="IsEditHotelPeople==0?true:false">
                   </el-input>
                 </td>
-                <!-- 尚差房间数 -->
-                <!-- <td>
-                <p class="pHouseStyle"
-                  :class="{colorRed:childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount<0}">
-                  {{childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount}}
-                </p>
-              </td> -->
                 <!-- 单价/每人 -->
                 <td>
                   <template v-if="childIndex==1">
-                    <template v-if="EditBtn||LineId==90">
-                      <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
-                        @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
+                    <template v-if="(subItem.LineId==14||subItem.LineId==118)&&subItem.HotelBookType==2">
+                      <template v-if="subItem.IsHaveHotelStock==1">
+                        <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
+                          @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
+                      </template>
+                      <template v-else>
+                        <el-popover placement="right" width="540" trigger="click"
+                          :ref="'elPopoverEditHotelPrice'+index+subIndex+''">
+                          <set-hotel-stock :ref="'comSetHotelPrice'+index+subIndex+''" :UseDate="item.UseTimeStr"
+                            :HotelId="subItem.NewHotelId" :HotelName="subItem.NewHotelName" @success="GetNewHotelPrice">
+                          </set-hotel-stock>
+                          <el-button size="small" type="danger" :data-index="'comSetHotelPrice'+index+subIndex+''"
+                            slot="reference" @click="subItem.isShowHStock=true">
+                            添加报价
+                          </el-button>
+                        </el-popover>
+                      </template>
                     </template>
                     <template v-else>
                       <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
-                        @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
-                        :disabled="(IsEditHotel==0||childItem.IsHaveStockPrice==1)?true:false">
-                      </el-input>
+                        @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
                     </template>
                   </template>
                   <template v-else>
@@ -642,13 +648,14 @@
         <p>{{$t('active.ld_noData')}}</p>
       </div>
     </div>
+
   </div>
 </template>
 <script>
   import moment from 'moment'
   import comCheckHotel from "../commonPage/comCheckHotel.vue";
   import commonHotelLog from "../commonPage/commonHotelLog.vue";
-  import commonPHlInfo from "../commonPage/commonPriceHotelInfo.vue";
+  import setHotelStock from "../commonPage/setHotelStock.vue";
   export default {
     data() {
       return {
@@ -742,7 +749,7 @@
     components: {
       comCheckHotel,
       commonHotelLog,
-      commonPHInfo: commonPHlInfo
+      setHotelStock,
     },
     methods: {
       //批量修改房间数和房间人
@@ -858,6 +865,10 @@
           }
         }, err => {})
       },
+      GetNewHotelPrice(newHPObj) {
+        console.log("newHPObj", newHPObj);
+        this.getList();
+      },
       //点击酒店选择
       getChildHotel(index, subIndex) {
         this.findex = index;
@@ -1000,7 +1011,7 @@
           }
         }
         this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
-          console.log("dmcstatistics_get_GetHotelStaticsDetail_V2",res.data);
+          console.log("dmcstatistics_get_GetHotelStaticsDetail_V2", res.data);
           if (res.data.resultCode == 1) {
             this.IsOperation = res.data.data.IsOperation;
             if (this.IsEditHotel == 0) {
@@ -1036,6 +1047,7 @@
                     subItem.ReserveNo = this.$route.query.NewCombinationNum;
                   }
                   subItem.isShowPop = false;
+                  subItem.isShowHStock = false;
                   subItem.ckedHotelName = "";
                   //遍历手配
                   this.SupplierList.forEach(x => {
@@ -1300,6 +1312,7 @@
       this.getList();
     }
   }
+
 </script>
 <style>
   .roomReservationsDetailsTalbe {
@@ -1371,4 +1384,5 @@
   .roomReservationsDetailsTalbe .hotelTable tr td {
     border: none;
   }
-</style>
+
\ No newline at end of file
+</style>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -670,7 +670,7 @@
                   </p>
                   <p class="travelnowrap">
                     <span>{{ $t("Airticket.Air_StartTime") }}</span>
-                    <span class="go_date">{{ item.StartDate }}</span>
+                    <span class="go_date">{{ item.StartDate }}(<font style="color:red;">{{item.StartDateWeekStr}}</font)</span>
                     <template v-if="item.RelationPriceList && item.RelationPriceList.length > 0">
                       <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
                         <el-popover width="350" trigger="click" popper-class="TC_HotelPop">

src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue

@@ -158,12 +158,14 @@
           <td valign="middle" colspan="5">
             <!--日本线酒店-->
             <template v-if="PostConfig.LineId==14||PostConfig.LineId==118">
-              <el-select placeholder="预定方式" v-model="hotelArray[0].HotelBookType" @change="ChangeHotelBookType"
-                style="width:100px;display:none;">
-                <el-option :value="0" :key="0" label="请选择"></el-option>
-                <el-option :value="1" :key="1" label="自订"></el-option>
-                <el-option :value="2" :key="2" label="PIC预订"></el-option>
-              </el-select>
+              <template v-if="hotelArray&&hotelArray.length>0">
+                <el-select placeholder="预定方式" v-model="hotelArray[0].HotelBookType" @change="ChangeHotelBookType"
+                  style="width:100px;display:none;">
+                  <el-option :value="0" :key="0" label="请选择"></el-option>
+                  <el-option :value="1" :key="1" label="自订"></el-option>
+                  <el-option :value="2" :key="2" label="PIC预订"></el-option>
+                </el-select>
+              </template>
               <el-select v-if="!dayObj.isRead &&IsDirect==1&&TeamType!=2" class="Ht_hotelSelect" style="width:290px;"
                 size="mini" v-model="HotelChooseArray" multiple :multiple-limit="(TeamType==0||TeamType==3)?3:1"
                 @visible-change="getHotelList($event)" @change="changeHotelList()" filterable