页面修改

src/components/Ticketing/PassengerList.vue

@@ -143,6 +143,12 @@
           </table>
         </li>
         <li>
+          <input v-if="!isShowAirticketOut" type="button" class="normalBtn" value="开票" @click="openAirticket" />
+          <el-select v-if="isShowAirticketOut" size="small" v-model="checkOutMsg.TicketOutType" placeholder="请选择开票类型">
+            <el-option label="团队票" :value="1"></el-option>
+            <el-option label="散客票" :value="2"></el-option>
+          </el-select>
+          <input v-if="isShowAirticketOut" type="button" class="normalBtn" value="保存开票信息" @click="setAirticketGuest" />
           <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(0),getCombinTeam()" />
           <el-tooltip class="item" effect="dark" content="包含机票信息" placement="bottom">
             <input type="button" class="normalBtn" value="导出旅客&航班" @click="getFlightInfo(1),getCombinTeam()" />
@@ -164,6 +170,10 @@
             v-model="checkedshuijin" /></th>
         <th v-if="isShowGuoji">升舱 <input type="checkbox" @change="checkAllbox(checkedsc,'shengcang')"
             v-model="checkedsc" /></th>
+        <th v-if="isShowAirticketOut">
+          出票 <input type="checkbox" @change="checkAllbox(checkAirticketOut,'checkAirticketOut')"
+            v-model="checkAirticketOut" />
+        </th>
         <th>旅客姓名</th>
         <th>身份证</th>
         <th>英文姓</th>
@@ -175,6 +185,7 @@
         <th>证件有效期</th>
         <th>客人联系方式</th>
         <th>签证状态</th>
+        <th>出票状态</th>
       </tr>
       <tr v-for="(item,index) in QueryMsg.dataList" :class="{'redTr':item.VisaState==1}" :key="index+10000">
         <td v-if="isShowGuoji">
@@ -192,6 +203,9 @@
         <td v-if="isShowGuoji">
           <input v-model="item.shengcang" type="checkbox" />
         </td>
+        <td v-if="isShowAirticketOut">
+          <input type="checkbox" v-model="item.checkAirticketOut" />
+        </td>
         <td>{{item.GuestName}}</td>
         <td>{{item.IdCard}}</td>
         <td>{{item.ESurName}}</td>
@@ -203,6 +217,17 @@
         <td>{{item.PassportExpiry}}</td>
         <td>{{item.NaMobilePhoneme}}</td>
         <td>{{item.VisaState==1?"拒签":"正常"}}</td>
+        <td>
+          <template v-if="item.TicketOutType==0">
+            <span style="color:red">{{item.TicketOutTypeStr}}</span>
+          </template>
+          <template v-if="item.TicketOutType==1">
+            <span style="color:green">{{item.TicketOutTypeStr}}</span>
+          </template>
+          <template v-if="item.TicketOutType==2">
+            <span style="color:blue">{{item.TicketOutTypeStr}}</span>
+          </template>
+        </td>
       </tr>
     </table>
     <div class="noData" v-show="QueryMsg.noData">
@@ -354,10 +379,45 @@
         checkedshuijin: false,
         checkedsc: false,
         isShowSelect: 0,
-        checkModule: 0
+        checkModule: 0,
+        isShowAirticketOut: false, //是否线下开票
+        checkAirticketOut: false,
+        //提交开票类型
+        checkOutMsg: {
+          TicketOutType: 1,
+          GuestIds: ""
+        }
       };
     },
     methods: {
+      openAirticket() {
+
+        this.isShowAirticketOut = true;
+      },
+      //设置旅客的出票类型
+      setAirticketGuest() {
+        var tempIds = "";
+        if (this.QueryMsg.dataList && this.QueryMsg.dataList.length > 0) {
+          this.QueryMsg.dataList.forEach(item => {
+            if (item.checkAirticketOut) {
+              tempIds += "," + item.Id;
+            }
+          })
+        }
+        this.checkOutMsg.GuestIds = tempIds;
+        this.apipost("travel_get_SetAirticketGuest", this.checkOutMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message);
+            this.getList();
+            this.isShowAirticketOut = false;
+            this.checkOutMsg.GuestIds = "";
+            this.checkOutMsg.TicketOutType = 1;
+            this.checkAirticketOut = false;
+          } else {
+            this.Error(res.data.message);
+          }
+        })
+      },
       //获取数据
       getList() {
         this.QueryMsg.loading = true;
@@ -366,6 +426,7 @@
           this.msg,
           res => {
             this.QueryMsg.loading = false;
+            console.log("res", res.data);
             if (res.data.resultCode == 1) {
               this.msg.total = res.data.data.count;
               this.QueryMsg.dataList = res.data.data.pageData;
@@ -376,6 +437,7 @@
                 } else {
                   item.Sex = "女";
                 }
+                item.checkAirticketOut = false;
               });
               if (this.isShowGuoji) {
                 this.QueryMsg.dataList.forEach(x => {
@@ -402,7 +464,7 @@
           } else {
             this.Error(res.data.message);
           }
-        }, err => {});
+        });
         this.outerVisible = true;
       },
       //获取联运团信息
