Merge branch 'wxl_01_15'

src/views/categroyManager/globalConfig.vue

@@ -108,6 +108,14 @@
           >
             <holidaySetting v-if="activeIndex == 8" />
           </el-tab-pane>
+          <el-tab-pane
+            label="预警课酬设置"
+            lazy
+            name="12"
+            v-if="permissionList.earlyWarning"
+          >
+            <earlyWarning v-if="activeIndex == 12" />
+          </el-tab-pane>
         </tab-router>
     </div>
   </div>
@@ -125,6 +133,7 @@
 import overallManager from "./generalSettings/overallManager";
 import overallManagerTwo from "./generalSettings/overallManagerTwo";
 import holidaySetting from "./generalSettings/holidaySetting";
+import earlyWarning from "./generalSettings/earlyWarning";
 import { permission } from "@/utils/directivePage";
 export default {
   components: {
@@ -140,6 +149,7 @@ export default {
     // chargesList,
     // musicCourseFee,
     // courseTimerSetting
+    earlyWarning
   },
   name: "globalConfig",
   data() {
@@ -149,6 +159,7 @@ export default {
         overallManager: permission("/globalConfig/overallManager"),
         overallManagerTwo: permission("/globalConfig/overallManagerTwo"),
         holidaySetting: permission("/globalConfig/holidaySetting"),
+        earlyWarning: permission("/globalConfig/earlyWarning"),
         // musicalManager: permission("/globalConfig/musicalManager"),
         // musicalManagerOut: permission("/globalConfig/musicalManagerOut"),
         // typesManager: permission("/globalConfig/typesManager"),

src/views/categroyManager/globalMusicGroup.vue

@@ -67,14 +67,6 @@
           >
             <errorManager v-if="activeIndex == 5" />
           </el-tab-pane>
-          <el-tab-pane
-            label="预警课酬设置"
-            lazy
-            name="12"
-            v-if="permissionList.earlyWarning"
-          >
-            <earlyWarning v-if="activeIndex == 12" />
-          </el-tab-pane>
         </tab-router>
     </div>
   </div>
@@ -87,7 +79,6 @@ import chargesList from "./specialSetup/chargesList";
 import musicCourseFee from "./specialSetup/musicCourseFee";
 import jobTemplateSetting from "./specialSetup/jobTemplateSetting";
 import errorManager from "./generalSettings/errorManager";
-import earlyWarning from "./generalSettings/earlyWarning";
 import { permission } from "@/utils/directivePage";
 export default {
   components: {
@@ -97,8 +88,7 @@ export default {
     errorManager,
     chargesList,
     musicCourseFee,
-    courseTimerSetting,
-    earlyWarning
+    courseTimerSetting
   },
   name: "globalConfig",
   data() {
@@ -109,7 +99,6 @@ export default {
         chargesList: permission("/globalConfig/chargesList"),
         jobTemplateSetting: permission("/globalConfig/jobTemplateSetting"),
         errorManager: permission("/globalConfig/errorManager"),
-        earlyWarning: permission("/globalConfig/earlyWarning"),
         musicCourseFee: permission("/globalConfig/musicCourseFee"),
         discountManage: permission("/globalConfig/discountManage"),
         courseTimerSetting: permission("/globalConfig/courseTimerSetting")