Browse Source

异常提醒跳转

1
mo 2 years ago
parent
commit
8a084dbefc

+ 3 - 3
src/views/main/cloudDate/organMemberList.vue

@@ -80,7 +80,7 @@
           <el-table-column
             align="center"
             prop="totalStudentNum"
-            label="学员总数"
+            label="在读学员总数"
           >
             <!-- <template slot="header" slot-scope="slot">
               <div class="titleCell">
@@ -102,12 +102,12 @@
               </div>
             </template> -->
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             prop="effectiveStudentNum"
             label="有效学员数"
           >
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="center"
             prop="vipStudentNum"

+ 17 - 2
src/views/main/constant.js

@@ -309,12 +309,13 @@ export const errorType = {
     name: '当月排课异常',
     isError: true,
     always: true,
-    url: '/teamCourseList',
-    permission: '/teamCourseList',
+    url: '/smallCourseConsumption',
+    permission: '/smallCourseConsumption',
     query: {
       searchType: 'CURRENT_COURSE_ERROR',
       ...dates,
       start: dayjs().subtract(1, 'month').set('date', 1).format('YYYY-MM-DD'),
+      tabrouter:'2'
     },
   },
   //   start: '2021-02-01',  start: '2021-02-01',
@@ -330,6 +331,20 @@ export const errorType = {
       start: dayjs().subtract(1, 'month').set('date', 1).format('YYYY-MM-DD'),
     },
   },
+  WAIT_RENEW_INFO:{
+    name: '待续费学员',
+    isError: false,
+    always: true,
+    url: '/studentManager/smallStudentManager',
+    permission: '/smallStudentManager',
+
+    query: {
+      ...dates,
+      start: dayjs().subtract(1, 'month').set('date', 1).format('YYYY-MM-DD'),
+      subCourseMaxNum:3,
+      studentStatus:'NORMAL'
+    },
+  },
   TEACHER_LEAVE: {
     name: '老师请假',
     isError: false,

+ 6 - 0
src/views/main/studentLeaveList.vue

@@ -75,6 +75,12 @@
           </el-table-column>
           <el-table-column
             align="center"
+            label="课时数"
+            prop="courseNum"
+          >
+        </el-table-column>
+          <el-table-column
+            align="center"
             label="近两个月请假次数"
             prop="totalNum"
           >

+ 2 - 0
src/views/smallCourseConsumption/index.vue

@@ -38,6 +38,8 @@ export default {
       activeIndex: "1",
     };
   },
+  mounted() {
+  },
   methods: {
     handleClick(evt) {
       // this.changeHash(evt.name);

+ 8 - 0
src/views/smallStudentManager/components/tableList.vue

@@ -35,6 +35,7 @@
           <el-option label="沉睡" value="SLEEPY"></el-option>
           <el-option label="流失" value="LOST"></el-option>
           <el-option label="暂停" value="PAUSE"></el-option>
+          <el-option label="其他" value="OTHER"></el-option>
         </el-select>
       </el-form-item>
       <!-- <el-form-item prop="feedbackType">
@@ -477,6 +478,13 @@ export default {
   async mounted() {
     this.$store.dispatch("setBranchs");
     this.$store.dispatch("setTeachers");
+    if(this.$route.query.subCourseMaxNum){
+      this.searchForm.subCourseMaxNum = this.$route.query.subCourseMaxNum
+    }
+    if(this.$route.query.studentStatus){
+      this.searchForm.studentStatus = this.$route.query.studentStatus
+    }
+
     await this.getList();
   },
   methods: {

+ 15 - 11
src/views/teamBuild/components/teamBaseInfo.vue

@@ -483,40 +483,44 @@
             prop="paymentUserType"
 
           >
-            <el-select
+          <el-select
               v-model.trim="topFrom.paymentUserType"
               filterable
               :disabled="basdisabled"
               clearable
             >
               <el-option
-                v-for="(item, index) in gradeList"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
+
+                label="学校"
+                value="SCHOOL"
 
               ></el-option>
+              <el-option label="学员" value="STUDENT"></el-option>
+<el-option label="第三方" value="THIRDPARTY"
+
+></el-option>
             </el-select>
           </el-form-item>
           <el-form-item
             label="计费方式"
-            prop="paymentUserType"
+            prop="chargeMode"
 
           >
-            <el-select
+          <el-select
               v-model.trim="topFrom.chargeMode"
               filterable
               :disabled="basdisabled"
               clearable
             >
               <el-option
-                v-for="(item, index) in gradeList"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
+
+                label="学员计费"
+                value="STUDENT"
 
               ></el-option>
+              <el-option label="老师计费" value="TEACHER"></el-option>
             </el-select>
+
           </el-form-item>