提交一下

1

src/components/Pagination/index.vue

@@ -148,7 +148,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .pagination-container {
   background: #fff;
   padding: 32px 16px;
@@ -160,4 +160,8 @@ export default {
 .pagination-container.hidden {
   display: none;
 }
+/deep/.el-select {
+    width: 100px!important;
+    margin: 0 5px;
+}
 </style>

src/layout/components/AppMain.vue

@@ -17,30 +17,32 @@
       </div>
     </transition>
     <serviceRemind />
-    <el-dialog
-      :visible.sync="guideVisible"
-      title="您需要完成以下设置"
-      width="800px"
-      :modal="false"
-      v-if="guideList.length > 0"
-      append-to-body
-    >
-      <div class="guideWrap">
-        <div class="guideItem" v-for="guide in guideList" :key="guide.name">
-          <p>
-            <span class="guideTitle">{{ guide.name }}</span>
-            <el-button
-              type="text"
-              @click="gotoSet(guide)"
-              v-if="permission(guide.permission)"
-              >立即设置 >></el-button
-            >
-            <span v-else>您暂无此设置权限,请联系机构管理员</span>
-          </p>
-          <p>{{ guide.desc }}</p>
+    <div style="z-index:5000">
+      <el-dialog
+        :visible.sync="guideVisible"
+        title="您需要完成以下设置"
+        width="800px"
+        :modal="false"
+        v-if="guideList.length > 0"
+        append-to-body
+      >
+        <div class="guideWrap">
+          <div class="guideItem" v-for="guide in guideList" :key="guide.name">
+            <p>
+              <span class="guideTitle">{{ guide.name }}</span>
+              <el-button
+                type="text"
+                @click="gotoSet(guide)"
+                v-if="permission(guide.permission)"
+                >立即设置 >></el-button
+              >
+              <span v-else>您暂无此设置权限,请联系机构管理员</span>
+            </p>
+            <p>{{ guide.desc }}</p>
+          </div>
         </div>
-      </div>
-    </el-dialog>
+      </el-dialog>
+    </div>
     <div
       class="optionBtn"
       v-if="!outOptionvisible && isShowBtn"
@@ -246,7 +248,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 .previewImg {
-
 }
 /deep/.el-drawer__header {
   margin-bottom: 0px;
@@ -318,7 +319,6 @@ export default {
 /*设置字体的大小*/
 </style>
 <style scoped>
-
 .app-main {
   /*50 = navbar  */
   /* height: calc(100vh - 80px); */
@@ -344,6 +344,6 @@ export default {
   }
 }
 .el-image-viewer__close {
-    display: none!important;
-  }
+  display: none !important;
+}
 </style>

src/views/buildVip/index.vue

@@ -927,94 +927,9 @@ export default {
       this.title = "网管课申请";
       this.$route.meta.title = "网管课申请";
       this.hasOffline = false;
-      // this.$router.push(
-      //   {
-      //     query: merge(this.$route.query, {
-      //      courseType:'PRACTICE'
-      //     })
-      //   },
-      //   (router) => {
-      //     console.log(router);
-
-      //   }
-      // );
-      //   let sotrage = JSON.parse(localStorage.getItem(`newPractice`));
-      //   if (sotrage?.leftForm?.classOrganId) {
-      //     this.$confirm("检测到您有未提交的数据, 是否恢复?", "提示", {
-      //       confirmButtonText: "确定",
-      //       cancelButtonText: "取消",
-      //       closeOnClickModal: false,
-      //       type: "warning",
-      //     }).then(async () => {
-      //       this.activeStudentList = sotrage.activeStudentList;
-      //       this.centerForm = sotrage.centerForm;
-      //       this.leftForm = sotrage.leftForm;
-      //       this.rightForm = sotrage.rightForm;
-      //       this.timeTable = sotrage.timeTable;
-      //       this.educationList = sotrage.educationList;
-      //       this.courseTypeList = sotrage.courseTypeList;
-      //       // 为了刷新线上课单价和线下课单价
-      //       await vipGroupCategory({
-      //         organId: sotrage?.leftForm?.classOrganId,
-      //       }).then((res) => {
-      //         if (res.code == 200) {
-      //           this.courseTypeList = res.data;
-      //         }
-      //       });
-      //       this.scetionList = sotrage.scetionList;
-      //       this.studentList = sotrage.studentList;
-      //       this.activeList = sotrage.activeList;
-      //       this.studentLimit = sotrage.studentLimit;
-      //       this.teacherList = sotrage.teacherList;
-      //       this.isMusicTheory = sotrage.isMusicTheory;
-      //       this.chioseStudent = sotrage.chioseStudent;
-      //       this.maxCourseNum = sotrage.maxCourseNum;
-      //       this.minCourseNum = sotrage.minCourseNum;
-      //       if (this.leftForm?.courseType) {
-      //         this.changePrice(this.leftForm.courseType);
-      //       }
-      //     });
-      //   }
-      // } else {
-      //   this.title = "VIP/乐理课申请";
-      //   this.$route.meta.title = "VIP/乐理课申请";
-      //   let sotrage = JSON.parse(localStorage.getItem(`newVip`));
-      //   if (sotrage?.leftForm?.classOrganId) {
-      //     this.$confirm("检测到您有未提交的数据, 是否恢复?", "提示", {
-      //       confirmButtonText: "确定",
-      //       cancelButtonText: "取消",
-      //       closeOnClickModal: false,
-      //       type: "warning",
-      //     }).then(async () => {
-      //       this.activeStudentList = sotrage.activeStudentList;
-      //       this.centerForm = sotrage.centerForm;
-      //       this.leftForm = sotrage.leftForm;
-      //       this.rightForm = sotrage.rightForm;
-      //       this.timeTable = sotrage.timeTable;
-      //       this.educationList = sotrage.educationList;
-      //       this.courseTypeList = sotrage.courseTypeList;
-      //       this.maxCourseNum = sotrage.maxCourseNum;
-      //       this.minCourseNum = sotrage.minCourseNum;
-      //       // 为了刷新线上课单价和线下课单价
-      //       await vipGroupCategory({
-      //         organId: sotrage?.leftForm?.classOrganId,
-      //       }).then((res) => {
-      //         if (res.code == 200) {
-      //           this.courseTypeList = res.data;
-      //         }
-      //       });
-      //       this.scetionList = sotrage.scetionList;
-      //       this.studentList = sotrage.studentList;
-      //       this.activeList = sotrage.activeList;
-      //       this.studentLimit = sotrage.studentLimit;
-      //       this.teacherList = sotrage.teacherList;
-      //       this.isMusicTheory = sotrage.isMusicTheory;
-      //       this.chioseStudent = sotrage.chioseStudent;
-      //       if (this.leftForm?.courseType) {
-      //         this.changePrice(this.leftForm.courseType);
-      //       }
-      //     });
-      //   }
+    }else{
+        this.title = "VIP申请";
+      this.$route.meta.title = "VIP申请";
     }
 
     this.init();

src/views/categroyManager/specialSetup/courseTimerSetting.vue

@@ -159,7 +159,7 @@ export default {
       isAdd: true,
       courseVisible: false,
       activeRow: null,
-      context:'创建分部后，可根据各分部的及时情况在本界面添加各类型乐团课程的单课时时长，添加完成后，各分部乐团在排课时可选择此处设置的单课时时长进行排课，同一种课程类型可设置多种单课时时长，帮助进行乐团课时时长的规范管理。',
+      context:'创建分部后，可根据各分部的实际情况在本界面添加各类型乐团课程的单课时时长，添加完成后，各分部乐团在排课时可选择此处设置的单课时时长进行排课，同一种课程类型可设置多种单课时时长，帮助进行乐团课时时长的规范管理。',
       contextFlag:false
     };
   },

src/views/categroyManager/specialSetup/modals/courseTimeForm.vue

@@ -47,7 +47,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="课程课时" prop="timer" :label-width="formLabelWidth">
+      <el-form-item label="单课时时长" prop="timer" :label-width="formLabelWidth">
         <el-tag
           :key="index"
           effect="dark"
@@ -99,7 +99,7 @@ export default {
         id: "",
       },
       inputVisible: false,
-      formLabelWidth: "80px",
+      formLabelWidth: "100px",
       dynamicTags: [],
       inputValue: "",
     };

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <!-- <h2>折扣设置</h2> -->
-    <div v-if="tableList.length>0 || pageInfo.page>1">
+    <div v-if="(tableList.length>0 || pageInfo.page>1)&&contextFlag">
       <save-form
         :inline="true"
         @submit="search"
@@ -109,7 +109,7 @@
         />
       </div>
     </div>
- <emptyPage @submit="newVisiable = true" title='乐团课价格设置' btnTitle='新建乐团课价格设置' :context='context' v-else />
+ <emptyPage @submit="newVisiable = true" title='乐团课价格设置' btnTitle='新建乐团课价格设置' :context='context' v-if="!(tableList.length>0 || pageInfo.page>1)&&contextFlag" />
     <el-dialog
       title="新建"
       destroy-on-close
@@ -323,7 +323,8 @@ export default {
       },
       formLabelWidth: "120px",
       actvieRow: null,
-      context:'系统支持不同分部在不同的乐团模式中设置各课程类型的不同价格标准，该标准为具体课程类型每分钟的收费价格，在创建乐团课程组合包或乐团临时加课时，根据组合包中的课程时长或临时加课的课程时长计算应该向学员收费的标准费用。创不以此标准价格创建学员缴费，则需要审核才可生效。'
+      context:'系统支持不同分部在不同的乐团模式中设置各课程类型的不同价格标准，该标准为具体课程类型每分钟的收费价格，在创建乐团课程组合包或乐团临时加课时，根据组合包中的课程时长或临时加课的课程时长计算应该向学员收费的标准费用。创不以此标准价格创建学员缴费，则需要审核才可生效。',
+      contextFlag:false
     };
   },
   mounted() {
@@ -376,6 +377,7 @@ export default {
         organId: this.searchForm.organId,
         courseScheduleType: this.searchForm.courseScheduleType,
       }).then((res) => {
+        this.contextFlag = true
         let result = res.data;
         this.tableList = result.rows;
         this.pageInfo.total = result.total;

src/views/resetTeaming/components/payInfoDetail.vue

@@ -11,7 +11,7 @@
         <!-- <div class="Wall"></div> -->
         <div class="m-core1">
           <el-form :inline="true" :model="form" label-width="120px" ref="form">
-            <div :class="isField ? 'baseWrap' : 'baseWrapFixed'">
+            <div :class="isField ?  'baseWrapFixed' :'baseWrap'">
               <div class="payTitle">
                 <div class="squrt"></div>
                 <p>基础项目配置</p>
@@ -744,9 +744,8 @@ export default {
       });
     },
     onSubmit() {
-      console.log("提交");
+
       this.$refs.form.validate(async (isok) => {
-        console.log("isok", isok);
         if (isok) {
           let obj = this.fommatDate();
           if (this.$route.query.calenderId) {
@@ -870,11 +869,10 @@ export default {
         window.pageYOffset ||
         document.documentElement.scrollTop ||
         document.body.scrollTop;
-      console.log(this.scrollTop);
       if (!!this.scrollTop && this.scrollTop >= 70) {
-        this.isField = false;
-      } else {
         this.isField = true;
+      } else {
+        this.isField = false;
       }
     },
   },

src/views/resetTeaming/modals/user-pay-form.vue

@@ -412,7 +412,7 @@ export default {
       let paymentType = "";
       if (this.viewDetail) {
         const { musicGroupPaymentCalenders } = this.viewDetail;
-        paymentType = this.viewDetail?.calender?.paymentType;
+        paymentType = this.viewDetail?.calender?.paymentType || this.viewDetail?.auditDto?.paymentType;
       }
       return paymentType;
     },

src/views/studentManager/studentList.vue

@@ -559,6 +559,7 @@
       class="studentInfo"
       @close="onMaskClose('studentForm')"
       :close-on-click-modal="false"
+      append-to-body
       :visible.sync="studentVisible"
     >
       <el-form
@@ -1298,12 +1299,13 @@ export default {
       this.maskName = "新增学员";
     },
     async resetStudent(row) {
+          this.studentVisible = true;
       let organId = row.organId;
       await this.getSubjectList();
       await this.changeStudentOrgan(row.organId);
       this.isNew = false;
       this.active = row;
-      this.studentVisible = true;
+
       this.maskName = "修改学员";
       this.$nextTick(() => {
         this.studentForm = {
@@ -1376,7 +1378,10 @@ export default {
           if (res.code == 200) {
             this.maskTeacherList = res.data;
             if(this.maskTeacherList<=0){
-               this.$bus.$emit("showguide", ['teacher']);
+              this.$nextTick(()=>{
+                 this.$bus.$emit("showguide", ['teacher']);
+              })
+
             }
 
           }