11

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -743,233 +743,14 @@ export default {
           componentName: "TCNUMJump"
         },
         {
-          field: "TransportBranchName",
-          title: "联运公司",
+          field: "BName",
+          title: "出团公司",
           width: 80,
           titleAlign: "left",
           columnAlign: "left",
           isResize: true,
           isFrozen: true,
         },
-        {
-          field: "YingShou",
-          formatter: this.moneyFormat,
-          title: "应收金额",
-          width: 100,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        }, //,orderBy:''
-        {
-          field: "ShiShou",
-          formatter: this.moneyFormat,
-          title: "实收金额",
-          width: 100,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "TuiKuan",
-          formatter: this.moneyFormat,
-          title: "退款",
-          width: 100,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "PingTaiShuiJin",
-          formatter: this.moneyFormat,
-          title: "平台税金",
-          width: 100,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "ZaiTu",
-          formatter: this.moneyFormat,
-          title: "在途",
-          width: 100,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true,
-        },
-        {
-          field: "YouHui",
-          formatter: this.moneyFormat,
-          title: "优惠",
-          width: 100,
-          titleAlign: "left",
-          columnAlign: "right",
-          isResize: true,
-          componentName: "TCIDJumpWang"
-        },
-        {
-          field: "DaiShou",
-          formatter: this.moneyFormat,
-          title: "待收金额",
-          width: 100,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "YiShou",
-          formatter: this.moneyFormat,
-          title: "溢收金额",
-          width: 100,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "GuestNum",
-          title: "人数",
-          width: 50,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true,
-          componentName: "GuestNum"
-        },
-        {
-          field: "YaoQingHan",
-          formatter: this.moneyFormat,
-          title: "邀请函",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "CheZi",
-          formatter: this.moneyFormat,
-          title: "车资",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "JiPiao",
-          formatter: this.moneyFormat,
-          title: "机票款",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "GuoNeiLianYunJiPiao",
-          formatter: this.moneyFormat,
-          title: "国内联运机票",
-          width: 120,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        // {field: 'Money11', title: '房费',width: 90, titleAlign: 'left',columnAlign:'left',isResize:true},
-        {
-          field: "Visa",
-          formatter: this.moneyFormat,
-          title: "签证",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          title: "提成",
-          width: 100,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true,
-          formatter(rowData, rowIndex, pagingIndex, field) {
-            return 0
-          }
-        },
-        {
-          field: "QiTa",
-          formatter: this.moneyFormat,
-          title: "其他",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "DiJieZhiChu",
-          formatter: this.moneyFormat,
-          title: "地接款支出",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "DiJieShouRu",
-          formatter: this.moneyFormat,
-          title: "地接款收入",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "ZiFei",
-          formatter: this.moneyFormat,
-          title: "自费收入",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "XiaoFeiShouRu",
-          formatter: this.moneyFormat,
-          title: "小费收入",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "YongJinShouRu",
-          formatter: this.moneyFormat,
-          title: "佣金收入",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "YingFu",
-          formatter: this.moneyFormat,
-          title: "应付金额",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "MaoLi",
-          formatter: this.moneyFormat,
-          title: "毛利",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "MaoLiRate",
-          formatter: this.moneyFormat,
-          title: "毛利率",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
         {
           field: "ShiJiLiRun",
           formatter: this.moneyFormat,
@@ -980,17 +761,8 @@ export default {
           isResize: true
         },
         {
-          field: "Remark",
-          formatter: this.moneyFormat,
-          title: "备注",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "BName",
-          title: "出团公司",
+          field: "TransportBranchName",
+          title: "联运公司",
           width: 90,
           titleAlign: "left",
           columnAlign: "left",
@@ -1134,115 +906,6 @@ export default {
           titleAlign: "left",
           columnAlign: "left",
           isResize: true
-        },
-        {
-          field: "YingYeE",
-          formatter: this.moneyFormat,
-          title: "联运营业额",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },       
-        {
-          field: "RealIncome",
-          formatter: this.moneyFormat,
-          title: "实际营业额",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "GRPNum",
-          title: "GRP",
-          width: 60,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "TKTNum",
-          title: "TKT",
-          width: 60,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "VisaNum",
-          title: "VISA",
-          width: 60,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "ZiYouXingNum",
-          title: "自由行",
-          width: 60,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "DiJieNum",
-          title: "地接",
-          width: 60,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "HotelNum",
-          title: "酒店",
-          width: 60,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "DanTuanNum",
-          title: "单团",
-          width: 60,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "HuZhaoNum",
-          title: "护照",
-          width: 60,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "AverageIncome",
-          formatter: this.moneyFormat,
-          title: "平均收入",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "AverageCost",
-          formatter: this.moneyFormat,
-          title: "平均成本",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
-        },
-        {
-          field: "AverageProfit",
-          formatter: this.moneyFormat,
-          title: "平均利润",
-          width: 90,
-          titleAlign: "left",
-          columnAlign: "left",
-          isResize: true
         }
       ],
       footer: [],

src/components/Hotel/roomReservationsDetails.1.vue

@@ -508,7 +508,7 @@
         let that = this
         let newArr = []
         newArr.push(file.file)
-        let path = '/Upload/Temporary/'
+        let path = '/Upload/DMC/Hotel'
         this.$message.info('上传中...')
         this.UploadSelfFileT(path, newArr, x => {
           this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = this.domainManager()

src/components/Hotel/roomReservationsDetails.vue

@@ -161,6 +161,17 @@
                       <span v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">{{$t('ground.shoupeifei')}}:{{subItem.ShouPeiMoney}}</span>
                     </td>
                   </tr>
+                  <tr>
+                    <td colspan="2">
+                      <p style="padding-top: 5px;">
+                        <a v-if="subItem.ContractUrl" target="_blank" style="color:green" :href="subItem.ContractUrl">已上传手配书</a>
+                      </p>
+                      <el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
+                        <el-button size="small" type="danger" @click='getItem(index, subIndex)'>
+                          {{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
+                      </el-upload>
+                    </td>
+                  </tr>
                 </table>
               </td>
               <!-- 房间类型 -->
@@ -423,8 +434,13 @@
                       </el-select>
                     </td>
                   </tr>
+                  
                   <tr>
-                    <td colspan="2" style="height:5px;"></td>
+                    <td colspan="2" style="height:5px;">
+
+
+
+                    </td>
                   </tr>
                   <tr>
                     <td width="70" style="text-align:right;">{{$t('ground.duigysbz')}}：</td>
@@ -534,6 +550,8 @@
         IsEditHotelPeople: 1, //是否有修改人数权限[0-不能修改，1-可以修改]
         IsCombine: false, //是否是合团，true-是合团，false-不是合团
         allCurrencyList: [], //币种列表
+        checkedIndex: '',
+        checkedsubIndex: '',
       }
     },
     components: {
@@ -677,6 +695,23 @@
           }
         });
       },
+      getItem(index, subIndex) {
+        this.checkedIndex = index
+        this.checkedsubIndex = subIndex
+      },
+      uploadFileBtnS(file) { //手配书上传
+        let that = this
+        let newArr = []
+        newArr.push(file.file)
+        let path = '/Upload/DMC/Hotel'
+        this.$message.info('上传中...')
+        this.UploadSelfFileT(path, newArr, x => {
+          var fileUrl=this.domainManager()
+            .ViittoFileUrl + x.data.FilePath;
+          this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl =  fileUrl;
+          this.$forceUpdate()
+        })
+      },
       goUrl(path, obj, name) {
         this.$router.push({
           path: path,
@@ -835,8 +870,13 @@
             });
           })
         }