@@ -475,7 +537,7 @@
           Type: this.checkModule,
           TemplateType: this.TemplateType
         };
-        var fileName = this.$route.query.flightdate //this.QueryMsg.nowDate;
+        var fileName = this.$route.query.flightdate;
         var TempfileName = ""
         this.QueryMsg.TeamInfoData.forEach(item => {
           if (TempfileName.length > 0) {
@@ -495,9 +557,6 @@
         fileName = fileName + ".xls";
         this.GetLocalFile("travel_get_GetAirTicketGuestExport", msg, fileName);
       },
-
-
-
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.getList();
@@ -564,7 +623,7 @@
             name: 'ChoiceAddFinancialDocuments',
             query: {
               "Type": 2,
-              "portTypeId":1,
+              "portTypeId": 1,
               "path": "",
               'blank': 'y',
               'orderObj': JSON.stringify(orderObj)
@@ -583,7 +642,8 @@
             x[y] = false
           })
         }
-      }
+      },
+
     },
     mounted() {
       this.QueryMsg.AirTicketId = this.$route.query.id;

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2095,13 +2095,18 @@
               <span class="RL-remarkTitle" v-if="item.GuestList.length > 0">{{ $t("salesModule.MD") }}:</span>
               <p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0">
                 <span style="color: blue !important" v-for="(childItem,childIndex) in item.GuestList" :key="childIndex"
-                  @click="goToPassenger(childItem, 2)">{{ childItem.userName }}<span style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span></span>
+                  @click="goToPassenger(childItem, 2)">{{ childItem.userName }}<span
+                    style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span>
+                  <span style="color:#f56c6c">{{childItem.TicketOutTypeStr}}
+                  </span>
+                </span>
               </p>
               <p v-if="item.CancelGuestList.length > 0">
                 <span class="">{{ $t("salesModule.CancelOrder") }}:</span>
                 <span class="RL-redType RL-remarkCon">
                   <span v-for="(childItem,childIndex) in item.CancelGuestList"
-                    :key="childIndex">{{ childItem.userName }}<span style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span> &nbsp;&nbsp;</span>
+                    :key="childIndex">{{ childItem.userName }}<span
+                      style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span> &nbsp;&nbsp;</span>
                 </span>
               </p>
               <span>{{ $t("salesModule.RoomInfo") }}：{{
@@ -2136,6 +2141,7 @@
             </td>
             <td colspan="3">
               <div>
+                <!-- {{item.OrderGuestFlightList}} -->
                 <template v-if="item.OrderGuestFlightList&&item.OrderGuestFlightList.length>0">
                   <template v-for="(uItem,uIndex) in item.OrderGuestFlightList">
                     <div :key="uIndex+20000">
@@ -2627,13 +2633,21 @@
               <td colspan="15" class="RL_Order">
                 <span class="RL-remarkTitle" v-if="childItem.GuestList.length > 0">{{ $t("salesModule.MD") }}:</span>
                 <span class="RL-redType RL-remarkCon" v-if="childItem.GuestList.length > 0">
-                  <span style="color: blue !important" v-for="fourthItem in childItem.GuestList"
-                    @click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }}<span style="color:#f56c6c">{{fourthItem.VisaType==1?'(个签)':''}}</span></span>
+                  <template v-for="(fourthItem,fourthIndex) in childItem.GuestList">
+                    <span style="color: blue !important" :key="fourthIndex"
+                      @click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }}
+                      <span style="color:#f56c6c">{{fourthItem.TicketOutTypeStr==1?'(个签)':''}}
+                      </span>
+                      <span style="color:#f56c6c">{{fourthItem.TicketOutTypeStr}}
+                      </span>
+                    </span>
+                  </template>
                 </span>
                 <p v-if="childItem.CancelGuestList.length > 0">
                   <span class="">{{ $t("salesModule.CancelOrder") }}:</span>
                   <span class="RL-redType RL-remarkCon">
