1

src/pages/financial/TeamRevenueReport.vue

@@ -970,7 +970,7 @@
           {
             field: "ClassBeginsStr",
             title: "开班时间",
-            width: 80,
+            width: 90,
             titleAlign: "left",
             columnAlign: "left",
             isResize: true,
@@ -1112,7 +1112,7 @@
           {
             field: "ClassFee",
             title: "课时费",
-            width: 50,
+            width: 70,
             titleAlign: "left",
             columnAlign: "right",
             isResize: true,
@@ -1120,7 +1120,7 @@
           {
             field: "JiXiaoMoney",
             title: "绩效奖金",
-            width: 50,
+            width: 70,
             titleAlign: "left",
             columnAlign: "right",
             isResize: true,
@@ -1128,7 +1128,7 @@
           {
             field: "QTZhiChu",
             title: "其他支出",
-            width: 50,
+            width: 70,
             titleAlign: "left",
             columnAlign: "right",
             isResize: true,
@@ -1214,8 +1214,8 @@
       };
     },
     created() {
-      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.StartTime=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:'';
+      this.msg.EndTime=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;
       if(this.$route.query.LtIdStr){
@@ -1224,9 +1224,9 @@
       if(this.$route.query.IsSelectTravelLoss){
         this.msg.IsSelectTravelLoss=this.$route.query.IsSelectTravelLoss
       }
-      if(this.msg.endDate!=""){
-        this.productionDate[0]=this.msg.startDate;
-        this.productionDate[1]=this.msg.endDate;
+      if(this.msg.EndTime!=""){
+        this.productionDate[0]=this.msg.StartTime;
+        this.productionDate[1]=this.msg.EndTime;
       }
 
       if(this.msg.LineId>0){
@@ -1280,13 +1280,19 @@
         this.msg.DataType="6";
       }
       let userInfo = this.getLocalStorage();
-      if(userInfo.School_Id>0){
-        this.msg.SchoolId =userInfo.School_Id
-      }else {
-        this.msg.SchoolId = -1
+      if(this.$route.query.BranchId){
+        this.msg.SchoolId=this.$route.query.BranchId!=undefined?this.$route.query.BranchId:'';
 
+      }else {
+        if(userInfo.School_Id>0){
+          this.msg.SchoolId =userInfo.School_Id
+        }else {
+          this.msg.SchoolId = -1
+        }
       }
 
+
+
       if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
         this.isShowType = false;
         this.msg.DataType='2';