+        var flag=true;
         this.list.forEach(item => {
           item.HotelOrderList.forEach(subItem => {
+            if(subItem.CurrencyId==3&&subItem.ContractUrl==''){
+              this.Error('请上传手配书');
+              flag=false;
+            }
             subItem.OrderDetailsList.forEach((y, sIndex) => {
               if (y.HouseTypeCount) {
                 y.HouseTypeCount = parseFloat(y.HouseTypeCount);
@@ -865,23 +905,30 @@
             }
           });
         })
-        this.loading = true;
-        this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
-          this.loading = false;
-          if (res.data.resultCode == 1) {
-            this.getList();
-            this.Success(res.data.message);
-          } else {
-            this.Error(res.data.message);
-          }
-        }, err => {})
+        if(flag){
+          this.loading = true;
+          this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
+            this.loading = false;
+            if (res.data.resultCode == 1) {
+              this.getList();
+              this.Success(res.data.message);
+            } else {
+              this.Error(res.data.message);
+            }
+          }, err => {})
+        }
       },
       //单条保存
       SaveSingle(item) {
         item.HotelOrderState = 1;
+        var flag=true;
         this.list.forEach(item => {
           item.HotelOrderList.forEach(subItem => {
             subItem.OrderDetailsList.forEach(y => {
+              if(subItem.CurrencyId==3&&subItem.ContractUrl==''){
+                this.Error('请上传手配书');
+                flag=false;
+              }
               if (y.HouseTypeCount) {
                 y.HouseTypeCount = parseFloat(y.HouseTypeCount);
               } else {
@@ -910,18 +957,20 @@
             }
           });
         })
-        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();
-          } else {
-            this.Error(res.data.message);
-          }
-        }, err => {})
+        if(flag){
+          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();
+            } else {
+              this.Error(res.data.message);
+            }
+          }, err => {})
+        }
       },
 
       // 获取供应商

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2021,10 +2021,12 @@
                 </span>
                 <i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)"
                   style="margin-left: 5px;" class="el-icon-error color999"></i>
