1

src/components/FinancialModule/ReportForm/NumberStatistics.vue

@@ -482,7 +482,9 @@ tr._item_list td:last-child {
             </el-form-item>
           </el-col> -->
         </el-row>
+        <p v-if="msg.OutBranchId==1218" style="color:red;">注: 内部收入团数抓取的所有付过手配费给日本公司的团与台湾的所有团。内部收入金额抓取的日本已制单的手配费收入，暂不支持跳转查看详情</p>
       </el-form>
+     
       <ul class="clearfix">
         <li class="hight_query">
           <button class="normalBtn" @click="togbu()">{{$t('pub.searchBtn')}}</button>
@@ -651,7 +653,7 @@ export default {
       if (!this.msg.OutBranchId && this.msg.OutBranchId !== 0)
         this.msg.OutBranchId = -1;
       if (!this.msg.TCID) this.msg.TCID = 0;
-      if (this.msg.QStartDate == "") this.msg.QStartDate = "2019";
+      if (this.msg.QStartDate == "") this.msg.QStartDate = new Date().getFullYear()+"";
       this.apipost('financestatistics_post_GetPeopleMonthReportList', this.msg, res=>{
 
         if (res.data.resultCode == 1) {
@@ -873,6 +875,17 @@ export default {
       let EndTime=field+`EndTime`;
       let LineId=Number(rowData.LineId);
       let OutBranchId=rowData.BranchId;
+    let TeamType=0;
+    if(rowIndex==6||rowIndex==7){
+      TeamType=1;
+    }else if(rowIndex==8||rowIndex==9){
+      TeamType=2;
+    }else if(rowIndex==10||rowIndex==11){
+      TeamType=3;
+    }
+    if(LineId == -999){
+     return;
+    }
       this.$router.push({
           path: "TeamRevenueReport",
           query: {
@@ -880,6 +893,7 @@ export default {
             StartTime:rowData[StartTime],
             EndTime:rowData[EndTime],
             OutBranchId:OutBranchId,
+            TeamType:TeamType,
             blank: 'y',
             tab: '营收报表'
           }

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2157,6 +2157,7 @@ export default {
     this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
     this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
     this.msg.OutBranchId=this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):this.msg.OutBranchId;
+    this.msg.TeamType=(this.$route.query.TeamType?Number(this.$route.query.TeamType):this.msg.TeamType)+'';
     if(this.$route.query.LtIdStr){
       this.msg.LtIdStr=this.$route.query.LtIdStr
     }