-                    <span v-for="subItem in childItem.CancelGuestList">{{ subItem.userName }}<span style="color:#f56c6c">{{subItem.VisaType==1?'(个签)':''}}</span> &nbsp;&nbsp;</span>
+                    <span v-for="subItem in childItem.CancelGuestList">{{ subItem.userName }}<span
+                        style="color:#f56c6c">{{subItem.VisaType==1?'(个签)':''}}</span> &nbsp;&nbsp;</span>
                   </span>
                 </p>
                 <span style="display: block">
@@ -6006,7 +6020,7 @@
           "sellorder_get_GetOrderListByTCID",
           msg,
           (res) => {
-            console.log("RegistrationList_sellorder_get_GetOrderListByTCID",res.data);
+            console.log("RegistrationList_sellorder_get_GetOrderListByTCID", res.data);
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.OrderDataList = res.data.data;

src/components/dmc/manager/dmcTotalTable.vue

@@ -337,7 +337,7 @@
               </td>
               <td>
                 <div class="fz16 fbold linkspan"
-                  @click="goUrl([131,14, 90].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')">
+                  @click="goUrl([131,14, 90,118].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')">
                   <span style="color: #4BCA81;" v-if="item.HotelResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.HotelResult=='-1'?"x":"O"}}</span>
                 </div>

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -81,25 +81,28 @@
       <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
         :subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
         v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
-      <!--常规团-->
-      <TravelPrice v-show="PostConfig.TeamType==0" @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor"
-        @headCallBack="getPrice" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
-        :CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice>
+      <div id="fiveAnchor">
+        <!--常规团-->
+        <TravelPrice v-show="PostConfig.TeamType==0" @saveMsg="SaveData(1)" ref="TravelPrice" @headCallBack="getPrice"
+          :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
+          :IsDirect="PostConfig.IsDirect"></TravelPrice>
 
-      <!--小包团-->
-      <TravelPrice2 v-show="PostConfig.TeamType==1" @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor"
-        @headCallBack="getPrice" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
-        :CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect">
-      </TravelPrice2>
+        <!--小包团-->
+        <TravelPrice2 v-show="PostConfig.TeamType==1" @saveMsg="SaveData(1)" ref="TravelPrice" @headCallBack="getPrice"
+          :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
+          :IsDirect="PostConfig.IsDirect">
+        </TravelPrice2>
 
-      <!--当地游-->
-      <TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
-        v-if="PostConfig.TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
-        :TeamType="PostConfig.TeamType"></TravelPrice3>
-      <!--地接团-->
-      <TravelPrice4 @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
-        :PostDaysTrip="PostDaysTrip" v-if="PostConfig.TeamType==3" :priceList="PriceList" :PostConfig="PostConfig"
-        :modifyTcid="modifyTcid" :TeamType="PostConfig.TeamType"></TravelPrice4>
+        <!--当地游-->
+        <TravelPrice3 v-show="PostConfig.TeamType==2" @saveMsg="SaveData(1)" ref="TravelPrice" @headCallBack="getPrice"
+          :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
+          :TeamType="PostConfig.TeamType"></TravelPrice3>
+
+        <!--地接团-->
+        <TravelPrice4 v-show="PostConfig.TeamType==3" @saveMsg="SaveData(1)" ref="TravelPrice" @headCallBack="getPrice"
+          :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
+          :TeamType="PostConfig.TeamType"></TravelPrice4>
+      </div>
 
       <div class="btnFixedDiv" v-if="IsShowBtn">
         <div class="toTop" @click="backTop">
@@ -418,8 +421,8 @@
         basicData.TeamType = this.PostConfig.TeamType;
 
         basicData.TripMapList = this.PostConfig.TripMapList;
-        basicData.TripCountryList=this.PostConfig.TripCountryList;
-        basicData.TripCityList=this.PostConfig.TripCityList; 
+        basicData.TripCountryList = this.PostConfig.TripCountryList;
+        basicData.TripCityList = this.PostConfig.TripCityList;
         basicData.StartCityId = 0;
         basicData.ReturnArriveCityId = 0;
         if (this.PostDaysTrip) {

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -461,7 +461,7 @@
                     </el-checkbox>
                     <template v-if="CurrentUserInfo.RB_Group_id==2">
                       <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
-                        v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168) " />
+                        v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168||PostConfig.LineId==118) " />
                     </template>
                     <template v-else>
                       <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"