-                <el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||userId==1||userId==5'
-                  :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action="">
-                  <el-button size="small" type="danger" @click='getItem(item)'>上传</el-button>
-                </el-upload>
+                  <template v-if="item.contractNum.length==0">
+                    <el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||userId==1||userId==5'
+                      :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action="">
+                      <el-button size="small" type="danger" @click='getItem(item)'>上传</el-button>
+                    </el-upload>
+                  </template>
               </td>
               <td class="groupTourOrderIcon">
                 <el-button-group v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder'>
@@ -2091,7 +2093,7 @@
                           设置额外金额</div>
 
                         <div
-                          v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)'
+                          v-if='(item.confirmFileList.length>0||item.contractNum.length>0) && ((item.receivableMoney - item.invoiceApplyTotal) > 0)'
                           @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div>
                         <div v-if="item.orderState=='1'||item.orderState=='2'"
                           @click='setChargeLoss(item)'>
@@ -2173,6 +2175,13 @@
                     </span>
                     <div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none;">领取合同</div>
                     <div v-else class="GO_Contract" @click="goContract(item)" style="display:none;">{{item.contractNum}}</div>
+                    <div>
+                      <template v-if="item.contractNum&&item.contractNum.length>0">
+                        <span v-for="sItem in item.contractNum" class="GO_Contract" @click="goContract(item,sItem)">
+                            {{sItem.client_Name+''+sItem.contractNum}}
+                        </span>
+                      </template>
+                    </div>
               </div>
 
               </td>
@@ -4943,11 +4952,12 @@
         });
       },
        //跳转至领取合同
