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

src/pages/course/classManage.vue

@@ -423,6 +423,8 @@
           query: {
             ClassId: item.ClassId,
             School_Id: item.School_Id,
+            ClassName: item.ClassName,
+
             blank: 'y'
           }
         })

src/pages/course/paymentDetail.vue

@@ -140,6 +140,10 @@
       <div class="p_titleList">
         <div class="p_title">班级收支明细</div>
         <div style="display: flex;align-items: center;position:absolute;right:0;top:0">
+          <q-btn label="返回报名清单" color="accent q-px-md" size="sm"
+          style="font-weight:400 !important;margin-right: 15px;" @click="goclasslist2('orderStatistics')" />
+          <q-btn label="返回产品列表" color="accent q-px-md" size="sm"
+          style="font-weight:400 !important;margin-right: 15px;" @click="goclasslist2('japaneseTrain')" />
           <q-btn label="返回班级列表" color="accent q-px-md" size="sm"
           style="font-weight:400 !important;margin-right: 15px;" @click="goclasslist" />
           <q-btn label="导出" color="accent q-px-md" size="sm"
@@ -462,6 +466,7 @@
           ClassId: 0,
           School_Id: 0
         },
+        ClassName:'',
       }
     },
     created() {},
@@ -472,6 +477,9 @@
       if (this.$route.query && this.$route.query.School_Id) {
         this.msg.School_Id = this.$route.query.School_Id;
       }
+      if (this.$route.query && this.$route.query.ClassName) {
+        this.ClassName = this.$route.query.ClassName;
+      }
       this.getData();
     },
     methods: {
@@ -534,6 +542,15 @@
         this.$router.push({
           path: 'classManage',
         });
+      },
+      goclasslist2(path){
+        this.$router.push({
+          path:'/sale/'+ path,
+          query:{
+            ClassName:this.ClassName
+          }
+        });
+     
       }
     }
   }

src/pages/financial/saleAchievementsRank.vue

@@ -345,10 +345,18 @@
                 return diff;
             },
             gobaoming(row){//跳转到报名列表
+                let EndTime = this.msg.EndMonth
+                if(new Date(this.msg.StartMonth).getTime() == new Date(this.msg.EndMonth).getTime()){
+                    var d1=new Date( this.msg.EndMonth);
+                    d1.setMonth(d1.getMonth()+1);
+                    var month = d1.getMonth()+1;
+                    EndTime = d1.getFullYear()+'-'+month
+                    console.log(EndTime)
+                }
                 this.OpenNewUrl('/sale/orderStatistics' , {
                     EnterID:row.EnterID,
                     StartTime:this.msg.StartMonth,
-                    EndTime:this.msg.EndMonth,
+                    EndTime:EndTime,
                 });
             }
 

src/pages/sale/japaneseTrain.vue

@@ -354,7 +354,9 @@
       this.getSchool();
       this.CourseList();
       this.GetTeacherList();
-
+      if (this.$route.query && this.$route.query.ClassName) {
+        this.msg.ClassName = this.$route.query.ClassName;
+      }
       let nowDay = new Date();
       var year = nowDay.getFullYear(); //年
       var month = nowDay.getMonth() + 1; //月

src/pages/sale/orderStatistics.vue

@@ -206,10 +206,12 @@
       if (this.$route.query.EndTime) {
         this.msg.EndTime = this.$route.query.EndTime+'-01';
       }
-      console.log( this.msg.StartTime, this.msg.EndTime)
       if (this.$route.query.EnterID) {
         this.msg.EnterID = Number(this.$route.query.EnterID) ;
       }
+      if (this.$route.query.ClassName) {
+        this.msg.ClassName = this.$route.query.ClassName;
+      }
       this.getOrderState();
       this.getCourseList();
     },