上调汇率，营收报表修改，票务联运查询页面

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/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',