Pārlūkot izejas kodu

Merge branch '01/21VipReset' into online

wolyshaw 4 gadi atpakaļ
vecāks
revīzija
088cf1d6af

+ 2 - 1
src/views/main/reminders/index.vue

@@ -22,7 +22,8 @@
         path: '/business/teamDetail',
         query: {
           filter_type: item.errorType,
-          search: (item.result || []).join(',')
+          search: (item.result || []).join(','),
+          organId: search.organId || undefined,
         }
       })"
       style="width: 100%;color: #303133;"

+ 1 - 1
src/views/studentManager/components/teamAndcourse.vue

@@ -131,7 +131,7 @@
                             width="180px"
                             label="上课时间">
               <template slot-scope="scope">
-                {{ scope.row.courseSchedule.classDate | dayjsFormat }} 
+                {{ scope.row.courseSchedule.classDate | dayjsFormat }}
                 {{
                   scope.row.courseSchedule.startClassTime | dayjsFormatMinute
                 }}-{{

+ 4 - 0
src/views/teamDetail/teamList.vue

@@ -337,6 +337,10 @@ export default {
     closeStudens
   },
   mounted () {
+    const { query } = this.$route
+    if (query.organId) {
+      this.topForm.orgin = query.organId
+    }
     this.init();
   },
   activated () {