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

src/components/TravelManager/TravelList/OpHotelOrderDetail.vue

 <style>
   .HotelSure {
     width: 1200px;
-    /* margin:20px auto; */
     padding: 0 20px 20px 20px;
     display: flex;
     background-color: white;
@@ -284,7 +283,6 @@
 
   .HS_RightBtm {
     width: 100%;
-    /* height:160px; */
     margin-top: 20px;
     overflow: hidden;
     border: 1px solid #E0E0E0;
@@ -393,7 +391,6 @@
 
 </style>
 
-
 <template>
   <div class="HotelSure" v-loading="loading">
     <div class="HS_LeftInfo">
@@ -410,18 +407,22 @@
             <li class="HS2_title">{{$t('objFill.v101.fangxingxxi')}}</li>
             <li>
               <div v-if="details.model.Source==4">
+                <template v-if="details.parmResultRoomInfo">
                   {{ getRoomType(details.parmResultRoomInfo.roomType) }}
+                </template>
               </div>
               <div v-else>
+                <template v-if="details.parmResult">
                   <template v-if="details.parmResult.roomType==1">{{$t('objFill.v101.danren')}}</template>
                   <template v-if="details.parmResult.roomType==2">{{$t('objFill.v101.shuangren')}}</template>
                   <template v-if="details.parmResult.roomType==3">{{$t('objFill.v101.shuang')}}</template>
                   <template v-if="details.parmResult.roomType==4">{{$t('objFill.shanrenjian')}}</template>
-                <template v-if="details.parmResult.roomType==5">4 {{$t('objFill.v101.chuang')}}</template>
+                  <template v-if="details.parmResult.roomType==5">{{$t('objFill.v101.chuang')}}</template>
                   <template v-if="details.parmResult.roomType==6">{{$t('objFill.v101.rishifangj')}}</template>
                   <template v-if="details.parmResult.roomType==7">{{$t('objFill.v101.heyangshi')}}</template>
                   <template v-if="details.parmResult.roomType==8">{{$t('objFill.v101.bankaifang')}}</template>
                   <template v-if="details.parmResult.roomType==9">{{$t('objFill.v101.qitade')}}</template>
+                </template>
               </div>
             </li>
           </ul>
@@ -430,9 +431,17 @@
           <ul>
             <li class="HS2_title">{{$t('objFill.ruzhuriqi')}}</li>
             <li>
-              <span>{{details.model.CheckIn.split('T')[0]}}</span>
+              <span>
+                <template v-if="details.model&&details.model.CheckIn&&details.model.CheckIn!=''">
+                  {{details.model.CheckIn.split('T')[0]}}
+                </template>
+              </span>
               <div class="HS_Line"></div>
-              <span>{{details.model.CheckOut.split('T')[0]}}</span>
+              <span>
+                <template v-if="details.model&&details.model.CheckOut&&details.model.CheckOut!=''">
+                  {{details.model.CheckOut.split('T')[0]}}
+                </template>
+              </span>
             </li>
           </ul>
         </div>
@@ -453,20 +462,57 @@
           <div>
             <label class="HS2_title">{{$t('objFill.v101.hote.yudingren')}}：</label>
             <div v-if="details.model.Source==4">
-              {{details.parmResultRoomInfo.guestLastName + details.parmResultRoomInfo.guestFirstName}}</div>
-            <div v-else> {{details.parmResult.guestLastName + details.parmResult.guestFirstName}}</div>
+              <template v-if="details.parmResultRoomInfo">
+                {{details.parmResultRoomInfo.guestLastName + details.parmResultRoomInfo.guestFirstName}}
+              </template>
+              <template
+                v-if="details.parmResultRoomInfo&&details.parmResultRoomInfo.GuestList&&details.parmResultRoomInfo.GuestList.length>0">
+                <template v-for="(item,index) in details.parmResultRoomInfo.GuestList">
+                  <el-row :key="`dp_`+index"  >
+                    <el-col  >
+                      房间 {{item.RoomNum}}:  <template v-for="(subItem,subIndex) in item.GuestInfo">
+                        {{subItem.LastName}} {{subItem.FirstName}}
+                        <template v-if="subItem.Age&&subItem.Age!=''">
+                          年龄：{{subItem.Age}}
+                        </template>
+                        <template v-if="subIndex!=item.GuestInfo.length-1">
+                          ,
+                        </template>
+                      </template>
+                    </el-col>
+                  </el-row>
+                </template>
+              </template>
+            </div>
+            <div v-else>
+              <template v-if="details.parmResult">
+                {{details.parmResult.guestLastName + details.parmResult.guestFirstName}}
+              </template>
+            </div>
           </div>
           <div>
             <label class="HS2_title">{{$t('objFill.v101.dangqiandzhi')}}：</label>
-            <div>{{details.parmResultRoomInfo.guestAddress}}</div>
+            <div>
+              <template v-if="details.parmResultRoomInfo">
+                {{details.parmResultRoomInfo.guestAddress}}
+              </template>
+            </div>
           </div>
           <div>
             <label class="HS2_title">Email：</label>
-            <div>{{details.parmResultRoomInfo.guestEmail}}</div>
+            <div>
+              <template v-if="details.parmResultRoomInfo">
+                {{details.parmResultRoomInfo.guestEmail}}
+              </template>
+            </div>
           </div>
           <div>
             <label class="HS2_title">{{$t('hotel.table_tel')}}：</label>
-            <div>{{details.parmResultRoomInfo.guestPhoneNumber}}</div>
+            <div>
+              <template v-if="details.parmResultRoomInfo">
+                {{details.parmResultRoomInfo.guestPhoneNumber}}
+              </template>
+            </div>
           </div>
           <div>
             <label class="HS2_title">{{$t('objFill.v101.busManagement.kehubeiz')}}：</label>
@@ -493,10 +539,11 @@
         <div class="HS_HtName">{{details.model.HotelName}}</div>
         <div class="HS_HAddress">
           <img src="../../../assets/img/hotel/redAddress.png" alt="" />
+          <template v-if="details.parmResult">
             {{details.parmResult.address}}
+          </template>
         </div>
       </div>
-
     </div>
   </div>
 </template>
@@ -510,31 +557,36 @@
           }
         },
         HotelRoomTypes: [],
-        loading: true
+        loading: true,
+        OrderID: 0,
       };
     },
-    mounted() {},
+    mounted() {
+      this.getDiDaOrderInfo();
+    },
     created() {
-      let id = this.$route.query.ID
+      if (this.$route.query.ID) {
+        this.OrderID = this.$route.query.ID;
+      }
+      this.getdidaBedType();
+    },
+    methods: {
+      getDiDaOrderInfo() {
         this.loading = true;
         this.apipost(
           "dmc_post_Get_GetJAPAN_OrderDetail", {
-          orderId: id
+            orderId: this.OrderID
           },
           res => {
             this.loading = false;
             if (res.data.resultCode == 1) {
               let data = res.data.data
-            if (res.data.data.model.Source == 4) {
-              this.getdidaBedType();
-            }
-            this.details = data
+              this.details = data;
             } else {
               this.Error(res.data.message);
             }
           })
       },
-    methods: {
       //获取道旅床类型列表
       getdidaBedType() {
         this.apipost(