页面修改

src/components/LeaveGroupDownload/index.vue

@@ -80,44 +80,26 @@
                 <td class="essential-item jianju">
                   <p class="pkey">本团领队</p>
                   <p class="pvalue">
-                    {{
-                          orderTripdiff != null
-                            ? orderTripdiff.leaderInfo
-                            : orderMsg.leaderName +
-                              (orderMsg.leaderMobile != null
-                                ? "/" + orderMsg.leaderMobile
-                                : "")
-                        }}
+                    {{orderMsg.leaderInfo}}
                   </p>
                 </td>
                 <td class="essential-item jianju">
                   <p class="pkey">集合时间</p>
                   <p class="pvalue">
-                    {{
-                          orderTripdiff != null
-                            ? orderTripdiff.gatheringTime
-                            : orderMsg.gatheringTime
-                        }}
+                    {{ orderMsg.gatheringTimeInfo }}
                   </p>
                 </td>
                 <td class="essential-item jianju">
                   <p class="pkey">机场服务</p>
                   <p class="pvalue">
-                    <template v-if="orderTripdiff&& orderTripdiff.airportService&& orderTripdiff.airportService!=''">
-                      {{ orderTripdiff.airportService}}
-                    </template>
-                    <template v-else-if="orderMsg&&orderMsg.airportServicePerson&&orderMsg.airportServicePerson!=''">
-                      {{orderMsg.airportServicePerson+"/"+    orderMsg.airportServicePhone}}}
-                    </template>
+                    {{orderMsg.airportServiceInfo}}
                   </p>
                 </td>
                 <td class="essential-item jianju_b">
                   <p class="pkey">集合标识</p>
                   <p class="pvalue">
                     {{
-                          orderTripdiff != null
-                            ? orderTripdiff.gatherIdent
-                            : orderMsg.bName
+                      orderMsg.gatherIdentInfo
                     }}
                   </p>
                 </td>
@@ -127,23 +109,14 @@
                   <p class="pkey">紧急联系人</p>
                   <p class="pvalue">
                     <span v-if="vshowLLR">
-                      <template v-if="orderTripdiff!=null&&orderTripdiff.emergencyContact!=''">
-                        {{orderTripdiff.emergencyContact}}
-                      </template>
-                      <template v-else-if="orderMsg.branchManager!=''&&orderMsg.mobilePhone!=''">
-                        {{orderMsg.branchManager+"/"+orderMsg.mobilePhone}}
-                      </template>
+                      {{orderMsg.emergencyContactInfo}}
                     </span>
                   </p>
                 </td>
                 <td class="essential-item jianju_b" colspan="2">
                   <p class="pkey">集合地点</p>
                   <p class="pvalue">
-                    {{
-                          orderTripdiff != null
-                            ? orderTripdiff.gatheringAddress
-                            : orderMsg.gatheringAddress
-                        }}
+                    {{ orderMsg.gatheringAddressInfo}}
                   </p>
                 </td>
               </tr>