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

src/views/contentManager/contentOperation.vue

@@ -153,7 +153,7 @@
         <el-form-item label="内容"
                       v-show="type != 8 && type != 5 && type != 3 && type != 6 && outUrlRadio != 1"
                       prop="content"
-                      :rules="[{ required: type != 8 && type != 5 && type != 3 && type != 6 ? true : false, message: '请编辑内容', trigger: 'blur' }]">
+                      :rules="[{ required: type != 8 && type != 5 && type != 3 && type != 6 && outUrlRadio != 1 ? true : false, message: '请编辑内容', trigger: 'blur' }]">
           <quill-editor class="ql-editor"
                         v-model="form.content"
                         ref="myQuillEditor"

src/views/resetTeaming/components/musicArchices.vue

@@ -6,108 +6,110 @@
         :content="$route.query.name"
       ></el-page-header>
     </h2>
-    <div class="msg">
-      学生端展示:
-      <el-switch
-        v-model="isShowRecordOfStudent"
-        @change="changeSwitch"
-        :disabled="!permission('musicGroupRecord/settingStudentIsShow')"
-        active-color="var(--color-primary)"
-      >
-      </el-switch>
-    </div>
-    <!-- searchKey="musicArchices" -->
-    <el-tabs v-model="activeIndex" ref="tab">
-      <el-tab-pane
-        label="基本信息"
-        lazy
-        v-if="permission('/archicesBaseinfo')"
-        name="1"
-      >
-        <baseInfo v-if="activeIndex == 1" />
-      </el-tab-pane>
-      <el-tab-pane
-        lazy
-        v-if="permission('/archicesStudeentAndTEacher')"
-        name="2"
-      >
-        <el-badge slot="label" class="badge" is-dot :hidden="graduateNum <= 0"
-          >学员&师资</el-badge
+    <div class="m-core">
+      <div class="msg">
+        学生端展示:
+        <el-switch
+          v-model="isShowRecordOfStudent"
+          @change="changeSwitch"
+          :disabled="!permission('musicGroupRecord/settingStudentIsShow')"
+          active-color="var(--color-primary)"
+        >
+        </el-switch>
+      </div>
+      <!-- searchKey="musicArchices" -->
+      <el-tabs v-model="activeIndex" ref="tab">
+        <el-tab-pane
+          label="基本信息"
+          lazy
+          v-if="permission('/archicesBaseinfo')"
+          name="1"
+        >
+          <baseInfo v-if="activeIndex == 1" />
+        </el-tab-pane>
+        <el-tab-pane
+          lazy
+          v-if="permission('/archicesStudeentAndTEacher')"
+          name="2"
+        >
+          <el-badge slot="label" class="badge" is-dot :hidden="graduateNum <= 0"
+            >学员&师资</el-badge
+          >
+          <studentAndTeacher v-if="activeIndex == 2" :graduateNum="graduateNum" />
+        </el-tab-pane>
+        <el-tab-pane lazy v-if="permission('/archicesTrainPlan')" name="3">
+          <el-badge
+            slot="label"
+            class="badge"
+            is-dot
+            :hidden="!planDtosList.length > 0 && !planDtosList1.length > 0"
+            >训练规划</el-badge
+          >
+          <trainPlan
+            :planDtosList="planDtosList"
+            :planDtosList1="planDtosList1"
+            v-if="activeIndex == 3"
+            @getPlanError="getPlanError"
+          />
+        </el-tab-pane>
+        <el-tab-pane
+          label="训练时长"
+          lazy
+          v-if="permission('/archicesTrainTimer')"
+          name="4"
+        >
+          <trainTimer v-if="activeIndex == 4" />
+        </el-tab-pane>
+        <el-tab-pane
+          label="训练情况"
+          lazy
+          v-if="permission('/archicesWorkStatus')"
+          name="5"
         >
-        <studentAndTeacher v-if="activeIndex == 2" :graduateNum="graduateNum" />
-      </el-tab-pane>
-      <el-tab-pane lazy v-if="permission('/archicesTrainPlan')" name="3">
-        <el-badge
-          slot="label"
-          class="badge"
-          is-dot
-          :hidden="!planDtosList.length > 0 && !planDtosList1.length > 0"
-          >训练规划</el-badge
+          <workStatus v-if="activeIndex == 5" />
+        </el-tab-pane>
+        <el-tab-pane
+          label="训练照片"
+          lazy
+          v-if="permission('/archicesTrainingPhotos')"
+          name="6"
         >
-        <trainPlan
-          :planDtosList="planDtosList"
-          :planDtosList1="planDtosList1"
-          v-if="activeIndex == 3"
-          @getPlanError="getPlanError"
-        />
-      </el-tab-pane>
-      <el-tab-pane
-        label="训练时长"
-        lazy
-        v-if="permission('/archicesTrainTimer')"
-        name="4"
-      >
-        <trainTimer v-if="activeIndex == 4" />
-      </el-tab-pane>
-      <el-tab-pane
-        label="训练情况"
-        lazy
-        v-if="permission('/archicesWorkStatus')"
-        name="5"
-      >
-        <workStatus v-if="activeIndex == 5" />
-      </el-tab-pane>
-      <el-tab-pane
-        label="训练照片"
-        lazy
-        v-if="permission('/archicesTrainingPhotos')"
-        name="6"
-      >
-        <training-photos v-if="activeIndex == 6" />
-      </el-tab-pane>
-      <el-tab-pane
-        label="展演&证书"
-        lazy
-        v-if="permission('/archicesPhotosDetail')"
-        name="9"
-      >
-        <performance v-if="activeIndex == 9" />
-      </el-tab-pane>
-      <!-- <el-tab-pane
-        label="获奖证书"
-        lazy
-        v-if="permission('/archicesPhotosDetail')"
-        name="9"
-      >
-        <photo-detail type="SHOW" v-if="activeIndex == 9" />
-      </el-tab-pane> -->
-      <el-tab-pane
-        label="乐团资讯"
-        lazy
-        v-if="permission('/archicesTeamInfo')"
-        name="7"
-      >
-        <teamInfo v-if="activeIndex == 7" />
-      </el-tab-pane>
-      <el-tab-pane
-        label="满意度调查"
-        lazy
-        v-if="permission('/archicesSurver')"
-        name="8"
-      >
-        <survey v-if="activeIndex == 8" />
-      </el-tab-pane>
-    </el-tabs>
+          <training-photos v-if="activeIndex == 6" />
+        </el-tab-pane>
+        <el-tab-pane
+          label="展演&证书"
+          lazy
+          v-if="permission('/archicesPhotosDetail')"
+          name="9"
+        >
+          <performance v-if="activeIndex == 9" />
+        </el-tab-pane>
+        <!-- <el-tab-pane
+          label="获奖证书"
+          lazy
+          v-if="permission('/archicesPhotosDetail')"
+          name="9"
+        >
+          <photo-detail type="SHOW" v-if="activeIndex == 9" />
+        </el-tab-pane> -->
+        <el-tab-pane
+          label="乐团资讯"
+          lazy
+          v-if="permission('/archicesTeamInfo')"
+          name="7"
+        >
+          <teamInfo v-if="activeIndex == 7" />
+        </el-tab-pane>
+        <el-tab-pane
+          label="满意度调查"
+          lazy
+          v-if="permission('/archicesSurver')"
+          name="8"
+        >
+          <survey v-if="activeIndex == 8" />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
   </div>
 </template>
 <script>
@@ -243,7 +245,7 @@ export default {
   // color: #777;
   cursor: pointer;
   position: absolute;
-  top: 34px;
+  top: 25px;
   right: 40px;
   z-index: 990;
 }