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

src/components/FinancialModule/JumpReport.vue

@@ -834,6 +834,9 @@ export default {
         if(this.$route.query.Type){
             this.msg.Type = this.$route.query.Type+'';
         }
+        if(this.$route.query.IsJapanNonbusinessIncome){
+            this.msg.IsJapanNonbusinessIncome = this.$route.query.IsJapanNonbusinessIncome;
+        }
         if(this.$route.query.year && this.$route.query.month)
         {
             this.msg.sTradeDate=this.$route.query.year+"-"+this.$route.query.month+"-01";

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -838,7 +838,7 @@ export default {
   methods:{
     goUrl (path,startDate,endDate,BranchId,tab) {
 
-	        this.$router.push({ name: path,query:{"startDate":startDate,"endDate":endDate,BranchId:BranchId,blank:'y',tab:tab} }) 
+	    this.$router.push({ name: path,query:{"startDate":startDate,"endDate":endDate,BranchId:BranchId,blank:'y',tab:tab} }) 
     },
     GoUrlFan(path,month,year,BranchId, ids) {
       this.$router.push({
@@ -917,6 +917,25 @@ export default {
         else if(rowData.ZhaiYao=="歐洲與南亞損失分攤"){
           that.goUrl("AirTicketLoss",startDate,endDate,BranchId,"机票分摊")
         }
+        else if(rowData.ZhaiYao=="营业外收入"){
+          
+          if(that.msg.BranchId==1218){
+            this.$router.push({
+              path: "/JumpReport",
+              query: { 
+                year:rowData.Year,
+                month:month,
+                BranchId:rowData.BranchId,
+                CostIds:rowData.CostIds,
+                "IsJapanNonbusinessIncome":1,
+                blank: "y" 
+              }
+            });
+          }else{
+            that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
+          }
+          
+        }
         else{
           that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
         } 

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1713,6 +1713,38 @@ export default {
     if(this.msg.LineId==-4){
       this.msg.DataType="3";
     }
+    //景点门票
+    if(this.msg.LineId==-8){
+      this.msg.DataType="10";
+    }
+    // 票务部专户
+    if(this.msg.LineId==-7){
+      this.msg.DataType="8";
+    }
+    // 酒店住宿
+    if(this.msg.LineId==-9){
+      this.msg.DataType="9";
+    }
+    // 餐厅美食
+    if(this.msg.LineId==-10){
+      this.msg.DataType="11";
+    }
+    // 单机票
+    if(this.msg.LineId==-11){
+      this.msg.DataType="14";
+    }
+    // 单机票
+    if(this.msg.LineId==-11){
+      this.msg.DataType="14";
+    }
+    // 老挝地接部
+    if(this.msg.LineId==-6){
+      this.msg.DataType="7";
+    }
+    // 日本地接部
+    if(this.msg.LineId==-5){
+      this.msg.DataType="6";
+    }
     let userInfo = this.getLocalStorage();
     if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
         this.isShowType = false;

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2297,7 +2297,7 @@
                     <span class="RL-remarkTitle"> {{$t('pub.pubRemark')}}:</span>
                     <p class="RL-redType RL-remarkCon">
                       <span v-if="childItem.TsIdList&&childItem.TsIdList.length>0">{{$t('salesModule.ComplaintNum')}}：
-                        <a clas="underline" v-for="ts in childItem.TsIdList" href="javascript:void(0);"
+                        <a clas="underline" style="text-decoration:underline;" v-for="ts in childItem.TsIdList" href="javascript:void(0);"
                           @click="goUrlTS('ComplaintsDetail',ts,childItem.OrderId,'投诉详情')">{{ts}} </a>
                         ;</span>
                       <span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}{{$t('fnc.dingdan')}}