简易报表

src/components/DomesticModule/OrderDetails.vue

@@ -241,8 +241,9 @@ export default {
                 AirlineId:'',
                 FlightNo:'',
                 ClientName:'',
-                Term:'',
+                //Term:'',
                 ParentId:1,
+                ParentId:0,
             },
             AirportNameList:[],
             total:0,  
@@ -256,7 +257,8 @@ export default {
         }
     },
     created(){
-        this.Term = this.msg.Term = this.$route.query.Term;     
+        this.Term  = this.$route.query.Term;    
+        this.msg.ParentId=this.$route.query.ID; 
     },
     mounted(){
         this.getList(this.id);

src/components/DomesticModule/SettlementOrder.vue

@@ -125,7 +125,7 @@
                     <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-button type="danger"  class="_bth_bg_gr" @click="goUrl('OrderDetails',item.Term,item.ID)" circle>详</el-button>
                         </el-tooltip>         
                         <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>
@@ -167,7 +167,8 @@ export default {
                 pageSize:15,
                 sDate:'',
                 eDate:'',
-                IsInter:'-1'
+                IsInter:'-1',
+                ID:0,
             },
             dataList:[],
             noData:false,
@@ -191,6 +192,7 @@ export default {
         let userInfo = this.getLocalStorage();
         this.emID=userInfo.EmployeeId;
         this.RB_Branch_Id = userInfo.RB_Branch_id;
+        this.msg.ID=this.$route.query.id;
     },
     methods:{
         jumpPage(path,id,term,type){
@@ -264,10 +266,11 @@ export default {
                 }
             );            
         },
-        goUrl(path,Term){
-            this.$router.push({name:path,query:{'Term':Term,blank:'y'}})
+        goUrl(path,Term,id){
+            this.$router.push({name:path,query:{'Term':Term,'ID':id,blank:'y'}})
         },
         getList(){
+            console.log(this.msg);
             this.loading = true;
             this.apipost('Domestic_Ticket_post_GetBillPageList',this.msg,r=>{
                 if(r.data.resultCode==1){

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -79,7 +79,11 @@ import Vue from "vue";
 //一月
 Vue.component("YiYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.YiYue}}</span>`,
+  template: `
+  <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.YiYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.YiYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -109,7 +113,11 @@ Vue.component("YiYueJump", {
 //二月
 Vue.component("ErYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ErYue}}</span>`,
+  template: `
+   <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ErYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.ErYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -139,7 +147,10 @@ Vue.component("ErYueJump", {
 //三月
 Vue.component("SanYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SanYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SanYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.SanYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -169,7 +180,10 @@ Vue.component("SanYueJump", {
 //四月
 Vue.component("SiYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SiYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SiYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.SiYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -199,7 +213,10 @@ Vue.component("SiYueJump", {
 //五月
 Vue.component("WuYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.WuYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.WuYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.WuYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -229,7 +246,10 @@ Vue.component("WuYueJump", {
 //六月
 Vue.component("LiuYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.LiuYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.LiuYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.LiuYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -259,7 +279,10 @@ Vue.component("LiuYueJump", {
 //七月
 Vue.component("QiYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.QiYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.QiYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.QiYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -289,7 +312,10 @@ Vue.component("QiYueJump", {
 //八月
 Vue.component("BaYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.BaYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.BaYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.BaYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -319,7 +345,10 @@ Vue.component("BaYueJump", {
 //九月
 Vue.component("JiuYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.JiuYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.JiuYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.JiuYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -349,7 +378,10 @@ Vue.component("JiuYueJump", {
 //十月
 Vue.component("ShiYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.ShiYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -379,7 +411,10 @@ Vue.component("ShiYueJump", {
 //十一月
 Vue.component("ShiYiYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYi}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYiYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.ShiYiYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -409,7 +444,10 @@ Vue.component("ShiYiYueJump", {
 //十二月
 Vue.component("ShiErYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiEr}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiEr}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.ShiEr}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -421,7 +459,7 @@ Vue.component("ShiErYueJump", {
       type: Number
     }
   },
-  methods: {
+   methods: {
     goUrl(path,month,year,BranchId, ids) {
       this.$router.push({
         path: "/" + path,

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -581,9 +581,11 @@ import { setTimeout } from "timers";
 Vue.component("TCIDJump", {
   //  团队跳转
   template: `
-  <div >
+  <div>
     <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span> 
+    <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
   </div>
   
   `,