简易报表跳转，国内票务变更

src/components/DomesticModule/OrderToday.vue

@@ -562,7 +562,7 @@ export default {
         },
         jiesuan(){
             if(!this.TermDate){
-                return this.$message.error('请选择结算日期');
+                return this.$message.error('请选择结算日期') ;
             }
             this.apipost('Domestic_Ticket_post_CheckBiLL',{TermDate:this.TermDate,sDate:this.msg.sDate,eDate:this.msg.eDate},r=>{
                 if(r.data.resultCode==1){

src/components/DomesticModule/SettlementOrder.vue

@@ -57,6 +57,7 @@
         <div class="_content">
             <table class="_content_tab singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading = 'loading'>
                 <tr>
+                    <th>机票类别</th>
                     <th>期数</th>
                     <th>应收金额</th>
                     <th>成本</th>
@@ -65,9 +66,11 @@
                     <th>实付</th>
                     <th>待收金额</th>
                     <th>实际利润</th>
+                    <th>操作人</th>
                     <th>操作</th>
                 </tr>
                 <tr v-for="(item,index) in dataList">
+                    <td>{{item.IsInter==0?"国内机票":"国际机票"}}</td>
                     <td>{{item.Term}}</td>
                     <td>¥{{item.Money}}</td>
                     <td>¥{{item.Cost}}</td>
@@ -109,17 +112,18 @@
                         <span v-if="item.Status!=0" :class="Math.abs(item.RealProfit)>0?'_color_red':''">¥{{Math.abs(item.RealProfit)}}</span>
                         <span v-else>-</span>
                     </td>
+                    <td>{{item.EmName}}<br/>{{item.UpdateDate}}</td>
                     <td>
                         <el-tooltip class="item" effect="dark" content="详情" placement="top">
                             <el-button type="danger"  class="_bth_bg_gr" @click="goUrl('OrderDetails',item.Term)" circle>详</el-button>
                         </el-tooltip>         
-                        <el-tooltip class="item" effect="dark" content="收款" placement="top">
+                        <el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="收款" placement="top">
                             <el-button type="primary" class="_bth_bg_bl" @click="goUrlT(item,1)" circle>收</el-button>
                         </el-tooltip>
-                        <el-tooltip class="item" effect="dark" content="付款" placement="top">
+                        <el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="付款" placement="top">
                             <el-button type="danger" class="_bth_bg_bgr" @click="goUrlT(item,2)" circle>付</el-button>
                         </el-tooltip>
-                        <el-tooltip class="item" effect="dark" content="确认" placement="top">
+                        <el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="确认" placement="top">
                             <el-button v-if="item.Status==0" type="danger" class="_bth_bg_bl" @click="queren(item)" circle>确</el-button>
                         </el-tooltip>
                     </td>
@@ -157,6 +161,7 @@ export default {
             dataList:[],
             noData:false,
             total:0,
+            emID:0,
             currentPage:1,
             loading:true,
             transactionDate:[],
@@ -173,6 +178,7 @@ export default {
     mounted(){
         this.getList();
         let userInfo = this.getLocalStorage();
+        this.emID=userInfo.EmployeeId;
         this.RB_Branch_Id = userInfo.RB_Branch_id;
     },
     methods:{

src/components/FinancialModule/JumpReport.vue

@@ -295,6 +295,7 @@
                     <button class="normalBtn" @click="method5()">导出</button>
                 </li>
             </ul>
+            <div>应收金额：{{SumYingShou}} 实收金额：{{SumShiShou}} 待收金额：{{SumDaiShou}} <br/>应付金额：{{SumYingFu}} 实付金额：{{SumShiFu}} 待付金额：{{SumDaiFu}}</div>
         </div>
         <div class="_fnDm_content" v-loading='loading'>
             <v-table
@@ -763,6 +764,12 @@ export default {
             isCkedAll: false,
             currentPage:1,
             total:0,
+            SumYingShou:0,
+            SumShiShou:0,
+            SumDaiShou:0,
+            SumYingFu:0,
+            SumShiFu:0,
+            SumDaiFu:0,
             ChineseStr:'',
             mathNumber:'',
             DepartIDs:'',
@@ -902,8 +909,14 @@ export default {
             this.loading= true;
             this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
                 if(res.data.resultCode == 1) {
-                    let data = res.data.data.pageData;
+                    let data = res.data.data.pageData.list;
                     this.total = res.data.data.count;
+                    this.SumYingShou=res.data.data.pageData.SumYingShou;
+                    this.SumShiShou=res.data.data.pageData.SumShiShou;
+                    this.SumDaiShou=res.data.data.pageData.SumDaiShou;
+                    this.SumYingFu=res.data.data.pageData.SumYingFu;
+                    this.SumShiFu=res.data.data.pageData.SumShiFu;
+                    this.SumDaiFu=res.data.data.pageData.SumDaiFu;
                     if(this.total==0){
                         this.DataList=[];
                     }else{

src/components/FinancialModule/RecPayQuery.vue

@@ -902,7 +902,7 @@ export default {
             this.loading= true;
             this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
                 if(res.data.resultCode == 1) {
-                    let data = res.data.data.pageData;
+                    let data = res.data.data.pageData.list;
                     this.total = res.data.data.count;
                     if(this.total==0){
                         this.DataList=[];

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -96,7 +96,6 @@ Vue.component("YiYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -126,7 +125,6 @@ Vue.component("ErYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -156,7 +154,6 @@ Vue.component("SanYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -186,7 +183,6 @@ Vue.component("SiYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -216,7 +212,6 @@ Vue.component("WuYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -246,7 +241,6 @@ Vue.component("LiuYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -276,7 +270,6 @@ Vue.component("QiYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -306,7 +299,6 @@ Vue.component("BaYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -336,7 +328,6 @@ Vue.component("JiuYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -366,7 +357,6 @@ Vue.component("ShiYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -396,7 +386,6 @@ Vue.component("ShiYiYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,
@@ -426,7 +415,6 @@ Vue.component("ShiErYueJump", {
       this.$router.push({
         path: "/" + path,
         query: { 
-          id: id,
           year:year,
           month:month,
           BranchId:BranchId,