-      goContract(item){
+      goContract(item,sItem){
         let routeData = this.$router.resolve({
           name: 'TravelContractNew',
           query: {
             TCID: item.tcid,
+            guestId:sItem.guestId,
             orderID:item.orderId,
             blank: 'y'
           }

src/components/Ticketing/TicketManager.vue

@@ -1157,7 +1157,7 @@
 .TicketManager .TICK_Code {
     position: absolute;
     left: 27px;
-    top: 5px;
+    top: 0;
 }
 
 .TicketManager .TCID_cont {

src/components/Ticketing/flightPerformance.vue

@@ -64,8 +64,8 @@
       </ul>
     </div>
     <table class="fpTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"
-      v-for="(item,index) in dataList.resultList">
-      <tbody v-for="(subItem,subIndex) in item.TicketList">
+      v-for="(item,index) in dataList.resultList" :key="index">
+      <tbody v-for="(subItem,subIndex) in item.TicketList" :key="subIndex">
         <tr v-if="subIndex==0">
           <td colspan="6">
             <span class="creatName">{{item.CreateByName}}</span>
@@ -80,8 +80,8 @@
           <th>金额</th>
           <th>小计</th>
         </tr>
-        <template v-for="(childItem,childIndex) in subItem.SubList">
-          <tr>
+        <template v-for="(childItem,childIndex) in subItem.SubList" >
+          <tr :key="childIndex">
             <td width="10%">
               {{childIndex+1}}
             </td>
@@ -104,7 +104,7 @@
               v-if="childIndex==0">{{dataList.UnitPrice}}</td>
             <td width="10%">{{childItem.TicketNum*dataList.UnitPrice}}</td>
           </tr>
-          <tr v-if="childIndex==subItem.SubList.length-1">
+          <tr v-if="childIndex==subItem.SubList.length-1" :key="childIndex+500">
             <td></td>
             <td style="font-weight:bold;">合计</td>
             <td style="color:red;">

src/components/TravelContractNew.vue

@@ -243,7 +243,7 @@
         </div>
         <el-form label-width="180px" :model="CtObj" :rules="rules" ref="CtObj">
             <div class="container-fluid" style="padding-top: 60px; padding-left: 220px;">
-                <div class="block mtop15" id="anchor-0">
+                <div class="block mtop15" id="anchor-0" ref="anchor0">
                     <div class="blockTitle">
                         <span class="icon">
                             <i class="iconfont icon-dingdanguanli-"></i>
@@ -437,7 +437,7 @@
                         </tbody>
                     </table>
                 </div>
-                <div class="block mtop15" id="anchor-1">
+                <div class="block mtop15" id="anchor-1" ref="anchor1">
                     <div class="blockTitle">
                         <span class="icon">
                             <i class="iconfont icon-renwuguanli"></i>
@@ -790,7 +790,7 @@
                         </tbody>
                     </table>
                 </div>
-                <div class="block mtop15" id="anchor-2">
+                <div class="block mtop15" id="anchor-2" ref="anchor2">
                     <div class="blockTitle">
                         <span class="icon">
                             <i class="iconfont icon-copy"></i>
@@ -802,7 +802,7 @@
                     <div style="padding:10px;">未尽事宜，经旅游者和出境社双方协商一致，可以列入补充条款。(如合同空间不够，可以另附纸张，由双方签字或者盖章确认。)</div>
                     <el-input type="textarea" resize="none" v-model="CtObj.otherMatter" rows="13"></el-input>
                 </div>
-                <div class="block mtop15" id="anchor-3">
+                <div class="block mtop15" id="anchor-3" ref="anchor3">
                     <div class="blockTitle">
                         <span class="icon">
                             <i class="iconfont icon-Shape2"></i>
@@ -883,7 +883,7 @@
                         </tbody>
                     </table>
                 </div>
-                <div class="block mtop15" id="anchor-4">
+                <div class="block mtop15" id="anchor-4" ref="anchor4">
                     <div class="blockTitle">
                         <span class="icon">
                             <i class="iconfont icon-Shape1"></i>
@@ -1009,7 +1009,7 @@
                     </div>
                     <!-- <el-input type="textarea" rows="26" resize="none" v-model="CtObj.travelContent"></el-input>    -->
                 </div>
-                <div class="block mtop15" id="anchor-5">
+                <div class="block mtop15" id="anchor-5" ref="anchor5">
                     <div class="blockTitle">
                         <span class="icon">
                             <i class="iconfont icon-people"></i>
@@ -1048,7 +1048,7 @@
                     </table>
 
                 </div>
-                <div class="block mtop15" id="anchor-6">
+                <div class="block mtop15" id="anchor-6" ref="anchor6">
                     <div class="blockTitle">
                         <span class="icon">
                             <i class="iconfont icon-bianji"></i>
@@ -1122,7 +1122,7 @@
                          </tbody>   
                     </table>
                 </div>
-                <div class="block mtop15" id="anchor-7">
+                <div class="block mtop15" id="anchor-7" ref="anchor7">
                     <div class="blockTitle">
                         <span class="icon">
                             <i class="iconfont icon-bianji"></i>
@@ -1727,14 +1727,22 @@
         var _self = this;
         _self.scroll = (document.documentElement.scrollTop || document.body.scrollTop)+70;
         //滑动到指定位置相应菜单高亮
-        var a_0 = $("#anchor-0").offset().top;
-        var a_1 = $("#anchor-1").offset().top;
-        var a_2 = $("#anchor-2").offset().top;
-        var a_3 = $("#anchor-3").offset().top;
-        var a_4 = $("#anchor-4").offset().top;
-        var a_5 = $("#anchor-5").offset().top;
-        var a_6 = $("#anchor-6").offset().top;
-        var a_7 = $("#anchor-7").offset().top;
+        var a_0 = this.$refs.anchor0.offsetTop;
+        var a_1 = this.$refs.anchor1.offsetTop;
+        var a_2 = this.$refs.anchor2.offsetTop;
+        var a_3 = this.$refs.anchor3.offsetTop;
+        var a_4 = this.$refs.anchor4.offsetTop;
+        var a_5 = this.$refs.anchor5.offsetTop;
+        var a_6 = this.$refs.anchor6.offsetTop;
+        var a_7 = this.$refs.anchor7.offsetTop;
+        // var a_0 = $("#anchor-0").offset().top;
+        // var a_1 = $("#anchor-1").offset().top;
+        // var a_2 = $("#anchor-2").offset().top;
+        // var a_3 = $("#anchor-3").offset().top;
+        // var a_4 = $("#anchor-4").offset().top;
+        // var a_5 = $("#anchor-5").offset().top;
+        // var a_6 = $("#anchor-6").offset().top;
+        // var a_7 = $("#anchor-7").offset().top;
         if (_self.scroll < a_0) {
             this.ckedIndex = 0
         } else if (_self.scroll>a_0 && _self.scroll < a_1) {

src/components/TravelManager/Ticket/TravelMyTicket.vue

@@ -73,6 +73,8 @@
     margin: 20px 0 0px 15px;
     transition: linear all 0.5s;
     background-color: #fff;
+    padding:10px 0 5px 0;
+    position: relative;
   }
 
   .TravelMyTicket ._ol_list>li:hover {
@@ -100,9 +102,9 @@
   .TravelMyTicket ._oll_line {
     max-width: 5px;
     min-width: 5px;
-    height: 107px;
+    height: 100%;
     position: absolute;
-    left: 5px;
+    left: 0;
     top: 0;
     z-index: 50;
     background: rgba(233, 82, 82, 1);
@@ -601,7 +603,7 @@
   .TravelMyTicket .vmiddle {
     display: flex;
     align-items: Center;
-    height: 78px;
+    /* height: 78px; */
   }
 
   .TM_AirUrl {
@@ -617,7 +619,6 @@
   .TravelMyTicket .TICK_Code {
     position: absolute;
     left: 25px;
-    top: 5px;
   }
 
   .TravelMyTicket .TCID_cont {
@@ -634,8 +635,8 @@
   /*航班详情*/
   .TravelMyTicket .FlightDivDetails {
     width: 100%;
-    height: 65px;
-    overflow: auto;
+    /* height: 65px; */
+    /* overflow: auto; */
   }
 
   .TravelMyTicket ._flightList {
@@ -728,11 +729,11 @@
       <div class="_ol_info">
         <ul class="_ol_list" v-loading="loading">
           <li v-for="(item,index) in dataList" :data-id="item.Id">
+            <span class="_oll_line" v-if="item.FreightSpace==1"></span>
+            <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
+            <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
             <el-row :gutter="10">
               <el-col :span="2" class="vmiddle">
-                <span class="_oll_line" v-if="item.FreightSpace==1"></span>
-                <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
-                <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
                 <div class="TM_AirUrl">
                   <span class="TICK_Code">{{$t('op.PurchaseNumber')}}：{{item.Id}}</span>
                   <img v-if="!item.AirlineUrl" class="_oll_img" src="../../../assets/img/bg_z1@2x.png">
@@ -857,15 +858,15 @@
                   {{$t('visa.v_tuanhao')}}：<span v-if="item.TCNUM!=''">{{item.TCNUM}}</span>
                 </div>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="4">
                 <div class="TCID_cont"> {{$t('op.Procurement')}}：<span style="color:red;">{{item.PurchaseManName}}</span> </div>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <div class="TCID_cont">
                   {{$t('fnc.jpbianhao')}}：{{item.AirticketId}}
                 </div>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <div class="TCID_cont">
                   PNR：{{item.PNR}} <template v-if="item.MidpiecePNR">&nbsp;&nbsp;{{$t('op.CenterPNR')}}:{{item.MidpiecePNR}}</template>
                 </div>

src/components/TravelManager/Ticket/TravelticketManager.1.vue

@@ -67,6 +67,7 @@
     overflow: hidden;
     transition: linear all 0.5s;
     background-color: #fff;
+    padding:10px 0 5px 0;
   }
 
   .TravelticketManager ._ol_list>li:hover {
@@ -94,11 +95,11 @@
   .TravelticketManager ._oll_line {
     max-width: 5px;
     min-width: 5px;
-    height: 107px;
+    height: 100%;
     z-index: 50;
     position: absolute;
     top: 0;
-    left: 5px;
+    left: 0;
     background: rgba(233, 82, 82, 1);
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;
@@ -116,6 +117,7 @@
   .TravelticketManager ._oll_info {
     padding-left: 20px;
     overflow: hidden;
+    margin-top:-15px;
   }
 
   .TravelticketManager ._oll_img {
@@ -567,7 +569,7 @@
   .TravelticketManager .vmiddle {
     display: flex;
     align-items: Center;
-    height: 78px;
+    /* height: 78px; */
   }
 
   .TM_btm {
@@ -577,7 +579,7 @@
   .TravelticketManager .TICK_Code {
     position: absolute;
     left: 25px;
-    top: 5px;
+    /* top: 5px; */
   }
 
   .TravelticketManager .TCID_cont {
@@ -600,8 +602,8 @@
   /*航班详情*/
   .TravelticketManager .FlightDivDetails {
     width: 100%;
-    height: 65px;
-    overflow: auto;
+    /* height: 65px; */
+    /* overflow: auto; */
   }
 
   .TravelticketManager ._flightList {
@@ -669,11 +671,11 @@
       <div class="_ol_info">
         <ul class="_ol_list" v-loading="loading">
           <li v-for="(item,index) in dataList" :data-id="item.ID">
+            <span class="_oll_line" v-if="item.FreightSpace==1"></span>
+            <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
+            <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
             <el-row :gutter="10">
               <el-col :span="3" class="vmiddle">
-                <span class="_oll_line" v-if="item.FreightSpace==1"></span>
-                <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
-                <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
                 <div>
                   <span class="TICK_Code">编号：{{item.ID}}</span>
                   <img class="_oll_img" v-if="item.AirlineUrl" :src="item.AirlineUrl" :onerror="defaultImg" />

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -67,6 +67,7 @@
     overflow: hidden;
     transition: linear all 0.5s;
     background-color: #fff;
+    padding:10px 0 5px 0;
   }
 
   .TravelticketManager ._ol_list>li:hover {
@@ -94,11 +95,11 @@
   .TravelticketManager ._oll_line {
     max-width: 5px;
     min-width: 5px;
-    height: 107px;
+    height: 100%;
     z-index: 50;
     position: absolute;
     top: 0;
-    left: 5px;
+    left: 0;
     background: rgba(233, 82, 82, 1);
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;
@@ -116,6 +117,7 @@
   .TravelticketManager ._oll_info {
     padding-left: 20px;
     overflow: hidden;
+    margin-top:-15px;
   }
 
   .TravelticketManager ._oll_img {
@@ -183,56 +185,56 @@
     border-right: 1px dashed #dcdfe6;
   }
 
-  .SeatList {
+  .SeatListTM {
     width: 120px;
     height: 60px;
     background-color: #f9f9f9;
-    margin: 9px 15px 0 0;
+    margin-right:15px;
   }
 
-  .SeatList>ul>li:nth-child(1) {
+  .SeatListTM>ul>li:nth-child(1) {
     margin-left: 16px;
   }
 
-  .SeatList>ul>li {
+  .SeatListTM>ul>li {
     float: left;
     text-align: center;
     margin: 5px 10px 0 0;
   }
 
-  .SeatList>ul>li:last-child {
+  .SeatListTM>ul>li:last-child {
     margin-right: 0;
   }
 
-  .SeatList .iconfont {
+  .SeatListTM .iconfont {
     color: #d1d1d1;
     display: inline-block;
     margin-top: 5px;
   }
 
-  .SeatList ._num1 {
+  .SeatListTM ._num1 {
     font-size: 16px;
     color: #333333;
     font-family: PingFangSC-Semibold, sans-serif;
   }
 
-  .SeatList ._num2 {
+  .SeatListTM ._num2 {
     font-size: 16px;
     color: #47bf8c;
     font-family: PingFangSC-Semibold, sans-serif;
   }
 
-  .SeatList ._num3 {
+  .SeatListTM ._num3 {
     font-size: 16px;
     color: #e95252;
     font-family: PingFangSC-Semibold, sans-serif;
   }
 
-  .SeatList ._wz {
+  .SeatListTM ._wz {
     color: #666666;
   }
 
-  .SeatList ._yiyong {
+  .SeatListTM ._yiyong {
     cursor: pointer;
     text-decoration: underline;
   }
@@ -567,7 +569,7 @@
   .TravelticketManager .vmiddle {
     display: flex;
     align-items: Center;
-    height: 78px;
+    /* height: 78px; */
   }
 
   .TM_btm {
@@ -577,7 +579,7 @@
   .TravelticketManager .TICK_Code {
     position: absolute;
     left: 25px;
-    top: 5px;
+    /* top: 5px; */
   }
 
   .TravelticketManager .TCID_cont {
@@ -587,8 +589,8 @@
     text-indent: 20px;
   }
 
-  .Ticket_TCID {
-    margin-right: 2px;
+  .Ticket_TCIDTMA {
+    margin:2px 2px 0 0;
   }
 
   .TravelticketManager .disClick {
@@ -600,8 +602,8 @@
   /*航班详情*/
   .TravelticketManager .FlightDivDetails {
     width: 100%;
-    height: 65px;
-    overflow: auto;
+    /* height: 65px; */
+    /* overflow: auto; */
   }
 
   .TravelticketManager ._flightList {
@@ -701,11 +703,11 @@
       <div class="_ol_info">
         <ul class="_ol_list" v-loading="loading">
           <li v-for="(item,index) in dataList" :data-id="item.ID">
+            <span class="_oll_line" v-if="item.FreightSpace==1"></span>
+            <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
+            <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
             <el-row :gutter="10">
               <el-col :span="3" class="vmiddle">
-                <span class="_oll_line" v-if="item.FreightSpace==1"></span>
-                <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
-                <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
                 <div>
                   <span class="TICK_Code">{{$t('hotel.hotel_SerialNumber')}}：{{item.ID}}</span>
                   <img class="_oll_img" v-if="item.AirlineUrl" :src="item.AirlineUrl" :onerror="defaultImg" />
@@ -754,7 +756,7 @@
               </el-col>
               <el-col :span="3" class="vmiddle">
                 <div class="_Seat">
-                  <div class="SeatList">
+                  <div class="SeatListTM">
                     <ul class="clearfix">
                       <li>
                         <span class="iconfont icon-img_yizi"></span>
@@ -839,7 +841,7 @@
                 <div class="TCID_cont PingFangSC">
                   {{$t('fnc.tuanqi')}}：
                   <span v-show="item.PriceList.length==0">{{$t('pub.noMsg')}}</span>
-                  <span class="Ticket_TCID" v-for="subItem in item.PriceList">
+                  <span class="Ticket_TCIDTMA" v-for="subItem in item.PriceList">
                     <a style="color:blue;cursor:pointer" @click='goUrlT("TravelControlList",subItem.TCNUM,"团控列表")'>
                     ({{subItem.TCID}}){{subItem.TCNUM}} </a>
                     &nbsp;</span>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -482,7 +482,7 @@
                     <el-popover width="700" trigger="click" popper-class="TC_customerInfo">
                       <table width="100%" border="0" cellspacing="0" cellpadding="0">
                         <tr>
-                          <td rowspan="2" style="text-align:center" width="60">
+                          <td rowspan="3" style="text-align:center" width="60">
                             <i>{{$t('Operation.Op_standard')}}</i>
                           </td>
                           <td class="TC_cusTitle">{{$t('Operation.Op_fellowMember')}}</td>
@@ -516,6 +516,10 @@
                             <b>{{item.TipAmount|priceFormat(item.TipAmount)}}</b>
                           </td>
                         </tr>
+                        <tr>
+                            <td style="text-align:right;">非中国大陆护照报价</td>
+                            <td colspan="6"><b>{{item.ForeignPassportPrice}}</b></td>
+                        </tr>
                         <tr>
                           <td rowspan="2" style="text-align:center">
                             <i>{{$t('Operation.Op_Income')}}</i>

src/components/activity/PersonnelManagement.vue

@@ -238,7 +238,7 @@
                       @mouseleave="outTable"
                       @mouseover="activeTd(index,4)"
                       @click="chosen(index,4)"
-                    >{{item.AdSend}}分钟</td>
+                    >{{item.AdSend}}</td>
                     <td
                       @mouseleave="outTable"
                       @mouseover="activeTd(index,5)"
@@ -289,7 +289,7 @@
                       @mouseleave="outTable"
                       @mouseover="activeTd(index,13)"
                       @click="chosen(index,13)"
-                    >{{item.OutTime}}</td>
+                    >{{item.OutTime}}小时</td>
                     <td
                       @mouseleave="outTable"
                       @mouseover="activeTd(index,14)"

src/components/administrative/AirticketCommission.vue

@@ -11,7 +11,7 @@
     <div class="query-box">
       <ul>
         <li>
-          <input v-if="IsAuth==1" type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable"  />
+          <input v-if="IsAuth==1 || CurrentUserInfo.EmployeeId==5|| CurrentUserInfo.EmployeeId==615" type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable"  />
         </li>
       </ul>
     </div>
@@ -23,7 +23,7 @@
         <th>日期</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
-      <tr v-for="item in dataList">
+      <tr v-for="(item,index) in dataList" :key="index">
         <td>{{item.Periods}}</td>
         <td>{{item.SumPrice}}</td>
         <td>{{item.CreateByName}}</td>
@@ -61,9 +61,12 @@
         currentPage: 1,
         isDisable:false,
         IsAuth:0,//生成票务提成权限
+        CurrentUserInfo:{},//当前用户对象
       }
     },
     mounted() {
+      let userInfo = this.getLocalStorage();
+      this.CurrentUserInfo=userInfo;
       this.GetAuth();
       this.getList();
     },

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -550,6 +550,20 @@
                   </el-form-item>
                 </div>
               </div>
+              <div class="clearfix">
+                <div class="leftSetInfo">
+                  <span class="TPbaseSet"></span>
+                  <span class="TPsecondTitle"></span>
+                </div>
+                <div class="TPright">
+                  <el-form-item prop="ForeignPassportPrice">
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w300 ComSeat" v-model="priceData.ForeignPassportPrice"
+                      @keyup.native="checkPrice(priceData,'ForeignPassportPrice')">
+                      <template slot="prepend">非中国大陆护照报价</template>
+                    </el-input>
+                  </el-form-item>
+                </div>
+              </div>
               <div class="clearfix">
                 <div class="leftSetInfo">
                   <span class="TPbaseSet"></span>
@@ -1206,6 +1220,8 @@
                 //可退景点下拉列表
                 ScenicBackList: [],
                 TipAmount:0,//人头小费金额
+                //非中国大陆护照报价
+                ForeignPassportPrice:0
               };
             }
             this.returnPriceList.push(objItem);
@@ -1387,6 +1403,7 @@
           this.isNullOrEmpty(quotationPrice.ChildNoNeedPrice) ||
           this.isNullOrEmpty(quotationPrice.OldManChargePrice) ||
           this.isNullOrEmpty(quotationPrice.OtherPrice) ||
+          this.isNullOrEmpty(quotationPrice.ForeignPassportPrice)||
           this.isNullOrEmpty(quotationPrice.SingleRoomPrice) ||
           this.isNullOrEmpty(quotationPrice.VisaPrice) ||
           this.isNullOrEmpty(quotationPrice.SingleDMCPrice) ||

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -512,6 +512,20 @@
                   </el-form-item>
                 </div>
               </div>
+              <div class="clearfix" style="display:none;">
+                <div class="leftSetInfo">
+                  <span class="TPbaseSet"></span>
+                  <span class="TPsecondTitle"></span>
+                </div>
+                <div class="TPright">
+                  <el-form-item prop="ForeignPassportPrice">
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w300 ComSeat" v-model="priceData.ForeignPassportPrice"
+                      @keyup.native="checkPrice(priceData,'ForeignPassportPrice')">
+                      <template slot="prepend">非中国大陆护照报价</template>
+                    </el-input>
+                  </el-form-item>
+                </div>
+              </div>
               <div class="clearfix">
                 <div class="leftSetInfo">
                   <span class="TPbaseSet"></span>
@@ -893,7 +907,9 @@
                 PriceTagIds: [],
                 PriceFlight: JSON.parse(
                   JSON.stringify(this.PostConfig.FlightList)
-                )
+                ),
+                //非中国大陆护照报价
+                ForeignPassportPrice:0
               };
             }
             this.queryFlightAirListData.forEach(subItem=>{
@@ -1141,6 +1157,7 @@
           this.isNullOrEmpty(quotationPrice.ChildNoNeedPrice) ||
           this.isNullOrEmpty(quotationPrice.OldManChargePrice) ||
           this.isNullOrEmpty(quotationPrice.OtherPrice) ||
+          this.isNullOrEmpty(quotationPrice.ForeignPassportPrice)||
           this.isNullOrEmpty(quotationPrice.SingleRoomPrice) ||
           this.isNullOrEmpty(quotationPrice.VisaPrice) ||
           this.isNullOrEmpty(quotationPrice.SingleDMCPrice) ||

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -528,6 +528,20 @@
                   </el-form-item>
                 </div>
               </div>
+              <div class="clearfix" style="display:none;">
+                <div class="leftSetInfo">
+                  <span class="TPbaseSet"></span>
+                  <span class="TPsecondTitle"></span>
+                </div>
+                <div class="TPright">
+                  <el-form-item prop="ForeignPassportPrice">
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w300 ComSeat" v-model="priceData.ForeignPassportPrice"
+                      @keyup.native="checkPrice(priceData,'ForeignPassportPrice')">
+                      <template slot="prepend">非中国大陆护照报价</template>
+                    </el-input>
+                  </el-form-item>
+                </div>
+              </div>
               <div class="clearfix" style="display:none;">
                 <div class="leftSetInfo">
                   <span class="TPbaseSet"></span>
@@ -1013,6 +1027,8 @@
                 IsNew: false,
                 //选中的酒店数组
                 ChooseHotelArray: [],
+                //非中国大陆护照报价
+                ForeignPassportPrice:0
               };
             }
             this.returnPriceList.push(objItem);
@@ -1272,6 +1288,7 @@
           this.isNullOrEmpty(quotationPrice.ChildNoNeedPrice) ||
           this.isNullOrEmpty(quotationPrice.OldManChargePrice) ||
           this.isNullOrEmpty(quotationPrice.OtherPrice) ||
+          this.isNullOrEmpty(quotationPrice.ForeignPassportPrice)||
           this.isNullOrEmpty(quotationPrice.SingleRoomPrice) ||
           this.isNullOrEmpty(quotationPrice.VisaPrice) ||
           this.isNullOrEmpty(quotationPrice.SingleDMCPrice) ||

src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue

@@ -557,6 +557,20 @@
                   </el-form-item>
                 </div>
               </div>
+              <div class="clearfix" style="display:none;">
+                <div class="leftSetInfo">
+                  <span class="TPbaseSet"></span>
+                  <span class="TPsecondTitle"></span>
+                </div>
+                <div class="TPright">
+                  <el-form-item prop="ForeignPassportPrice">
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w300 ComSeat" v-model="priceData.ForeignPassportPrice"
+                      @keyup.native="checkPrice(priceData,'ForeignPassportPrice')">
+                      <template slot="prepend">非中国大陆护照报价</template>
+                    </el-input>
+                  </el-form-item>
+                </div>
+              </div>
               <div class="clearfix">
                 <div class="leftSetInfo">
                   <span class="TPbaseSet"></span>
@@ -1207,6 +1221,8 @@
                 //可退景点下拉列表
                 ScenicBackList: [],
                 TipAmount:0,//人头小费金额
+                //非中国大陆护照报价
+                ForeignPassportPrice:0
               };
             }
             this.returnPriceList.push(objItem);
@@ -1388,6 +1404,7 @@
           this.isNullOrEmpty(quotationPrice.ChildNoNeedPrice) ||
           this.isNullOrEmpty(quotationPrice.OldManChargePrice) ||
           this.isNullOrEmpty(quotationPrice.OtherPrice) ||
+          this.isNullOrEmpty(quotationPrice.ForeignPassportPrice)||
           this.isNullOrEmpty(quotationPrice.SingleRoomPrice) ||
           this.isNullOrEmpty(quotationPrice.VisaPrice) ||
           this.isNullOrEmpty(quotationPrice.SingleDMCPrice) ||