添加团队人数统计，修改营收报表

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1421,7 +1421,7 @@ export default {
     this.msg.startDate=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:'';
     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.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
+    this.msg.OutBranchId=this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):this.msg.OutBranchId;
     if(this.msg.endDate!=""){
       this.productionDate[0]=this.msg.startDate;
       this.productionDate[1]=this.msg.endDate;
@@ -1741,7 +1741,6 @@ export default {
           }
         };
       });
-      console.log(dataInfo);
       // return
       XLSX.writeFile(wb, xlsxName + ".xlsx");
     },
@@ -2109,14 +2108,11 @@ export default {
     getPageList() {
       // 获取列表数据
       this.loading = true;
-      if (!this.msg.OutBranchId && this.msg.OutBranchId !== 0)
-        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;
       if (!this.msg.TCID) this.msg.TCID = 0;
       if (this.msg.startDate == "") this.msg.startDate = "2019-01-01";
-      console.log("this.msg",this.msg);
       this.apipost(
         "financestatistics_post_GetPageList",
         this.msg,
@@ -2189,7 +2185,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/activity/TravelInfoList.vue

@@ -124,9 +124,9 @@
 					<el-tooltip class="item" effect="dark" content="删除" placement="top">
 						<el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button>
 					</el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="取消" placement="top">
+                    <!-- <el-tooltip class="item" effect="dark" content="取消" placement="top">
 						<el-button @click="Exit(item)" style="background:#62DC9E" class='zidingyiFz' icon="el-icon-document-remove" circle ></el-button>
-					</el-tooltip>
+					</el-tooltip> -->
 				</td>
 
 			</tr>
@@ -308,24 +308,24 @@ import moment from "moment"
                     }
                 }, null);
             },
-            Exit(item){
-                this.$confirm('是否取消该条行程定制信息?', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning'
-					}).then(() => {
-                        this.apiJavaPost("/api/b2b/free/cancelTravelCoupom",{customId:item.customId}, res => {
-                            if (res.data.resultCode === 1) {
-                                this.Success(res.data.message)
-                                this.getList();
-                            } else {
-                            this.Error(res.data.message)
-                            }
-                        }, null);
-					}).catch(() => {
+            // Exit(item){
+            //     this.$confirm('是否取消该条行程定制信息?', '提示', {
+			// 			confirmButtonText: '确定',
+			// 			cancelButtonText: '取消',
+			// 			type: 'warning'
+			// 		}).then(() => {
+            //             this.apiJavaPost("/api/b2b/free/cancelTravelCoupom",{customId:item.customId}, res => {
+            //                 if (res.data.resultCode === 1) {
+            //                     this.Success(res.data.message)
+            //                     this.getList();
+            //                 } else {
+            //                 this.Error(res.data.message)
+            //                 }
+            //             }, null);
+			// 		}).catch(() => {
 						
-					});
-            },
+			// 		});
+            // },
 			Delete(item){
                 this.$confirm('是否删除该条行程定制信息?', '提示', {
 						confirmButtonText: '确定',

src/router/config.js

@@ -2714,6 +2714,14 @@ export default {
                             meta: {
                                 title: '团队营收统计'
                             },
+                        },
+                        { //财务 报表 团队人数统计
+                            path: '/NumberStatistics',
+                            name: 'NumberStatistics',
+                            component: resolve => require(['@/components/FinancialModule/ReportForm/NumberStatistics'], resolve),
+                            meta: {
+                                title: '团队人数统计'
+                            },
                         }, {
                             path: '/JumpReport',
                             name: 'JumpReport',