Browse Source

修改显示

lex-xin 4 years ago
parent
commit
741fce40af

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-027d33bb.216a89f5.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-5fc7e030.e83092ce.css


File diff suppressed because it is too large
+ 1 - 0
dist/static/css/chunk-83f471d8.a8744a2b.css


File diff suppressed because it is too large
+ 1 - 0
dist/static/css/chunk-9bad4bea.b1e10efb.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-c7722a3a.55c9e764.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0f8eb2e4.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-5fc7e030.63323ba4.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6c931bc9.0aa84f21.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-83f471d8.8af73595.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-9bad4bea.8482400c.js


+ 2 - 2
src/views/app/entryOperation.vue

@@ -351,7 +351,7 @@ export default {
         this.$message.success(title + "成功");
         this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({
-          path: "/insideSetting/entryActivities"
+          path: "/systemManager/sysBasics/entryActivities"
         });
       } else {
         this.$message.error(res.msg);
@@ -360,7 +360,7 @@ export default {
     onCancel () {
       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
-        path: "/insideSetting/entryActivities"
+        path: "/systemManager/sysBasics/entryActivities"
       });
     },
     handleSuccess (res) {

+ 2 - 2
src/views/arrearage-students/modals/list.vue

@@ -84,7 +84,7 @@
         label="操作"
       >
         <template slot-scope="scope">
-          <el-button v-if="scope.row.paymentStatus == 'NON_PAYMENT' && permission('musicGroupPaymentCalenderDetail/qrCodeLook')" type="text" @click="openCode(scope.row)">查看二维码</el-button>
+          <el-button v-if="scope.row.paymentStatus == 'NON_PAYMENT' && $helpers.permission('musicGroupPaymentCalenderDetail/qrCodeLook')" type="text" @click="openCode(scope.row)">查看二维码</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -146,7 +146,7 @@ export default {
     },
     openCode(row) {
       this.codeStatus = true
-      this.codeUrl = vaildStudentUrl() + '/#/musicGroupRenew?calenderId=' + row.id + '&id=' + this.musicGroupId
+      this.codeUrl = vaildStudentUrl() + '/#/musicGroupRenew?calenderId=' + row.musicGroupPaymentCalenderId + '&id=' + this.musicGroupId
     },
     async removeUser() {
       try {

+ 8 - 8
src/views/businessManager/orderManager/businessStatement.vue

@@ -215,14 +215,14 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="操作">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                v-permission="'/businessStatementDetail'"
-                @click="lookDetail(scope.row)"
-                >查看</el-button
-              >
+              <auth auths="/businessStatementDetail">
+                <el-button
+                  type="text"
+                  @click="lookDetail(scope.row)"
+                  >查看</el-button>
+              </auth>
             </template>
           </el-table-column>
         </el-table>
@@ -382,7 +382,7 @@ export default {
     },
     lookDetail(row) {
       this.$router.push({
-        path: "/orderList/businessStatementDetail",
+        path: "/financialManager/orderManager/businessStatementDetail",
         query: {
           organId: row.organId,
           organName: row.organName,

+ 1 - 1
src/views/businessManager/orderManager/businessStatementDetail.vue

@@ -346,7 +346,7 @@ export default {
       // searchForm: this.searchForm,
       // pageInfo: this.pageInfo
        this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push({ path: '/orderList/businessStatement' })
+      this.$router.push({ path: '/financialManager/orderManager/businessStatement' })
     }
   }
 }

+ 2 - 1
src/views/main/reminders/index.vue

@@ -64,7 +64,8 @@ export default {
     permission,
     handle(item) {
       // 添加判断权限
-      if(errorType[item[0].errorType] && !this.permission(errorType[item[0].errorType].permission)) {
+      console.log(item)
+      if(errorType[item[0]?.errorType] && !this.permission(errorType[item[0]?.errorType]?.permission)) {
         return
       }
       new Searchs().removeByKey('/teamList')

+ 5 - 4
src/views/teacherManager/teacherDetail/index.vue

@@ -150,10 +150,10 @@ export default {
 
   },
 
-  created () {
+  mounted () {
       this.teacherName = this.$route.query.teacherName;
-        this.teacherId = this.$route.query.teacherId
-    this.activeName = "0";
+      this.teacherId = this.$route.query.teacherId
+      this.activeName = "0";
       teacherGet({ teacherId: this.teacherId }).then(res => {
         if (res.code == 200) {
          this.teacherInfos = res.data
@@ -162,6 +162,7 @@ export default {
       })
   },
   methods: {
+    permission,
     handleClick (val, event) {
       this.activeName = val.name;
       // this.activeStatus[val.name] = true
@@ -169,7 +170,7 @@ export default {
     onCancel () {
        this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
-        path: "/business/teacherList"
+        path: "/teacherManager/teacherList"
       });
     },
       gotoAfterSchool() {

+ 2 - 2
src/views/teacherManager/teacherList.vue

@@ -259,11 +259,11 @@
                 <router-link
                   class="el-button--text"
                   :to="{
-                    path: `/business/teacherDetail?teacherId=${scope.row.id}&teacherName=${scope.row.realName}`,
+                    path: `/teacherManager/teacherDetail?teacherId=${scope.row.id}&teacherName=${scope.row.realName}`,
                   }"
                   >查看</router-link>
               </auth>
-              <auth auths="/teacherIperationUpdate">
+              <auth auths="/teacherOperationUpdate">
                 <el-button
                   @click="onTeacher('update', scope.row)"
                   type="text"

+ 1 - 1
src/views/teacherManager/teacherOperation/components/accompanySet.vue

@@ -290,7 +290,7 @@ export default {
             this.$message.success("保存成功");
             this.$store.dispatch('delVisitedViews', this.$route)
             this.$router.push({
-              path: "/business/teacherList",
+              path: "/teacherManager/teacherList",
               query: { rules: this.Frules, search: this.Fsearch }
             });
           }

+ 1 - 1
src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -592,7 +592,7 @@ export default {
                       this.$message.success("保存成功");
                       this.$store.dispatch('delVisitedViews', this.$route)
                       this.$router.push({
-                        path: "/business/teacherList",
+                        path: "/teacherManager/teacherList",
                         query: { rules: this.Frules, search: this.Fsearch }
                       });
                     }

+ 3 - 3
src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -641,7 +641,7 @@ export default {
                 // this.$emit('onTeacher')
                 this.$store.dispatch('delVisitedViews', this.$route)
                 this.$router.push({
-                  path: "/business/teacherList",
+                  path: "/teacherManager/teacherList",
                   query: { rules: this.Frules, search: this.Fsearch },
                 });
               }
@@ -659,7 +659,7 @@ export default {
                 } else {
                   this.$store.dispatch('delVisitedViews', this.$route)
                   this.$router.push({
-                    path: "/business/teacherList",
+                    path: "/teacherManager/teacherList",
                     query: { rules: this.Frules, search: this.Fsearch },
                   });
                 }
@@ -720,7 +720,7 @@ export default {
     onCancel() {
       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
-        path: "/business/teacherList",
+        path: "/teacherManager/teacherList",
         query: { rules: this.Frules, search: this.Fsearch },
       });
     },

+ 1 - 1
src/views/teacherManager/teacherOperation/index.vue

@@ -86,7 +86,7 @@ export default {
     },
     onCancel () {
       this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push({ path: '/business/teacherList' })
+      this.$router.push({ path: '/teacherManager/teacherList' })
     },
     onTeacher (id) {
       let type = this.$route.query.type

+ 3 - 3
src/views/teamBuild/teamSeting/components/setClassV2.vue

@@ -297,13 +297,13 @@
               <p>线上基础技能班规则:</p>
               <p>班级数量:</p>
               <p>
-                乐团可创建的线上基础技能班数量为各声部人数/6向上取整之和(上低音号与长号合并计算)
+                可创建班级数量=各个声部学员数/6向上取整+乐团在读学员数/30向上取整
               </p>
               <p>
-                例:乐团有长笛13人、上低音号8人、长号7人,则该乐团可创建线上基础技能班数量为13/6向上取整+(8+7)/6向上取整=3+3=6个线上基础技能班
+                上低音号、长号学员数合并计算
               </p>
               <p>班级人数:</p>
-              <p>线上基础技能班人数为3至6人</p>
+              <p>线上基础技能班人数上限为6人</p>
             </div>
             <el-button
               type="text"

+ 3 - 3
src/views/teamDetail/components/resetClass.vue

@@ -508,13 +508,13 @@
               <p>线上基础技能班规则:</p>
               <p>班级数量:</p>
               <p>
-                乐团可创建的线上基础技能班数量为各声部人数/6向上取整之和(上低音号与长号合并计算)
+                可创建班级数量=各个声部学员数/6向上取整+乐团在读学员数/30向上取整
               </p>
               <p>
-                例:乐团有长笛13人、上低音号8人、长号7人,则该乐团可创建线上基础技能班数量为13/6向上取整+(8+7)/6向上取整=3+3=6个线上基础技能班
+                上低音号、长号学员数合并计算
               </p>
               <p>班级人数:</p>
-              <p>线上基础技能班人数为3至6人</p>
+              <p>线上基础技能班人数上限为6人</p>
             </div>
             <el-button
               type="text"

Some files were not shown because too many files changed in this diff