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

src/components/Editor/index.vue

@@ -126,7 +126,7 @@ const toolbarOptions = [
   [{ script: "sub" }, { script: "super" }], // 上标/下标
   [{ indent: "-1" }, { indent: "+1" }], // 缩进
   // [{'direction': 'rtl'}],                         // 文本方向
-  [{ size: ["small", false, "large", "huge"] }], // 字体大小
+  [{ size: ["small", 'middle', "large", "huge"] }], // 字体大小
   [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
   [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
   [{ font: [] }], // 字体种类

src/components/filter-search/index.vue

@@ -24,6 +24,7 @@ import cleanDeep from 'clean-deep'
 const typesByUrl = {}
 
 for (const key in errorType) {
+  //
   if (Object.hasOwnProperty.call(errorType, key)) {
     const item = errorType[key];
     if (!typesByUrl[item.url]) {
@@ -73,6 +74,7 @@ export default {
       for (const item of this.keys) {
         keys[item] = this.$route.query[item]
       }
+
       return !!Object.keys(cleanDeep(keys)).length
     },
     show() {

src/views/baseRulesClassSetting/index.vue

@@ -57,7 +57,7 @@
           <vipCourseType v-if="activeIndex == '4'" />
         </el-tab-pane>
         <el-tab-pane
-          label="课程收费设置"
+          label="VIP课程收费设置"
           lazy
           name="8"
           v-if="permissionList.vipChargeSeting"

src/views/categroyManager/vipChargeSeting.vue

@@ -42,6 +42,7 @@
             <template slot-scope="scope">
               <div>
                 <el-input
+                :disabled='scope.row.onlineDis'
                   v-model.trim="scope.row.onlineClassesUnitPrice"
                 ></el-input>
               </div>
@@ -119,10 +120,10 @@ export default {
     getList() {
       vipGroupCategory({ organId: this.searchForm.organId }).then((res) => {
         if (res.code == 200) {
-          this.dataList = []
-          res.data.map(item=>{
-            if(item.studentNum <= this.studentRuleNum) {
-                this.dataList.push(item)
+          this.dataList =res.data
+           this.dataList.forEach(item=>{
+            if(item.studentNum > this.studentRuleNum) {
+               item.onlineDis = true
             }
           });
         }

src/views/teamDetail/teamCourseList.vue

@@ -9,6 +9,7 @@
         @setTimeForSearch="setTimeForSearch"
         :keys="['searchType']"
         :moreKeys="['start', 'end', 'organId']"
+        v-if="permission('courseSchedule/abnormal')"
       />
     </h2>
     <div class="m-core">