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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -513,6 +513,7 @@ tr._item_list td:last-child {
                 <el-option value="19" v-if="isShowType" label="单项门票"></el-option>
                 <el-option value="20" label="开票收入"></el-option>
                 <el-option value="21" label="日本手配费收入"></el-option>
+                <el-option value="22" label="车行收入"></el-option>
               </el-select>
               <el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150"  v-if="isShowGrounding==false">
                 <el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
@@ -760,6 +761,7 @@ Vue.component("TCIDJump", {
     <span style="cursor: pointer" v-if="rowData.DataType===14" @click="goSAirRec('TicketManager',rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===15">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===16">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===22">{{rowData.TCID}}</span>
   </div>
 
   `,
@@ -880,6 +882,7 @@ Vue.component("TCNUMJump", {
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===19" @click="goUrl('SingleticketOrderListOP',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
     <span v-if="rowData.DataType===20">{{rowData.TCNUM}}</span>
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===21" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
+    <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===22" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
   </div>`,
   props: {
     rowData: {
@@ -2256,6 +2259,9 @@ export default {
     if(this.msg.LineId==-18){
       this.msg.DataType="21";
     }
+    if(this.msg.LineId==-19){
+      this.msg.DataType="22";
+    }
     let userInfo = this.getLocalStorage();
     if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
         this.isShowType = false;