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

src/components/Complaints/AddComplaints.vue

@@ -126,7 +126,7 @@
       <p>投诉情况</p>
       <div class="AC_complaintList">
         <div class="t">主题内容：</div>
-        <ul>
+        <ul style="width:90%;">
           <li v-for="subItem in themeList" @click="getTheme(subItem)" :class="{'checked':subItem.isCheck}">
             {{subItem.Name}}
           </li>
@@ -134,7 +134,7 @@
       </div>
       <div class="AC_complaintList">
         <div class="t">严重程度：</div>
-        <ul>
+        <ul style="width:90%;">
           <li v-for="subItem in severityList" @click="getServerity(subItem)" :class="{'checked':subItem.isCheck}">
             {{subItem.Name}}
           </li>
@@ -234,10 +234,10 @@
               this.EditMsg.LineID = this.PriceInfo.LineID;
               this.EditMsg.LineteamId = this.PriceInfo.LineteamId;
             }
-            this.ExitCount = res.data.data.ExitCount;
-            if(this.ExitCount>0){
-              this.Error("该订单已存在投诉");
-            }
+            // this.ExitCount = res.data.data.ExitCount;
+            // if(this.ExitCount>0){
+            //   this.Error("该订单已存在投诉");
+            // }
           } else {
             this.Error(res.data.message)
           }

src/components/Complaints/ComplaintsManage.vue

@@ -203,6 +203,7 @@
           <td>{{getTimeConsuming(item,2)}}</td>
           <td>
             <span class="CM_detail" @click="goUrl('ComplaintsDetail',item.ID,item.OrderID,'投诉详情')">详情</span>
+            <span class="CM_detail" @click="delComplaints(item.ID,item.CreateBy)">删除</span>
           </td>
         </tr>
       </table>
@@ -438,6 +439,31 @@
         var fileName = "投诉报表.xls";
         this.GetLocalFile("get_complain_GetExport", msg, fileName);
       },
