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

src/components/SalesModule/groupTourOrder.vue

@@ -2266,7 +2266,11 @@
                   <div :key="uIndex+20000">
                     {{uItem.guestNames}} 航班信息：
                     <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span>
-                    <a v-if="uItem.ticketUnionId&&uItem.ticketUnionId>0" @click="toTrip(item,uItem.ticketUnionId)"
+                    <!-- <a v-if="uItem.ticketUnionId&&uItem.ticketUnionId>0" @click="toTrip(item,uItem.ticketUnionId,uItem.GuestIds)"
+                      style="cursor:pointer;text-decoration:underline;color:green;">
+                      {{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
+                    </a> -->
+                    <a v-if="(item.orderGuestFlightList&&item.orderGuestFlightList.length>1&&item.outNotice == 1)||(uItem.ticketUnionId&&uItem.ticketUnionId>0)" @click="toTrip(item,uItem.ticketUnionId,uItem.guestIds)"
                       style="cursor:pointer;text-decoration:underline;color:green;">
                       {{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
                     </a>
@@ -2521,6 +2525,7 @@
           cityId: 0,
           orderId: 0,
           unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
+          GuestIds:'',
         },
         userId: "",
         customerId: "",
@@ -3247,15 +3252,19 @@
           );
         }
       },
-      toTrip: function (obj, TicketUnionId) {
+      toTrip: function (obj, TicketUnionId,GuestIds) {
+      
         this.tripObj.tcid = obj.tcid;
         this.tripObj.configId = obj.configId;
         this.tripObj.orderId = obj.orderId;
         this.tripObj.cityId = obj.startCityId;
+        this.tripObj.GuestIds =GuestIds;
+        this.tripObj.unionfid =0;
         if (TicketUnionId) {
           this.tripObj.unionfid = TicketUnionId;
         }
         this.travelControlTripLayerShow = true;
+        console.log("this.tripObj",this.tripObj);
       },
       hideTripDown() {
         this.travelControlTripLayerShow = false;

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2478,7 +2478,7 @@
                           {{uItem.guestNames}} 航班信息：
                           <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
                             v-else>【暂定】</span>
-                          <a v-if="uItem.ticketUnionId&&uItem.ticketUnionId>0" @click="toTrip(item,uItem.ticketUnionId)"
+                          <a v-if="(item.orderGuestFlightList&&item.orderGuestFlightList.length>1&&item.outNotice == 1)||(uItem.ticketUnionId&&uItem.ticketUnionId>0)" @click="toTrip(item,uItem.ticketUnionId,uItem.guestIds)"
                             style="cursor:pointer;text-decoration:underline;color:green;">
                             {{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
                           </a>
@@ -3334,6 +3334,7 @@
           cityId: 0,
           orderId: 0,
           unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
+          GuestIds:'',
         },
         userId: "",
         customerId: "",
@@ -4174,11 +4175,13 @@
           );
         }
       },
-      toTrip: function (obj, TicketUnionId) {
+      toTrip: function (obj, TicketUnionId,GuestIds) {
         this.tripObj.tcid = obj.tcid;
         this.tripObj.configId = obj.configId;
         this.tripObj.orderId = obj.orderId;
         this.tripObj.cityId = obj.startCityId;
+        this.tripObj.unionfid =0;
+        this.tripObj.GuestIds =GuestIds;
         if (TicketUnionId) {
           this.tripObj.unionfid = TicketUnionId;
         }

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2182,7 +2182,7 @@
                     <div :key="uIndex+20000">
                       {{uItem.GuestNames}} 航班信息：
                       <span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span>
-                      <a v-if="uItem.TicketUnionId&&uItem.TicketUnionId>0" @click="toTrip(item,uItem.TicketUnionId)"
+                      <a v-if="(item.outNotice == 1&&childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>1)||(uItem.TicketUnionId&&uItem.TicketUnionId>0)" @click="toTrip(item,uItem.TicketUnionId,uItem.GuestIds)"
                         style="cursor:pointer;text-decoration:underline;color:green;">
                         {{ $t("Operation.Op_teamNotice") }}({{
                           SetNoticeMsg.OutNotice == 1 ? "OK" : "暂定"
@@ -2800,12 +2800,19 @@
                         {{uItem.GuestNames}} 航班信息：
                         <span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
                           v-else>【暂定】</span>
-                        <a v-if="uItem.TicketUnionId&&uItem.TicketUnionId>0"
+                        <!-- <a v-if="uItem.TicketUnionId&&uItem.TicketUnionId>0"
                           @click="toTrip(childItem,uItem.TicketUnionId)"
                           style="cursor:pointer;text-decoration:underline;color:green;">
                           {{ $t("Operation.Op_teamNotice") }}({{
                           SetNoticeMsg.OutNotice == 1 ? "OK" : "暂定"
                         }})
+                        </a> -->
+                        <a v-if="(item.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") }}({{
+                          SetNoticeMsg.OutNotice == 1 ? "OK" : "暂定"
+                        }})
                         </a>
                         <br />
                         <template v-for="(sfItem,sfIndex) in uItem.GuestFlightList">
@@ -4095,6 +4102,7 @@
           orderId: 0,
           unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
           isopOperation: true,
+          GuestIds:'',
         },
         employeeMsg: {
           BranchId: "-1",
@@ -5196,11 +5204,13 @@
           },
         });
       },
