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

src/assets/common/lang/zhCN/fill.js

@@ -8167,6 +8167,7 @@ export const obj = {
     kaihuzhih: '开户支行',
     xiaosousjkb: '销售数据看板',
   },
+  seeMySelfCompany:'只查看自己填写的公司信息',
   //#endregion
 }
 export default obj;

src/components/Hotel/hotelSpider.vue

+<style>
+
+
+</style>
+<template>
+  <div class="flexOne">
+    <div class="query-box">
+      <ul>
+        <li>
+          <span>
+            <em>酒店名称:</em>
+            <el-select class="w180 multiple_input" v-model="msg.CompanyId" clearable filterable @change="getCondition">
+              <el-option v-for="item in BranchList" :key="item.Id" :label="item.BName" :value="item.Id">
+              </el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>入住时间</em>
+            <el-date-picker class="w135" v-model="msg.QStartDate" type="date" :picker-options="beforeCheck"
+              value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
+            </el-date-picker>
+            <span class="_ln">-</span>
+            <el-date-picker class="w135" v-model="msg.QEndDate" type="date" :picker-options="afterCheck"
+              value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
+          </span>
+        </li>
+        <li>
+          <button class="normalBtn" type="button" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
+        </li>
+      </ul>
+    </div>
+    <div>
+      <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
+        <tr>
+          <th width="120">{{$t('admin.admin_company')}}</th>
+          <th width="100">机票编号</th>
+          <th width="150">进出点</th>
+          <th width="100">出发城市</th>
+          <th width="100">直客价</th>
+          <th width="100">团队价</th>
+          <th width="100">去程日期</th>
+          <th width="100">回程日期</th>
+          <th width="130">同步时间</th>
+          <th width="200">航班信息</th>
+        </tr>
+        <tr v-for="(item,index) in dataList" :key="`d_`+index">
+          <td>{{item.CompanyName}}</td>
+          <td>{{item.AirticketId}}</td>
+          <td>{{item.InOutStr}}</td>
+          <td>{{item.StartCity}}</td>
+          <td>{{item.Price}}</td>
+          <td>
+            <template v-if="item.CostPrice>item.Price">
+              <font style="color:red;font-weight:bold;">{{item.CostPrice}}</font>
+            </template>
+            <template v-else>
+              {{item.CostPrice}}
+            </template>
+          </td>
+          <td>{{item.GoDate}}</td>
+          <td>{{item.BackDate}}</td>
+          <td>{{item.CreateTime}}</td>
+          <td style="text-align:left; padding-left:10px;">
+            <template v-if="item.FlightList&&item.FlightList.length>0">
+              <template v-for="(subItem,subIndex) in item.FlightList">
+                <p :key="`d_`+index+`_f`+subIndex" style="line-height:1.5;">{{subItem.FlightNo}}&nbsp;
+                  ({{subItem.DepartureTime}})&nbsp;{{subItem.DepartureAirport}}&nbsp;-&nbsp;{{subItem.ArrivalAirport}}
+                </p>
+              </template>
+            </template>
+          </td>
+        </tr>
+      </table>
+      <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
+        layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        beforeCheck: {
+          disabledDate: time => {
+            if (this.msg.QEndDate) {
+              let endTime = new Date(this.msg.QEndDate);
+              return time && endTime.getTime() < time.getTime();
+            } else {
+              return false;
+            }
+          }
+        },
+        afterCheck: {
+          disabledDate: time => {
+            if (this.msg.QStartDate) {
+              let startTime = new Date(this.msg.QStartDate);
+              //可以选择当天
+              return (
+                time &&
+                time.getTime() <
+                startTime.getTime() - 1 * 24 * 60 * 60 * 1000
+              );
+            } else {
+              return false;
+            }
+          }
+        },
+        msg: {
+          pageIndex: 1,
+          pageSize: 14,
+          AirLineID: "", //航空公司编号
+          LineId: "", //线路编号
+          AirticketId: "", //机票编号
+          StartCity: "", //出发城市
+          InOutStr: "", //方案
+          CompanyId: "", //出团公司
+          total: 0, //总条数
+          QStartDate: "",
+          QEndDate: "",
+          PriceState: 1, //1-异常
+        },
+        userInfo: {}, //当前登录用户
+        dataList: [], //数据列表
+        loading: false,
+      };
+    },
+    methods: {
+
+ 
+      //翻页功能按钮
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getDataList();
+      },
+      //查询初始化页码
+      resetPageIndex() {
+        this.msg.pageIndex = 1;
+        this.getDataList();
+      },
+      //获取分页列表
+      getDataList() {
+        this.dataList = [];
+        this.loading = true;
+        this.apipost(
+          "AirTicket_post_GetSpiderFlightPage", this.msg,
+          res => {
+            this.loading = false;
+            if (res.data.resultCode == 1) {
+              this.msg.total = res.data.data.count;
+              this.dataList = res.data.data.pageData;
+            } else {
+              this.Error(res.data.message);
+            }
+          }
+        );
+      },
+    },
+    created() {
+      if (this.$route.query) {
+        // if (this.$route.query.AirticketId) {
+        //   this.msg.AirticketId = this.$route.query.AirticketId;
+        // }
+      }
+    },
+    mounted() {
+      this.userInfo = this.getLocalStorage();
+      this.getDataList();
+    }
+  };
+
+</script>

