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

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2807,7 +2807,7 @@
                           SetNoticeMsg.OutNotice == 1 ? "OK" : "暂定"
                         }})
                         </a> -->
-                        <a v-if="(item.outNotice == 1&&childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>1)||(uItem.TicketUnionId&&uItem.TicketUnionId>0)"
+                        <a v-if="(SetNoticeMsg.OutNotice == 1&&childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>1)||(uItem.TicketUnionId&&uItem.TicketUnionId>0)"
                           @click="toTrip(childItem,uItem.TicketUnionId,uItem.GuestIds)"
                           style="cursor:pointer;text-decoration:underline;color:green;">
                           {{ $t("Operation.Op_teamNotice") }}({{