-      toTrip: function (obj, TicketUnionId) {
+      toTrip: function (obj, TicketUnionId,GuestIds) {
         this.tripObj.tcid = obj.TCID;
         this.tripObj.configId = obj.ConfigId;
         this.tripObj.orderId = obj.OrderId;
         this.tripObj.cityId = obj.DepartureCityId;
+        this.tripObj.unionfid =0;
+        this.tripObj.GuestIds =GuestIds;
         if (TicketUnionId) {
           this.tripObj.unionfid = TicketUnionId;
         }

src/components/commonPage/TripDownLoadCommon.vue

@@ -181,6 +181,7 @@
           tcid: obj.tcid,
           orderId: obj.orderId,
           unionfid: unionfid,
+          GuestIds:obj.GuestIds,
           vshowA: this.TripLayer.vshowA,
           vshowB: this.TripLayer.vshowB,
           vshowC: this.TripLayer.vshowC,

src/components/confirmationOrderDownLoadNew.vue

@@ -581,6 +581,7 @@
           tcid: this.$route.query.tcid,
           orderId: this.$route.query.orderId,
           unionfid: this.$route.query.unionfid,
+          GuestIds: this.$route.query.GuestIds,
           //是否显示基础信息
           isShowBase: this.vshowA ? 1 : 0,
           //是否显示航班
@@ -827,6 +828,7 @@
           orderId: this.$route.query.orderId,
           isClick: this.isClick, //不算统计
           unionfid: unionfid,
+          GuestIds:this.$route.query.GuestIds,
         }, res => {
           this.pdfLoading = false;
           this.loadingText = "";

src/components/orderCommon/productOrderList.vue

@@ -824,17 +824,22 @@
             <p>
               <i class="iconfont icon-hangban1"></i>{{ $t("Operation.Op_Warmprompt") }}
             </p>
-            <p>
+            <!-- <p style="color:red;">
+              <span>签证人员</span><i>{{
+                  item.VisaOPName === "" ? "未设置" : item.VisaOPName
+                }}</i>
+            </p> -->
+            <p style="color:red;">
               <span>{{ $t("visa.v_sqtime") }}</span><i>{{
                   item.SendVisaTime === "" ? "未设置" : item.SendVisaTime
                 }}</i>
             </p>
-            <p>
+            <p style="color:red;">
               <span>{{ $t("visa.v_cqtime") }}</span><i>{{
                   item.OutVisaTime === "" ? "未设置" : item.OutVisaTime
                 }}</i>
             </p>
-            <p>
+            <p style="color:red;">
               <span>{{ $t("visa.v_kptime") }}</span><i>{{
                   item.TicketDeadline === "" ? "未设置" : item.TicketDeadline
                 }}</i>
@@ -849,7 +854,7 @@
               </p>
             </template>
             <p>
-              <span>{{ $t("salesModule.TicketStatus")}}：</span>
+              <span>{{ $t("salesModule.TicketStatus")}}</span>
               <span class="fz16 fbold">
                 <el-tooltip class="item" effect="dark" :content="$t('salesModule.AllTk')" placement="top">
                   <span style="color: #4bca81" v-if="item.MakeInvoice == 1">√</span>
@@ -862,9 +867,9 @@
                 </el-tooltip>
               </span>
             </p>
-            <p v-if="item.TicketCreateByName&&item.TicketCreateByName!=''">
-              <span>本团票务：</span>
-              <i> {{item.TicketCreateByName}}</i>
+            <p v-if="item.TicketCreateByName&&item.TicketCreateByName!=''" style="color:red;">
+              <span>本团票务</span>
+              <i>{{item.TicketCreateByName}}</i>
             </p>
           </div>
           <div class="d7">