页面修改

src/components/commonPage/comCheckHotelV2.vue

@@ -119,7 +119,6 @@
               <label :for="'H'+index+'_'+subIndex" style="cursor: pointer">{{subItem.Name}}</label>
               <span class="cm_Inventory">{{subItem.Inventory}}</span>
               <span class="cm_Inventory">剩余:{{subItem.RemainingInventory}}</span>
-              <span class="ck_goUrl" @click="goUrl(subItem.ID)">新增库存</span>
             </div>
           </div>
         </el-tab-pane>
@@ -128,15 +127,16 @@
         <table v-loading="loading" >
           <thead>
             <tr>
-              <th>选择</th>
-              <th>酒店名称</th>
-              <th>价格</th>
+              <th style="width:70px">选择</th>
+              <th style="width:200px">酒店名称</th>
+              <th style="width:100px">价格</th>
             </tr>
           </thead>
           <tbody>
-            <tr v-for="item in ThirdHotelList">
+            <tr v-for="(item,index) in ThirdHotelList">
               <td width="50">
-                <input :id="item.hotelId" type="checkbox" />
+                <input :id="item.hotelId" type="checkbox" v-model="item.isChecked"
+                @click="getCheck(ThirdHotelList,index)" />
               </td>
               <td width="150">{{item.hotelName}}</td>
               <td width="150">{{item.lowrateTotal}}</td>
@@ -206,8 +206,7 @@
     },
     methods: {
       getCheckHotel() {
-        this.loading = true;
-        this.IsShow = false;
+      
         this.dataList = [];
         this.HotelList = [];
         this.ThirdHotelList=[];
@@ -222,6 +221,8 @@
       },
       //查询地接酒店
       GetDMCHotelList() {
+       this.loading = true;
+        this.IsShow = false;
         this.apipost('hotel_post_GetHasStockHotelList_V2', {
           //1-只查询有库存的酒店
           IsMoreThanZero: 0,
@@ -229,7 +230,8 @@
           IsAllHotel: 1,
           Province: this.qMsg.ProvinceId,
           Name: this.qMsg.Name,
-          sDate: this.qMsg.UseDate
+          sDate: this.qMsg.UseDate,
+          IsGetPic:true,//获取图片
         }, res => {
           this.loading = false;
           this.IsShow = true;
@@ -247,7 +249,10 @@
       },
       //查询第三方酒店
       GetThirdHotelList() {
+        this.loading = true;
+        this.IsShow = false;
         this.thirdHotelMsg.arrivalDate=this.qMsg.UseDate;
+        this.ThirdHotelList=[];
         if (this.thirdHotelMsg.arrivalDate == "") {
           this.Info("请选择入住时间!");
           return;
@@ -282,7 +287,14 @@
           if (res.data.resultCode == 1) {
             //总条数
             this.thirdHotelMsg.numberOfResultMatched = Number(res.data.data.numberOfResultMatched);
-            this.ThirdHotelList = res.data.data.hotelSummary;
+            var newArray= res.data.data.hotelSummary;
+            if(newArray!=null && newArray.length>0)
+            {
+               newArray.forEach(item=>{
+                 item.isChecked=false;
+               });
+            }
+            this.ThirdHotelList =newArray;
           } else {
             this.Error(res.data.message)
           }
@@ -308,17 +320,27 @@
       sendCkedHotel() {
         var ckHotelObj = {};
         if (this.ckedHotel) {
-          ckHotelObj.ID = this.ckedHotel.ID;
-          ckHotelObj.Address = this.ckedHotel.Address;
-          ckHotelObj.Inventory = this.ckedHotel.Inventory;
-          ckHotelObj.Name = this.ckedHotel.Name;
-          ckHotelObj.PayStyle = this.ckedHotel.PayStyle;
-          ckHotelObj.Tel = this.ckedHotel.Tel;
-          ckHotelObj.RebateRatio = this.ckedHotel.RebateRatio;
-          ckHotelObj.RebateCount = this.ckedHotel.RebateCount;
-          ckHotelObj.CostPrice = this.ckedHotel.CostPrice;
+          //地接酒店
+          if(this.qHotelType==1)
+          {
+             ckHotelObj.HotelId = this.ckedHotel.ID;
+             ckHotelObj.HotelName = this.ckedHotel.Name;
+             ckHotelObj.Description=this.ckedHotel.Descriptions;
+             ckHotelObj.HotelProvideType=1;
+             ckHotelObj.imgList=this.ckedHotel.ImgList;
+          }
+          //第三方酒店
+          else if(this.qHotelType==2)
+          {
+             ckHotelObj.HotelId = this.ckedHotel.hotelId;
+             ckHotelObj.HotelName = this.ckedHotel.hotelName;
+             ckHotelObj.imgList=[];
+             ckHotelObj.imgList.push({Name:this.ckedHotel.hotelName,Url:this.ckedHotel.hotelImageUrl});
+             ckHotelObj.Description=this.ckedHotel.hotelDescription;
+             ckHotelObj.HotelProvideType=2;
+          }
         }
-        this.$emit("childHotel", ckHotelObj);
+        this.$emit("childHotelChange", ckHotelObj);
       },
       //获取日本下面的市->下拉框用
       getProvinceList() {
@@ -335,22 +357,9 @@
           err => {}
         );
       },
-      goUrl(ID) {
-        this.$router.push({
-          path: 'HotelProductManage2',
-          query: {
-            id: ID,
-            Country: 651,
-            IsSelfBook: 1,
-            blank: 'y',
-            tab: '报价详情'
-          }
-        });
-      }
     },
     mounted() {
       this.getProvinceList();
     }
   };
-
-</script>
+</script>
\ No newline at end of file

src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue

@@ -109,11 +109,11 @@
                     <span v-if="IsDirect==1">
                       <hotelTrip v-bind:subItemObj="subItem" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
                         v-bind:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
-                        v-bind:subTotalIndex="item.dayArray.length" ></hotelTrip>
-                         
+                        v-bind:subTotalIndex="item.dayArray.length"></hotelTrip>
+                       <!---->  
                       <hotelTripV2 v-bind:subItemObj="subItem" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
                         v-bind:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
-                        v-bind:subTotalIndex="item.dayArray.length" style="display:none;"></hotelTripV2>
+                        v-bind:subTotalIndex="item.dayArray.length"  style="display:none;"></hotelTripV2>
                     </span>
                     <span v-else>
                     </span>