Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -616,7 +616,12 @@ Vue.component("TCIDJump", {
 });
 Vue.component("TCNUMJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span>`,
+  template: `<div>
+  <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span> 
+  <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -634,7 +639,18 @@ Vue.component("TCNUMJump", {
         path: "/" + path,
         query: { tcmun: id, blank: "y" }
       });
-    }
+    },
+    goUrlExtend(path, id) {
+      this.$router.push({
+        path: "/" + path,
+        query: { id: id, blank: "y" }
+      });
+    },goUrlVisa(path, id) {
+      this.$router.push({
+        path: "/" + path,
+        query: { VisaID: id, blank: "y" }
+      });
+    },
   }
 });
 Vue.component("GuestNum", {
@@ -914,6 +930,7 @@ export default {
           isResize: true
         },
         {
+          field: "TiCheng",
           title: "提成",
           width: 100,
           titleAlign: "left",
@@ -1570,6 +1587,7 @@ export default {
       if (field === "GuoNeiLianYunJiPiao")
         return this.priceFormat(rowData.GuoNeiLianYunJiPiao);
       if (field === "Visa") return this.priceFormat(rowData.Visa);
+      if (field === "TiCheng") return this.priceFormat(rowData.TiCheng);
       if (field === "CompensationMoney") return this.priceFormat(rowData.CompensationMoney);
       if (field === "QiTa") return this.priceFormat(rowData.QiTa);
       if (field === "DiJieZhiChu") return this.priceFormat(rowData.DiJieZhiChu);
@@ -1786,7 +1804,7 @@ export default {
             this.loading = false;
             this.$message.error(res.data.message);
           }
-          if ((this.msg.OutBranchId = -1)) this.msg.OutBranchId = -1;
+          if (this.msg.OutBranchId === -1) this.msg.OutBranchId = -1;
           if (!this.msg.StartCityId) this.msg.StartCityId = 0;
           if (!this.msg.LineId) this.msg.LineId = 0;
           if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;

src/components/Ticketing/individualTicket.vue

@@ -548,7 +548,7 @@ import moment from 'moment'
     },
     created(){
       if(this.$route.query.id){
-        this.msg.Flight_number=this.$route.query.id;
+        this.msg.ID=this.$route.query.id;
       }
     },
     methods: {