增加一个跳转

src/components/FinancialModule/FinancialDocuments.vue

@@ -644,10 +644,10 @@
                          <el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1"  class="item" :content="$t('fnc.tzjyriqi')"  placement="top">
                             <i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng" @click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate" ></i>
                         </el-tooltip>
-                        <!-- <el-tooltip class="item" content="交易方式" placement="top" v-if="active==2 && istransaction == true">
+                        <el-tooltip class="item" content="交易方式" placement="top" v-if="active==2 && istransaction == true">
                             <i v-if="active==2" class="iconfont icon-zhifupeizhiguanli"
                               @click="showjiaoyi(item.FrID)"></i>
-                          </el-tooltip> -->
+                          </el-tooltip>
 
                     </td>
                 </tr>
@@ -1078,7 +1078,7 @@ export default {
             accountList2:[],
             trabeList:[],//获取的交易方式列表
             alltransaction:[],
-            istransaction:true,
+            istransaction:false,
 
 
 
@@ -1094,6 +1094,9 @@ export default {
         if(ActionMenuCode.indexOf('F_HandWithFee')!=-1){
             this.HandShow=true;
         }
+        if(ActionMenuCode.indexOf('F_Trademodify')!=-1){
+            this.istransaction=true;
+        }
         if(this.$route.query.returnCode){
             this.active = this.$route.query.returnCode;
             this.msg.Conditon = this.$route.query.returnCode;
@@ -2010,10 +2013,10 @@ export default {
           }
           msg.push(obj)
         })
-        this.apipost('Financial_post_SetFinanceTrabeInfo', msg, res => {
+        this.apipost('Financial_get_SetFinanceTrabeInfo', msg, res => {
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message);
-            this.transactionmode = true
+            this.transactionmode = false
             this.getPageList()
           }else{
             this.Error(res.data.message);

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -689,10 +689,10 @@ Vue.component("TCIDJump", {
   //  团队跳转
   template: `
   <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===1"  @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span> 
+    <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span>
-    <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===6||rowData.DataType===7||rowData.DataType===12||rowData.DataType===13">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===8">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===9">{{rowData.TCID}}</span>
@@ -715,11 +715,19 @@ Vue.component("TCIDJump", {
     }
   },
   methods: {
-    goUrl(path, id) {
-      this.$router.push({
-        path: "/" + path,
-        query: { id: id, blank: "y" }
-      });
+    goUrl(path, id ,row) {
+      if(row.TeamType==2){//为一日游的时候跳转到一日游团控列表
+        this.$router.push({
+            path: "/oneDayTrip" ,
+            query: { id: id, blank: "y" }
+          });
+      }else{
+        this.$router.push({
+          path: "/" + path,
+          query: { id: id, blank: "y" }
+        });
+      }
+      
     },
     goUrlVisa(path, id) {
       this.$router.push({
@@ -732,7 +740,7 @@ Vue.component("TCIDJump", {
 Vue.component("TCNUMJump", {
   //  团队跳转
   template: `<div>
-  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===1"  @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span> 
+  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===1"  @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span> 
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===2" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
@@ -820,11 +828,19 @@ Vue.component("TCNUMJump", {
       });
 
     },
-    goUrl(path, id) {
-      this.$router.push({
+    goUrl(path, id,row) {
+      if(row.TeamType==2){//为一日游的时候跳转到一日游团控列表
+          this.$router.push({
+            path: "/oneDayTrip" ,
+            query: { id: row.TCID, blank: "y" }
+          });
+      }else{
+        this.$router.push({
         path: "/" + path,
         query: { tcmun: id, blank: "y" }
       });
+      }
+      
     },
     goUrlExtend(path, id) {
       this.$router.push({

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -1615,6 +1615,9 @@
           this.queryMsg = this.$store.state.pageCondition
         }
       }
+      if(this.$route.query.id){
+        this.queryMsg.TCID = this.$route.query.id
+      }
       var myDate = new Date()
       var nowDate =
         myDate.getFullYear() +