+      //删除
+      delComplaints(ID,UserID){
+        let userInfo = this.getLocalStorage();
+        if(userInfo.EmployeeId==UserID){
+          var that = this;
+          that.Confirm("是否删除?", function () {
+            var msg = {
+              ID : ID
+            };
+            that.apipost(
+              "conplain_post_Remove",msg,res => {
+                if (res.data.resultCode == 1) {
+                  that.Success(res.data.message);
+                  that.getList();
+                }else{
+                  that.Error(res.data.message);
+                }
+              },
+              null
+            );
+          });
+        }else{
+          this.Error('只能删除自己创建的单据');
+        }
+      }
     },
     mounted () {
       this.getLineList()

src/components/FinancialModule/BasicDocuments.vue

@@ -263,7 +263,8 @@
         <p class="_tit">{{GetDetail.FinanceName}}</p>
         <div class="_conten">
             <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7">
-                <my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
+                <!-- <my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill> -->
+                <new-Bill :ID="GetDetail.FrID"></new-Bill>
             </template>
             <template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
                 <my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
@@ -1105,6 +1106,8 @@ import teamProductModule from "../commonPage/teamProductModule.vue";
 import TicketFinace from "../commonPage/TicketFinace.vue";
 import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
 import TicketingModule from "../commonPage/TicketingModule.vue";
+
+import newBill from "./FinancialSubmodule/NewBillModule.vue";
 // import MsgBus from '../../assets/utils/msgBus.js';
 export default {
     data(){
@@ -1237,6 +1240,7 @@ export default {
         'SaleOrderModule':SaleOrderModule,
         'TicketFinace':TicketFinace,
         'my-HB-Bill':myhrBill,
+        'new-Bill':newBill
     },methods:{
     payMsgListShow: function (type, index) {
         if(this.choiceMsg.Status==1){
@@ -1784,7 +1788,6 @@ export default {
             this.apipost('Financial_post_GetDetail',{ID:id,Type:2}, res => {
                 if(res.data.resultCode == 1) {
                     let data= res.data.data;
-                    console.log(data,'datas');
                     data.DetailList.forEach(x=>{
                         x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2))
                         x.Money = x.Money.toFixed(2)
@@ -1814,10 +1817,11 @@ export default {
                         this.isShowChoice = true;
                     }
                     //遍历默认不勾选
-                    this.GetDetail.TradeDetailList.forEach(x=>{
-                        x.isChecked = false;
-                    })
-                    console.log(this.GetDetail,'getdetails');
+                    if(this.GetDetail.TradeDetailList&&this.GetDetail.TradeDetailList.length>0){
+                        this.GetDetail.TradeDetailList.forEach(x=>{
+                            x.isChecked = false;
+                        })
+                    }
                     // 拼接团号显示团信息
                     let str = '';
                     if(data.TCIDList.length>0){

src/components/FinancialModule/CapitalAllocationDetail.vue

@@ -668,7 +668,6 @@ export default {
                 x.comText = this.$t('fnc.xsfujian');
                 x.isShow = false;
             });
-            console.log(this.GetDetail)
         }else{
           this.Error(res.data.message);
         }

src/components/FinancialModule/ChoiceAddFinancialDocuments.vue

@@ -172,7 +172,6 @@ export default {
           if (valid) {
             this.apipost('Financial_post_GetTemplateDetail', this.ruleForm, r=>{
               if (r.data.resultCode===1) {
-                console.log(r)
                 if (this.ruleForm.Type ===1 ){
                   this.R = r.data.data
                 } else {
@@ -183,7 +182,6 @@ export default {
               }
             }, null)
           } else {
-            console.log('error submit!!');
             return false;
           }
         });
@@ -212,9 +210,12 @@ export default {
           }
       },
       Financial_post_GetList(){ //获取
+        console.log("111");
           this.apipost('Financial_post_GetList',{},res=>{
+            console.log("res",res);
               if(res.data.resultCode==1){
                   let data = res.data.data;
+                  console.log("data",data)
                   if(data){
                       data.forEach(x => {
                           if(x.Type==1){
@@ -261,14 +262,19 @@ export default {
         }else{}
       },err=>{})
     },
-  },mounted(){
+  },
+  created(){
+    this.Financial_post_GetList();
+  },
+  mounted(){
+     
      this.MsgBus.$on('bankAddPage',() =>{
        this.F = false;
        this.R = false;
       });
       let userInfo=this.getLocalStorage();
       this.getCompanyMsg.RB_Group_Id=  userInfo.RB_Group_id;    //集团ID
-      this.Financial_post_GetList();
+      
       this.showTab = this.$route.query.Type?this.$route.query.Type:0;
       if(this.showTab==1){
           this.GetList = this.collectList;

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -133,11 +133,14 @@
           })
           this.GetList = newList
         }
+        console.log("this.GetList",this.GetList)
       },
       Financial_post_GetList(){ //获取
         this.apipost('Financial_post_GetList',{},res=>{
+          
           if(res.data.resultCode==1){
             let data = res.data.data;
+            console.log("data",data);
             if(data){
               data.forEach(x => {
                 if(x.Type==1){

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -1718,10 +1718,10 @@ export default {
                   x.Is_Transport = x.Is_Transport === 0 ? "否" : "是";
                   newData.push(x);
                 } else {
-                  x.MaoLiRate = this.total===0 ? 0 : parseFloat(x.MaoLiRate/this.total);
-                  x.AverageIncome = this.total===0 ? 0 : parseFloat(x.AverageIncome/this.total);
-                  x.AverageCost = this.total===0 ? 0 : parseFloat(x.AverageCost/this.total);
-                  x.AverageProfit = this.total===0 ? 0 : parseFloat(x.AverageProfit/this.total);
+                  // x.MaoLiRate = this.total===0 ? 0 : parseFloat(x.MaoLiRate/this.total);
+                  // x.AverageIncome = this.total===0 ? 0 : parseFloat(x.AverageIncome/this.total);
+                  // x.AverageCost = this.total===0 ? 0 : parseFloat(x.AverageCost/this.total);
+                  // x.AverageProfit = this.total===0 ? 0 : parseFloat(x.AverageProfit/this.total);
                   x.LineName = "合计";
                   x.TCID = "";
                   x.TCNUM = "";

src/components/FinancialModule/ReportForm/MonthReport.vue

@@ -580,6 +580,7 @@ export default {
         LineId:"",
         QStartDate: "",
         QEndDate: "",
+        EmployeeId:''
       },
       getCompanyMsg: {
         // 公司
@@ -904,6 +905,7 @@ export default {
     },
     method5: function() {
        this.loading = true;
+       this.msg.EmployeeId=this.userId;
       this.GetLocalFile(
         "financestatistics_post_OutToExcelTravelMonthReportList",
         this.msg,

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1178,6 +1178,7 @@ export default {
             this.apipost('Financial_post_Get',{ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => {
                 // console.log(this.orderObj.TCIDList)
                 if(res.data.resultCode == 1) {
+                    console.log("res.data",res.data)
                     let data= res.data.data;
                     data.IsLeader = 1;
                     this.msg = JSON.parse(JSON.stringify(data));
@@ -1226,6 +1227,7 @@ export default {
                     this.IsUploadPic = data.IsUploadPic;
                     this.msg.IsPublic = data.IsPublic;
                     this.GetDetail = data;
+                    this.Description=this.GetDetail.Description;
                     if(this.orderObj){
                         this.msg.OrderID = this.orderObj.OrderID?this.orderObj.OrderID:0;
                         this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource?this.orderObj.OrderSource:0;
@@ -1309,9 +1311,11 @@ export default {
         if(this.orderObj!=null&&this.orderObj.OrderSource===10){
           that.Description="旅客名单：";
           that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
+          console.log("that.describeList",that.describeList)
           that.describeList.forEach(item=>{
               that.Description+=item.GuestName+" ";
           })
+          console.log("that.Description",that.Description)
         }
     },mounted(){
         let userInfo = this.getLocalStorage();

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -241,7 +241,8 @@
                                 <span  class="w80">{{da.currenName}}</span>
                             </td>
                             <td height="26px">{{da.yTotalPrice}}</td>
-                            <td height="26px"><el-input v-model="da.Rate" type="text" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
+                            <!--  -->
+                            <td height="26px"><el-input v-model="da.Rate" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" type="text"  class="w80 _border_b_1"></el-input></td>
                             <td height="26px">{{da.bTotalPrice}}</td>
                             <td height="26px"><el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1"></el-input> <i @click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i> </td>
                         </tr>
@@ -272,7 +273,7 @@
                             <span class="w110">{{detailList.currenName}}</span>
                         </td>
                         <td>{{detailList.yTotalPrice}}</td>
-                        <td><el-input v-model="detailList.Rate" type="text" @change="Calculation(1)" @blur="addList(1)" class="w80 _border_b_1"></el-input></td>
+                        <td><el-input v-model="detailList.Rate" @change="Calculation(1)" @blur="addList(1)" type="text"  class="w80 _border_b_1"></el-input></td>
                         <td>{{detailList.bTotalPrice}}</td>
                         <td><el-input v-model="detailList.Remark" @blur="addList(1)" type="textarea" class="w80 _border_b_1"></el-input></td>
                     </tr>
@@ -1307,6 +1308,7 @@ export default {
             //     })
             //     TCID.split(0,TCID.length-1)
             this.apipost('Financial_post_Get',{ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => {
+                this.loading = false;
                 if(res.data.resultCode == 1) {
                     let data= res.data.data;
                     this.msg = JSON.parse(JSON.stringify(data));

src/components/Hotel/roomQuery.vue

@@ -47,11 +47,14 @@
           </span>
         </li>
         <li>
+
           <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
+          <input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
         </li>
       </ul>
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
+      <div style="font-size:12px;padding:2px 4px 3px 4px; color:red">注意事项:每次导出数据最好不要超过一个月。</div>
       <table border="0" cellspacing="1" cellpadding="0" class="roomQueryTalbe" v-loading='loading'>
         <tr>
           <th width="w100">序号</th>
@@ -94,7 +97,8 @@
                     <p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
                     <p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
                       class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
-                      {{childItem.NewHotelName}}<span class="colorE95252">（{{childItem.HotelOrderState==1?"OK":"暂定"}}）</span>
+                      {{childItem.NewHotelName}}<span
+                        class="colorE95252">（{{childItem.HotelOrderState==1?"OK":"暂定"}}）</span>
                     </p>
                   </div>
                 </div>
@@ -262,6 +266,19 @@
           }
         }, err => {})
       },
+      //下载Excel
+      DownLoadHotel() {
+        this.loading = true;
+        let qMsg = {
+          queryMsg: this.msg,
+          uid: this.getLocalStorage().EmployeeId
+        };
+        let fileName = "订房查询" + this.$commonUtils.getCurrentDate() + ".xls";
+        this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName,
+         res => {
+          this.loading = false;
+        });
+      }
     },
     mounted() {
       let myDate = new Date();

src/components/Hotel/roomReservationsDetails.vue

@@ -490,7 +490,20 @@
       //单条保存
       SaveSingle(item) {
         item.HotelOrderState = 1;
-        this.apipost('dmcstatistics_post_SetNewHotelOrder', item, res => {
+        this.list.forEach(item => {
+          item.HotelOrderList.forEach(subItem => {
+            subItem.OrderDetailsList.forEach(y => {
+              y.HouseTypeCount = parseInt(y.HouseTypeCount);
+              y.UnitPrice = parseInt(y.UnitPrice);
+              y.HotelDiscount = parseInt(y.HotelDiscount);
+              if (y.BookNum == "") {
+                y.BookNum = 0;
+              }
+            })
+          });
+        })
+        let mag={TotalList:this.list,SingleItem:item};
+        this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
           if (res.data.resultCode == 1) {
             this.Success(res.data.message);
             this.getList();

src/components/SalesModule/groupTourOrder.vue

@@ -1786,7 +1786,7 @@
           <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
             <div>
               <div><span>备注：</span>
-                <p><span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span><span
+                <p><span v-for="ts in item.tsIdList">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}}</a> ;</span><span
                   v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}
                 </p></div>
               <div>
@@ -3486,7 +3486,8 @@
             if (res.data.resultCode == 1) {
               this.loading = false
               this.total = res.data.data.count
-              this.list = res.data.data.pageData
+              this.list = res.data.data.pageData;
+              console.log("this.list",this.list)
             } else {
               this.$message.error(res.data.message)
             }

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1773,7 +1773,7 @@
           <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
             <div>
               <div><span>备注：</span><p>
-                <span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span>
+                <span v-for="ts in item.tsIdList">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;</span>
                 <span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
               <div>
                 <!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
@@ -3998,6 +3998,7 @@ submitYSZEForm(){
         this.tuanMsg,
         res => {
           if (res.data.resultCode == 1) {
+            console.log("res",res);
             this.loading = false;
             this.total = res.data.data.count;
             this.list = res.data.data.pageData.rtData;

src/components/SalesModule/productQuery.vue

@@ -1981,7 +1981,6 @@
           TCID: id
         }, res => {
           if (res.data.resultCode == 1) {
-            console.log(res.data.data)
             this.tripDetails = res.data.data.FlightList
           } else {
             this.$message.error(res.data.message)

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -927,7 +927,7 @@
           RateOnDay: '-1',
           RateOn: '-1',
           TeamType: 0, //一般常规团
-          IsShowUnion: 1,
+          IsShowUnion: 0,
           TCID: '0',
           HotelId: 0, //酒店编号
           HotelUseTime: "", //酒店使用时间
@@ -959,11 +959,11 @@
         ],
         //联运状态
         unionStatus:[{
-          Id:1,
+          Id:0,
           Name:'主团',
           Checked: true
         },{
-          Id:0,
+          Id:1,
           Name:'分销团',
           Checked: false
         }],
@@ -1686,11 +1686,9 @@
     },
     created() {
       //默认显示联运
-      this.queryMsg.IsShowUnion = 1
+      this.queryMsg.IsShowUnion = 0;
       let userInfo = this.getLocalStorage()
-      this.CurrentUserInfo = userInfo
-
-      this.$route.query.tcmun = this.$route.query.tcmun
+      this.CurrentUserInfo = userInfo;
       if (this.$route.query.tcmun) {
         this.queryMsg.TCNUM = this.$route.query.tcmun;
       }

src/components/VisaCenter/VisaManagement.vue

@@ -140,7 +140,8 @@
   font-size: 12px !important;
   line-height: 30px;
 }
-.page_visaMG ._info_box ul li .el-form-item input {
+.page_visaMG .select .el-form-item input {
+  height:34px!important;
   line-height: 30px;
 }
 .page_visaMG ._info_box ul li .el-form-item textarea {
@@ -313,7 +314,7 @@
                         </li>
                     </ul>
                 </div>
-                <div style="width:500px" class="w225">
+                <div style="width:520px" class="w225 select">
                     <p>{{$t('visa.v_qianzhengst')}}</p>
                     <ul class="clearfix">
                         <li>
@@ -481,13 +482,16 @@ export default {
       data.Status = data.Status.toString();
       this.addShow = true;
       this.addMsg = JSON.parse(JSON.stringify(data));
-      this.MRList = this.addMsg.MRList;
-      for (let i = 0; i < this.MRList.length; i++) {
-        let obj = this.MRList[i];
-        for (let j = 0; j < obj.BranchList.length; j++) {
-          obj.BranchList[j] = obj.BranchList[j].toString();
-        }
+      if(this.addMsg.MRList){
+          this.MRList = this.addMsg.MRList;
+          for (let i = 0; i < this.MRList.length; i++) {
+            let obj = this.MRList[i];
+            for (let j = 0; j < obj.BranchList.length; j++) {
+            obj.BranchList[j] = obj.BranchList[j].toString();
+            }
+        } 
       }
+      
 
 
 

src/components/confirmationOrderDownLoad.vue

@@ -1221,9 +1221,11 @@
           x.jiu2 = jiu2
           if (jin.length > 0) {
             details = jin
-          } else if (jiu.length > 0) {
-            details = jiu
-          } else if (dadian.length > 0) {
+          } 
+          // else if (jiu.length > 0) {
+          //  // details = jiu
+          // } 
+          else if (dadian.length > 0) {
             details = dadian
           } else if (jiao.length > 0) {
             if (j == this.tripList.length - 1) {

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -40,7 +40,7 @@
         <TravelNotice 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 @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==0"
+        <TravelPrice @saveMsg="PostConfig.IsUpdateHotel=1,SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==0"
           :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice>
         <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==1"
           :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2>
@@ -122,6 +122,8 @@
           Feature: "", //行程特色
           fileList: [],
           VideoStr: "", //视频地址
+          //是否更新酒店库存
+          IsUpdateHotel:0
         },
         //行程
         FeatureData: {
@@ -371,6 +373,7 @@
           basicData.TravelInfoIsCopy = true;
         }
         basicData.TeamType=this.TeamType;
+        basicData.IsUpdateHotel=this.PostConfig.IsUpdateHotel;
         this.apipost(
           "travel_post_SetTravelConfigInfo",
           basicData,

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -180,31 +180,36 @@
     border: 1px solid #d1d1d1;
   }
 
-  ._TravelPriceDetails table {
+  ._TravelPricePopover .jiDiv{
+    width:650px;
+    max-height:400px;
+    overflow: auto;
+  }
+  ._TravelPricePopover table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
     border-collapse: collapse;
     border: 1px solid #d2d2d2;
     font-size: 12px;
     margin: 0 20px 5px 0;
-    min-width: 800px;
+    width: 100%;
   }
 
-  ._TravelPriceDetails table ._color_666 {
+  ._TravelPricePopover table ._color_666 {
     background-color: #ededed;
     color: #666666;
     padding: 5px;
   }
 
-  ._TravelPriceDetails table td {
+  ._TravelPricePopover table td {
     background-color: #ffffff;
-    padding: 9px 30px;
+    padding: 9px 0;
     color: #333333;
     text-align: center;
     border: 1px solid #d2d2d2;
   }
 
-  ._TravelPriceDetails table td._d_name {
+  ._TravelPricePopover table td._d_name {
     background-color: #ededed;
   }
 
@@ -252,6 +257,7 @@
   .TP_Airticktid {
     text-decoration: underline;
     cursor: pointer;
+    color: #409eff;
   }
 
   .TP_noneed {
@@ -659,7 +665,7 @@
                     <span class="TPsecondTitle">机票绑定</span>
                   </div>
                   <div class="TPright clearfix">
-                    <el-popover popper-class="_TravelPriceDetails" trigger="click">
+                    <el-popover popper-class="_TravelPricePopover" trigger="click">
                       <div>
                         <div style="margin-bottom:20px;">
                           开始日期
@@ -672,37 +678,32 @@
                           </el-date-picker>
                           <button class="normalBtn" @click.stop="getSelectFilght()">查询</button>
                         </div>
-
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                          <tr>
-                            <td class="_color_666">选择</td>
-                            <td class="_color_666">航班号</td>
-                            <td class="_color_666">航空公司</td>
-                            <td class="_color_666">航段</td>
-                            <td class="_color_666">时间</td>
-                            <td class="_color_666">PNR</td>
-                            <td class="_color_666">机票数量</td>
-                            <td class="_color_666">使用数量</td>
-                            <td class="_color_666">绑定机位数</td>
-                          </tr>
-                          <tr v-for="fitem in selectFilghtList">
-                            <td>
-                              <el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>
-                            </td>
-                            <td><span class="TP_Airticktid"
-                                @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span>
-                            </td>
-                            <td>{{fitem.AlName}}</td>
-                            <td>{{fitem.DepartureName}}-{{fitem.ArrivalCityName}}</td>
-                            <td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
-                            <td>{{fitem.PNR}}</td>
-                            <td>{{fitem.TicketNum}}</td>
-                            <td>{{fitem.UseAmount}}</td>
-                            <td>
-                              <el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
-                            </td>
-                          </tr>
-                        </table>
+                        <div class="jiDiv">
+                          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td class="_color_666">选择</td>
+                              <td class="_color_666">航班号/航空公司/航段</td>
+                              <td class="_color_666">时间</td>
+                              <td class="_color_666">PNR</td>
+                              <td class="_color_666">机票数量/使用数量</td>
+                              <td class="_color_666">绑定机位数</td>
+                            </tr>
+                            <tr v-for="fitem in selectFilghtList">
+                              <td>
+                                <el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>
+                              </td>
+                              <td>
+                                <span class="TP_Airticktid" @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> / {{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
+                              </td>
+                              <td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
+                              <td>{{fitem.PNR}}</td>
+                              <td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td>
+                              <td>
+                                <el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
+                              </td>
+                            </tr>
+                          </table>
+                        </div>
                       </div>
                       <div slot="reference" class="SimulateDrop-box">
                         <span class="SD_flight" v-for="item in FinfoList">{{item.name}} {{item.date}}</span>
@@ -806,7 +807,7 @@
               <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID">
                 <span style="float: left">{{subItem.Name}}</span>
-                <span style="float: right; color:red; font-size: 13px">{{ subItem.Inventory }}</span>
+                <span style="float: right; color:red; font-size: 13px">剩余库存:{{subItem.Inventory}} / 价格:{{subItem.CostPrice}}</span>
               </el-option>
             </el-select>
           </td>
@@ -1552,7 +1553,7 @@
             IsMoreThanZero: 1
           };
           this.apipost(
-            "hotel_post_GetHasStockHotelList", msg,
+            "hotel_post_GetHasStockHotelListExt", msg,
             res => {
               if (res.data.resultCode == 1) {
                 item.HotelList = res.data.data;
@@ -1570,7 +1571,6 @@
           LineTeamId:this.PostConfig.LineteamId
         }
         this.apipost("sell_get_GetNewTCIDLessprice", msg,res => {
-            console.log(res,'res');
             if (res.data.resultCode == 1) {
                 this.lessPriceData = res.data.data;
             }else{
@@ -1620,7 +1620,6 @@
             this.DateArr.push(x.StartDate);
           });
           this.initCalendar();
-          console.log(this.priceData,'pricedate');
         },
         deep: true
       },
@@ -1645,5 +1644,4 @@
       TravelPriceFlightList: TravelPriceFlightList
     }
   };
-
-</script>
+</script>
\ No newline at end of file

src/components/systemManagement/currencyManagement.vue

@@ -161,6 +161,7 @@
                     <th>{{$t('fnc.chushihuilv')}}</th>
                     <th>{{$t('fnc.benqihuilv')}}</th>
                     <th>{{$t('fnc.danqgianhuilv')}}</th>
+                    <th>上调汇率</th>
                     <th>{{$t('fnc.zjjiner')}}</th>
                     <th>{{$t('system.table_operation')}}</th>
                 </tr>
@@ -178,6 +179,7 @@
                         <span>{{item.CurrentRate}}</span>
                         <span :class="item.IsStandardCurrency!=1?'':'display_none'" @click="getCurrentRate(item.ID,index)" class="iconfont icon-qiehuan"></span>
                     </td>
+                    <td>{{item.ExchangeRates}}</td>
                     <td><span class="_underline" @click="goUrl('FineBalance',item.ID,item.Name)">{{item.Money}}</span></td>
                     <td>
                         <el-button-group size='mini'>
@@ -233,6 +235,11 @@
                                 <el-input v-model="addMsg.Rate" disabled class="w135"></el-input>
                             </el-form-item>                        
                         </li>
+                        <li>
+                            <el-form-item label="上调汇率" prop="ExchangeRates">
+                                <el-input v-model="addMsg.ExchangeRates"  class="w135"></el-input>
+                            </el-form-item>                        
+                        </li>
                         <li>
                             <el-form-item :label="$t('fnc.sfbenweibi')+ '：'">
                                 <el-switch v-model="addMsg.IsStandardCurrency"
@@ -246,7 +253,7 @@
             </el-form>
             <div>
                 <ul class="clearfix" style="text-align: right;">
-                    <li class="_add_saveBtn"style="float: initial;" >
+                    <li class="_add_saveBtn" style="float: initial;" >
                         <button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>                            
                         <button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
                     </li>
@@ -288,7 +295,7 @@
             </el-form>
             <div>
                 <ul class="clearfix" style="text-align: right;"> 
-                    <li class="_add_saveBtn"style="float: initial;" >
+                    <li class="_add_saveBtn" style="float: initial;" >
                         <button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
                         <button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>                            
                     </li>
@@ -312,7 +319,8 @@
                     Name:'',
                     IsStandardCurrency:'0',
                     Code:'',
-                    Rate:''
+                    Rate:'',
+                    ExchangeRates:''
                 },
                 SetProfitLossMsg:{
                     ID:0,

src/router/config.js

@@ -1996,6 +1996,14 @@ export default {
                                 title: '报名统计'
                             },
                         },
+                        { // 票务 联运报名统计
+                            path: '/enrollTotalForAirUnion',
+                            name: 'enrollTotalForAirUnion',
+                            component: resolve => require(['@/components/SalesModule/enrollTotalForAirUnion'], resolve),
+                            meta: {
+                                title: '团队联运订单查询'
+                            },
+                        },
                         { // 销售 少价管理
                             path: '/Lowpricemanagement',
                             name: 'Lowpricemanagement',