年度排名统计新增跳转

src/components/FinancialModule/BasicDocuments.vue

@@ -814,7 +814,7 @@
                                         <!-- <th width="100px">账户余额</th> -->
                                         <th>金额</th>
                                         <th width="70">币种</th>
-                                        <th width="50px">汇率</th>
+                                        <th width="150px">汇率</th>
                                         <!-- <th>手续费</th> -->
                                         <th width="100px">总金额</th>
                                         <!-- <th>操作</th> -->
@@ -869,7 +869,7 @@
                                             <td>
                                                 <el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input>
                                             </td>
-                                            <td>{{Math.round(i.allMoney * 100) / 100}}</td>
+                                            <td>{{i.allMoney}}</td>
                                         </tr>
                                     </template>
                                     <tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
@@ -1310,6 +1310,7 @@ export default {
         let allMoney = 0
         this.payMsgList.forEach(x=>{
             allMoney+= parseFloat(x.allMoney);
+            x.allMoney=Math.round(x.allMoney * 100) / 100;
         })
         this.allMoney = Math.round(allMoney * 100) / 100;
     },
@@ -1506,8 +1507,10 @@ export default {
                 let fee = this.payMsgList[index].Fee,
                     Rate = this.payMsgList[index].Rate==0?1:this.payMsgList[index].Rate,
                     Money = this.payMsgList[index].OriginalMoney;
-                    Rate=Rate*100;                    
+                    Rate=Rate*100;  
                 this.payMsgList[index].allMoney = Math.round(((Money*Rate)+fee) * 100) / 100 / 100;
+                    
+                    // console.log('this.payMsgList[index].allMoney', this.payMsgList[index].allMoney)                  
             } else {
                 this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee);
                 this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate);

src/components/FinancialModule/JumpReport.vue

@@ -851,6 +851,10 @@ export default {
         if(this.$route.query.BranchId){
             this.msg.RB_Branch_Id=parseInt(this.$route.query.BranchId);
         }
+        if(this.$route.query.IsFormEasyReport){
+            this.msg.IsFormEasyReport=parseInt(this.$route.query.IsFormEasyReport);
+        }
+        
        if(this.$route.query.CostIds){
             let arr = this.$route.query.CostIds ? this.$route.query.CostIds.split(',') : []
             if (arr.length) {
@@ -868,7 +872,6 @@ export default {
         this.DepartIDs = userInfo.RB_Department_Id;
         this.userId = userInfo.EmployeeId;
         this.msg.EmployeeId= userInfo.EmployeeId;
-        this.msg.IsFormEasyReport=1;
         this.financeinfo_post_GetList();
         this.financeinfo_post_GetCostTypeList();
         this.FinancialFlowTemplate_post_GetList();
@@ -953,7 +956,6 @@ export default {
                 })
                 console.log(this.msg.CostTypeIDs)
             }
-            this.msg.IsFormEasyReport=1;
             this.loading= true;
             this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
                 if(res.data.resultCode == 1) {
@@ -980,7 +982,7 @@ export default {
                     this.$message.error(res.data.message);
                 }
                 this.msg.TCID= this.msg.TCID=0?this.msg.TCID:'';
-                this.queryInfoInit();
+                // this.queryInfoInit();
                 this.currentPage = parseInt(this.msg.pageIndex);
             },err=>{})
         },
@@ -1298,6 +1300,7 @@ export default {
                 OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
               Sort:this.msg.Sort,
               EmployeeId:this.msg.EmployeeId,
+
             }
             this.msg = msg;
         },

src/components/FinancialModule/ReportForm/AnnualRanking.vue

@@ -423,11 +423,12 @@
           <div v-show="type==0 || type==8">
                 <div class="year">{{msg.Year}}年机票罚金排名</div>
                 <el-table border
+                    @cell-click="TicketCellClick"
                     :cell-class-name="CellName"
                     :header-cell-class-name="HeaderName"
                     :data="AirPenalty"
                     style="width: 100%">
-                        <el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column>
+                        <el-table-column fixed prop="BranchName" label="公司名称" min-width="100"> </el-table-column>
                         <el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column>
                         <el-table-column sortable prop="February" label="二月" min-width="100"> </el-table-column>
                         <el-table-column sortable prop="March" label="三月" min-width="100"> </el-table-column>
@@ -488,6 +489,80 @@
 			this.GetList();
 		},
 		methods:{
+            // 机票罚金跳转
+            TicketCellClick(row, column, cell){
+                let year=this.msg.Year;
+                let month=0;
+                let BranchId=0;
+                let CostIds=53;
+                let IsFormEasyReport=2;
+                if(column.property=="BranchName" || column.property=="FirstQuarter" || column.property=="SecondQuarter" || column.property=="HalfReport" || column.property=="ThirdQuarter" || column.property=="FourthQuarter" || column.property=="LastHalfReport"|| column.property=="Total"){
+                    return;
+                }
+                if(column.property=="January"){
+                    month=1;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="February"){
+                    month=2;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="March"){
+                    month=3;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="March"){
+                    month=3;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="April"){
+                    month=4;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="May"){
+                    month=5;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="June"){
+                    month=6;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="July"){
+                    month=7;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="August"){
+                    month=8;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="September"){
+                    month=9;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="October"){
+                    month=10;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="November"){
+                    month=11;
+                    BranchId=row.BranchId;
+                }
+                if(column.property=="December"){
+                    month=12;
+                    BranchId=row.BranchId;
+                }
+                this.$router.push({
+                    path: "/JumpReport",
+                    query: { 
+                    year:year,
+                    month:month,
+                    BranchId:BranchId,
+                    CostIds:CostIds,
+                    IsFormEasyReport:IsFormEasyReport,
+                    blank: "y" 
+                    }
+                });
+            },
             HeaderName({row, column}){
                 if(column.property=="Total" || column.property=="HalfReport" || column.property=="LastHalfReport"){
                     return "TableRed"