Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/views/buildVip/index.vue

@@ -2147,8 +2147,7 @@ export default {
             id: val,
           });
           this.educationList = ruselt?.data?.EDUCATION;
-          console.log(this.educationList)
-          if (this.educationList.length <= 0) {
+          if (!this.educationList || this.educationList.length <= 0) {
             this.$bus.$emit("showguide", ["teamManager"]);
             return
           }

src/views/main/index.vue

@@ -4,7 +4,7 @@
       <div class="squrt"></div>
       工作台
       <filter-search
-        v-if="$route.query.tabrouter === 'teamSchedule'"
+        v-if="$route.query.tabrouter === 'teamSchedule'&&permission('/teamSchedule/abnormal')"
         :keys="['searchType']"
         :moreKeys="['organId']"
         @reload="reloadItem"

src/views/musicInspection/index.vue

@@ -4,11 +4,13 @@
     <h2>
       <div class="squrt"></div>
       乐团巡查
-      <filter-search
-        :keys="['searchType']"
-        :moreKeys="['organId', 'start', 'end']"
-        @reload="reloadSearch"
-      />
+      <auth auths="/musicInspection/abnormal">
+        <filter-search
+          :keys="['searchType']"
+          :moreKeys="['organId', 'start', 'end']"
+          @reload="reloadSearch"
+        />
+      </auth>
     </h2>
     <div class="m-core">
       <save-form
@@ -169,7 +171,7 @@
           </el-table-column>
           <el-table-column align="center" label="巡查项目是否异常">
             <template slot-scope="scope">
-              {{ scope.row.conclusionStatus?'是':'否' }}
+              {{ scope.row.conclusionStatus ? "是" : "否" }}
             </template>
           </el-table-column>
           <el-table-column

src/views/studentManager/studentList.vue

@@ -681,6 +681,7 @@
             v-model.trim="studentForm.teacherId"
             clearable
             filterable
+            :disabled='!studentForm.organId'
           >
             <el-option
               v-for="(item, index) in maskTeacherList"
@@ -1347,6 +1348,10 @@ export default {
         await getTeacher({ organId: val }).then((res) => {
           if (res.code == 200) {
             this.maskTeacherList = res.data;
+            if(this.maskTeacherList<=0){
+               this.$bus.$emit("showguide", ['teacher']);
+            }
+
           }
         });
         queryByOrganId({ organId: val }).then((res) => {

src/views/teamDetail/teamClassList.vue

@@ -5,6 +5,7 @@
       <div class="squrt"></div>
       班级管理
       <filter-search
+      v-if="permission('/teamCLassList/abnormal')"
         :keys="['lessThenThreeHighOnline']"
         @reload="reloadSearch"
         :moreKeys="['organId']"

src/views/teamDetail/teamList.vue

@@ -7,6 +7,7 @@
         @reload="reloadSearch"
         :moreKeys="['organId']"
         :keys="['searchType']"
+          v-if="permission('/teamList/abnormal')"
       />
     </h2>
     <div class="m-core">

src/views/withdrawal-application/index.vue

@@ -3,11 +3,13 @@
     <h2>
       <div class="squrt"></div>
       退团申请
-      <filter-search
-        @reload="reloadSearch"
-        :keys="['visitFlag']"
-        :moreKeys="['organId']"
-      />
+      <auth :auths="['/WithdrawalApplication/abnormal']">
+        <filter-search
+          @reload="reloadSearch"
+          :keys="['visitFlag']"
+          :moreKeys="['organId']"
+        />
+      </auth>
     </h2>
     <div class="m-core">
       <save-form