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

src/components/Hotel/DiDa/HotelSure.vue

@@ -835,6 +835,7 @@ export default {
         //备注
         guestRequest: "",
         hotelId:'',
+        roomType:0,
       },
       auditNum: 0,
       childNum: 0,
@@ -924,6 +925,7 @@ export default {
       this.sureMsg.EmployeeIdStr =this.getLocalStorage().EmployeeId+"";
       this.sureMsg.totalRoomCount = this.params.searchroomGroup.length;
       this.sureMsg.CheckOutDate = this.params.CheckOutDate;
+      this.sureMsg.roomType = this.roomRateDetails.RatePlanList[0].BedType;
       //判断选择的人数与入住人数
       let Count1 = 0;
       this.sureMsg.GuestList.forEach(item => {

src/components/TravelManager/TravelList/OpHotelOrderDetail.vue

@@ -344,7 +344,10 @@
                     <ul>
                         <li class="HS2_title">房型信息</li>
                         <li>
-                            <div>
+                            <div v-if="details.model.Source==4">
+                                {{ getRoomType(details.parmResultRoomInfo.roomType) }}
+                            </div>
+                            <div v-else>
                                 <template v-if="details.parmResult.roomType==1">单人</template>
                                 <template v-if="details.parmResult.roomType==2">双人</template>
                                 <template v-if="details.parmResult.roomType==3">双</template>
@@ -384,7 +387,8 @@
                 <div>
                   <div>
                     <label class="HS2_title">预订人：</label>
-                    <div>{{details.parmResult.guestLastName + details.parmResult.guestFirstName}}</div>
+                    <div v-if="details.model.Source==4">{{details.parmResultRoomInfo.guestLastName + details.parmResultRoomInfo.guestFirstName}}</div>
+                    <div v-else> {{details.parmResult.guestLastName + details.parmResult.guestFirstName}}</div>
                   </div>
                   <div>
                     <label class="HS2_title">当前地址：</label>
@@ -439,6 +443,7 @@ export default {
           ThirdOrderNo: ''
         }
       },
+      HotelRoomTypes:[],
       loading: true
     };
   },
@@ -454,6 +459,10 @@ export default {
       this.loading = false;
       if (res.data.resultCode == 1) {
         let data = res.data.data
+        if(res.data.data.model.Source==4){
+            this.getdidaBedType();
+        }
+        console.log("data",data);
         this.details = data
       } else {
           this.Error(res.data.message);
@@ -461,7 +470,32 @@ export default {
     })
   },
   methods: {
-    
+      //获取道旅床类型列表
+      getdidaBedType() {
+      this.apipost(
+        "dmc_post_GetDidaBedTypeBaseInfo",
+        this.hotelMsg,
+        res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+            this.HotelRoomTypes = res.data.data;
+          }
+        },
+        null
+      );
+    },
+    //获取房型
+    getRoomType(roomtypeId) {
+      let roomtypeName = "";
+      if (roomtypeId > 0) {
+        this.HotelRoomTypes.forEach(item => {
+          if (item.ID == roomtypeId) {
+            roomtypeName = item.Name_CN;
+          }
+        });
+      }
+      return roomtypeName;
+    },
   }
 };
 </script>