src/components/TravelManager/TravelTeam/editTeamInfo.vue

@@ -452,6 +452,20 @@
         <div v-for="(fItem,fIndex) in editForm.SelfFlightList" :key="'f_'+fIndex"
           style="border:1px solid #C0C4CC;margin-bottom:2px;border-radius:5px;">
           <table class="tFlightTab">
+            <tr><td colspan="4">
+               <el-form-item :label="$t('salesModule.FlighInfo')">
+                 <el-select v-model="fItem.baseAlNameFlight_number" @change="handleCheckChange(fIndex)" filterable  clearable  placeholder="请选择">
+                    <el-option
+                      v-for="item in baseTeamFlightList"
+                      :key="item.Flight_number"
+                      :label="item.Flight_number+'/'+item.AlName"
+                      :value="item.Flight_number">
+                      <span style="float: left">{{ item. Flight_number}}</span>
+                      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.AlName }}</span>
+                    </el-option>
+                 </el-select>
+               </el-form-item>
+              </td></tr>
             <tr>
               <td>
                 <el-form-item :label="$t('system.query_type')">
@@ -866,6 +880,7 @@
         AirportNameList: [], //去程航班列表
         BackAirportNameList: [], //回程航班列表
         airlineList: [], //航空公司列表
+        baseTeamFlightList:[],//基础航班信息travelteam_GetBaseTeamFlightList
         isVirtuallyFlight: 0, //0-虚拟航班，1-绑定真实机票
         editForm: {
           GTeamName: "", // 业务名称
@@ -971,6 +986,7 @@
       this.userInfo = this.getLocalStorage();
       this.getLineList();
       this.getCompanyList();
+      this.getBaseTeamFlightList();
     },
     mounted() {
       if (this.Q_GTeamId) {
@@ -978,6 +994,52 @@
       }
     },
     methods: {
+       //获取基础航班信息
+      getBaseTeamFlightList() {
+        this.apipost(
+          "travelteam_GetBaseTeamFlightList", {},
+          res => {
+            console.log("travelteam_GetBaseTeamFlightList",res);
+            if (res.data.resultCode == 1) {
+              this.baseTeamFlightList = res.data.data;
+            }
+          }
+        );
+      },
+      handleCheckChange(index){
+        if(this.editForm.SelfFlightList!=null&&this.editForm.SelfFlightList.length>0){
+          // 获取当前航班
+        const currentFlight = this.editForm.SelfFlightList[index];
+        console.log("currentFlight",currentFlight);
+        
+        // 创建深拷贝（避免引用问题）
+        const newFlight = JSON.parse(JSON.stringify(currentFlight));
+        this.baseTeamFlightList.forEach(item => {
+          if(item.Flight_number===newFlight.baseAlNameFlight_number){
+            console.log("item.baseAlNameFlight_number",item);
+            
+          // 修改拷贝后的对象
+          newFlight.AlName = item.AlName;
+        
+          newFlight.AIATA = item.AIATA;
+          newFlight.ArrivalCityName = item.ArrivalCityName;
+          newFlight.aName = item.aName;
+          newFlight.Arrival_time = item.Arrival_time;
+          newFlight.aDay = item.aDay;
+          newFlight.DIATA = item.DIATA;
+          newFlight.DepartureName = item.DepartureName;
+          newFlight.Departure_time = item.Departure_time;
+          newFlight.dName = item.dName;
+          newFlight.Flight_number = item.Flight_number;
+          // 替换原对象
+        this.$set(this.editForm.SelfFlightList, index, newFlight);
+          }
+        });
+     
+      
+     
+        }
+      },
       //获取线路列表
       getLineList() {
         this.apipost(
@@ -1135,6 +1197,7 @@
           dName: "", //到达机场名称
           FlightDate: "", //出发日期
           Flight_number: "", //航班号
+          baseAlNameFlight_number:"",
         };
         this.editForm.SelfFlightList.push(seleFObj);
       },

src/router/config.js

@@ -2200,14 +2200,14 @@ export default {
                 title: '日本车行预订统计表'
               },
             },
-            // {
-            //   path: '/HPTripPlan', //和平用车
-            //   name: 'HPTripPlan',
-            //   component: resolve => require(['@/components/busManagement/HPTripPlan'], resolve),
-            //   meta: {
-            //     title: '日本车行预订统计表'
-            //   },
-            // },
+            {
+              path: '/HPTripPlan', //和平用车
+              name: 'HPTripPlan',
+              component: resolve => require(['@/components/busManagement/HPTripPlan'], resolve),
+              meta: {
+                title: '日本车行预订统计表'
+              },
+            },
             {
               path: '/JapanBusMonthFStatistics', //用車單統計(財務單據)
               name: 'JapanBusMonthFStatistics',
@@ -3811,7 +3811,15 @@ export default {
               name: 'ticketSpider',
               component: resolve => require(['@/components/Ticketing/ticketSpider'], resolve),
               meta: {
-                title: '团控票务'
+                title: '散客机票查询'
+              },
+            },
+            { //团控票务
+              path: '/hotelSpider',
+              name: 'hotelSpider',
+              component: resolve => require(['@/components/hotel/hotelSpider'], resolve),
+              meta: {
+                title: '散客酒店查询'
               },
             },
             { //团控票务 自主开团- 销售