Merge branch '03/03GRADE' into 11/24SAAS

src/api/systemManage.js

@@ -50,7 +50,8 @@ export function queryByOrganId (data) {
   return request({
     url: api + '/cooperationOrgan/queryByOrganId',
     method: 'get',
-    params: data
+    params: data,
+    hideLoading:true
   })
 }
 

src/utils/request-loading.js

@@ -10,16 +10,26 @@ export async function showFullScreenLoading(store) {
     await store.dispatch('app/setLoadStatus', true)
     load.startLoading()
   } else {
-    await store.dispatch('app/setLoadCount', 1)
-    clearTimeout(timer)
-    timer = null
+    if(store.getters.loadCount < 0){
+      await store.dispatch('app/resetLoadCount')
+      await store.dispatch('app/setLoadCount', 1)
+      clearTimeout(timer)
+      timer = null
+    }else{
+      await store.dispatch('app/setLoadCount', 1)
+      clearTimeout(timer)
+      timer = null
+    }
+
   }
 
 
 }
 
 export async function tryHideFullScreenLoading(store) {
+  console.log(store.getters.loadCount)
   await store.dispatch('app/setLoadCount', -1)
+
   if (store.getters.loadCount <= 0 && store.getters.isLoading) {
     if(timer)return
     timer = setTimeout(async () => {

src/utils/request.js

@@ -74,7 +74,11 @@ const service = axios.create({
 service.interceptors.request.use(
   async config => {
     // do something before request is sent
-    await showFullScreenLoading(store);
+    let hideLoading = config.hideLoading || false;
+    if (!hideLoading) {
+      await showFullScreenLoading(store);
+    }
+
     if (store.getters.token) {
       // let each request carry token
       // ['X-Token'] is a custom headers key

src/views/main/constant.js

@@ -35,22 +35,23 @@ export const descs = {
   MUSIC_PATROL_ITEM: '乐团主管提交的巡查表中有未勾选事项',
   HIGH_CLASS_STUDENT_LESS_THAN_THREE: '基础技能班学员数量<3且没有备注',
   HIGH_CLASS_STUDENT_LESS_THAN_THREE_INFO:'基础技能班学员数量<3且有备注',
-  STUDENT_NOT_PAYMENT: '当前时间以前的缴费项目中未缴费学员数量',
+  STUDENT_NOT_PAYMENT: '已添加到缴费项目中，未排课且未缴费学员数量',
   STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP: '未处理的学员退团申请数量',
   TEACHER_EXPECT_SALARY_BE_LOW: '本月预计课酬未达到系统设置的分部基本课酬标准的老师人数',
   INSPECTION_ITEM: '乐团主管未完成巡查计划安排',
   INSPECTION_ITEM_PLAN: '乐团主管已安排的巡查任务未提交',
   STUDENT_VISIT: '乐团主管未完成回访任务',
-  TEACHER_EXCEPTION_ATTENDANCE: '课程上有老师考勤异常',
-  STUDENT_EXCEPTION_ATTENDANCE:'课程上有学员考勤异常',
+  TEACHER_EXCEPTION_ATTENDANCE: '有老师考勤的课程中，老师异常考勤的课程数量',
+  STUDENT_EXCEPTION_ATTENDANCE:'有老师考勤的课程中，学员异常考勤的课程数量',
   TEACHER_NOT_A_CLASS: '课程无老师考勤',
   TEACHER_SERVE_ERROR: '服务指标生成的训练未布置',
   WAIT_CREATE_PAYMENT_CALENDER: '缴费项目有效期结束前7天',
-  NO_CLASS_MUSIC_GROUP_STUDENT_INFO: '进行中乐团不在班级中的在读学员提醒',
+  NO_CLASS_MUSIC_GROUP_STUDENT_INFO: '进行中且未开课乐团，未加入任何班级的学员数量',
+  NO_CLASS_MUSIC_GROUP_STUDENT_ERROR:'进行中且已开课乐团，未加入任何班级的学员数量',
   COURSE_TIME_ERROR: '上课时间在21:00~06:00时间段内为时间安排异常',
   TOTAL_AMOUNT: '总收入：现金收入 + 余额收入',
   STUDENT_ERROR_LEAVE: '当月请假2次及以上',
-  STUDENT_ARREARAGE: '缴费项目中的学员未缴费',
+  STUDENT_ARREARAGE: '已加入缴费项目，已排课且未缴费学员数量',
   NO_MEMBER_STUDENT_INFO: '进行中会员收费乐团中会员已过期在读学生数量',
   MEMBER_STUDENT_INFO: "进行中会员收费乐团中会员有效期≤15天的在读学生数量",
   APPLY_AMOUNT: "乐团报名缴费、新增学员缴费收入金额总和",