页面调整

src/components/Hotel/roomReservationsDetails.vue

@@ -1186,9 +1186,6 @@
       },
       // 获取供应商
       initSupplier() {
-        // supplier_post_GetAllList
-        // Type: 1,
-        // Country: 651
         this.apipost("travel_get_GetAllHotelList", {
           Type: 1,
           Country: 651,

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1901,7 +1901,6 @@
           this.msg,
           res => {
             this.loading = false;
-            console.log("dmcstatistics_post_GetGroupLeaderUserMoneyPlan", res.data);
             if (res.data.resultCode == 1) {
               let data = res.data.data
               let arrList = function (arr) {

src/components/SalesModule/groupTourOrder.vue

@@ -2241,6 +2241,10 @@
                   <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)"
+                      style="cursor:pointer;text-decoration:underline;color:green;">
+                      {{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
+                    </a>
                     <br />
                     <template v-for="(sfItem,sfIndex) in uItem.guestFlightList">
                       <span style="color:blue;" :key="sfIndex+30000">
@@ -2488,6 +2492,7 @@
           configId: 0,
           cityId: 0,
           orderId: 0,
+          unionfid: 0,//订单旅客联运编号(rb_airticket_union表Id)
         },
         userId: "",
         customerId: "",
@@ -3145,11 +3150,14 @@
           );
         }
       },
-      toTrip: function (obj) {
+      toTrip: function (obj, TicketUnionId) {
         this.tripObj.tcid = obj.tcid;
         this.tripObj.configId = obj.configId;
         this.tripObj.orderId = obj.orderId;
         this.tripObj.cityId = obj.startCityId;
+        if (TicketUnionId) {
+          this.tripObj.unionfid = TicketUnionId;
+        }
         this.travelControlTripLayerShow = true;
       },
       hideTripDown() {

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2445,6 +2445,10 @@
                           {{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)"
+                            style="cursor:pointer;text-decoration:underline;color:green;">
+                            {{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
+                          </a>
                           <br />
                           <template v-for="(sfItem,sfIndex) in uItem.guestFlightList">
                             <span style="color:blue;" :key="sfIndex+180000">
@@ -3258,6 +3262,7 @@
           configId: 0,
           cityId: 0,
           orderId: 0,
+          unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
         },
         userId: "",
         customerId: "",
@@ -4037,11 +4042,14 @@
           );
         }
       },
-      toTrip: function (obj) {
+      toTrip: function (obj, TicketUnionId) {
         this.tripObj.tcid = obj.tcid;
         this.tripObj.configId = obj.configId;
         this.tripObj.orderId = obj.orderId;
         this.tripObj.cityId = obj.startCityId;
+        if (TicketUnionId) {
+          this.tripObj.unionfid = TicketUnionId;
+        }
         this.travelControlTripLayerShow = true;
       },
       hideTripDown() {

src/components/TravelContractNewRB.vue

@@ -1082,7 +1082,6 @@
     methods: {
       //一排上移、下移
       MoveTicket(index, type) {
-        console.log("this.CtObj.ticketList", this.CtObj.ticketList);
         if (this.CtObj.ticketList && this.CtObj.ticketList.length > 0) {
           var tempData = this.CtObj.ticketList[index];
           //上移

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1988,7 +1988,7 @@
             <td class="fz12">
               <span :class="{ 'RL-redType': item.statsstr == '候补' }">{{item.statsstr}}</span>
             </td>
-            <td>111</td>
+            <td></td>
             <td class="RL-BTNlist" rowspan="2">
               <el-button-group v-if="isShow === true">
                 <el-tooltip class="item" effect="dark" :content="$t('salesModule.UpRemarks')" placement="top-start">
@@ -2693,43 +2693,24 @@
                       childItem.UnionRemark
                     }}</span>
                   </div>
-                  <!-- <template v-if="childItem.OrderUnionFlightList&&childItem.OrderUnionFlightList.length>0">
-                    <template v-for="(uItem,uIndex) in childItem.OrderUnionFlightList">
-                      <div
-                        v-if="(uItem.FlightName&&uItem.FlightName.ID)||(uItem.BackFlightName&&uItem.BackFlightName.ID)"
-                        :key="uIndex">
-                        联运信息：<span style="color: red">已配联运{{uItem.ConfigNum}}人,{{uItem.AirticketUnionNotes}}
-                          <span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
-                            v-else>【暂定】</span>
-                        </span>
-                        <template v-if="uItem.FlightName&&uItem.FlightName.ID">
-                          <br />
-                          <span style="color:blue;">去程:
-                            {{uItem.FlightName.StartDateStr}} {{uItem.FlightName.Flight_number}}
-                            {{uItem.FlightName.DepartureTime}}-{{uItem.FlightName.ArrivalTime}}
-                            {{uItem.FlightName.DName}}-{{uItem.FlightName.AName}}</span>
-                        </template>
-                        <template v-if="uItem.BackFlightName&&uItem.BackFlightName.ID">
-                          <br />
-                          <span style="color:blue;">回程:
-                            {{uItem.BackFlightName.StartDateStr}} {{uItem.BackFlightName.Flight_number}}
-                            {{uItem.BackFlightName.DepartureTime}}-{{uItem.BackFlightName.ArrivalTime}}
-                            {{uItem.BackFlightName.DName}}-{{uItem.BackFlightName.AName}}</span>
-                        </template>
-                      </div>
-                    </template>
-                  </template> -->
                   <template v-if="childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>0">
                     <template v-for="(uItem,uIndex) in childItem.OrderGuestFlightList">
                       <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(childItem,uItem.TicketUnionId)"
+                          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">
                           <span style="color:blue;" :key="sfIndex+30000">
                             {{sfItem.FlightDateStr}} {{sfItem.Flight_number}}
-                            {{sfItem.Departure_time}}-{{sfItem.Arrival_time}} 
+                            {{sfItem.Departure_time}}-{{sfItem.Arrival_time}}
                             {{sfItem.DepartureName}} ({{sfItem.DIATA}})-{{sfItem.ArrivalCityName}}({{sfItem.AIATA}})
                           </span>
                           <br :key="sfIndex+40000" />
@@ -4006,6 +3987,7 @@
           configId: 0,
           cityId: 0,
           orderId: 0,
+          unionfid: 0,//订单旅客联运编号(rb_airticket_union表Id)
           isopOperation: true,
         },
         employeeMsg: {
@@ -5059,11 +5041,14 @@
           },
         });
       },
-      toTrip: function (obj) {
+      toTrip: function (obj, TicketUnionId) {
         this.tripObj.tcid = obj.TCID;
         this.tripObj.configId = obj.ConfigId;
         this.tripObj.orderId = obj.OrderId;
         this.tripObj.cityId = obj.DepartureCityId;
+        if (TicketUnionId) {
+          this.tripObj.unionfid = TicketUnionId;
+        }
         this.travelControlTripLayerShow = true;
       },
       hideTripDown() {
@@ -5986,7 +5971,6 @@
           "sellorder_get_GetOrderListByTCID",
           msg,
           (res) => {
-            console.log("sellorder_get_GetOrderListByTCID", res.data);
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.OrderDataList = res.data.data;

src/components/orderCommon/edit-orderform.vue

@@ -754,8 +754,7 @@
     },
     methods: {
       //关闭弹窗
-      cancelSubmit() {
-       // console.log("关闭");
+      cancelSubmit() {       
         this.clearMsg();
         //关闭弹窗 调用父页面方法
         this.$emit("close");